();
- for (String id : cfg.getSubsections(sectionName)) {
- String name = cfg.getString(sectionName, id, K_NAME);
- Project project = new Project(id, name);
- project.setVersion(cfg.getString(sectionName, id, K_VERSION));
- project.setComments(cfg.getString(sectionName, id, K_COMMENTS));
-
- for (String c : cfg.getStringList(sectionName, id, K_SKIP_COMMIT))
- project.addSkipCommit(ObjectId.fromString(c));
- for (String license : cfg.getStringList(sectionName, id, K_LICENSE))
- project.addLicense(license);
- dst.add(project);
- }
- return dst;
- }
-
- /**
- * Query the Eclipse Foundation's IPzilla database for CQ records.
- *
- * Updates the local {@code .eclipse_iplog} configuration file with current
- * information by deleting CQs which are no longer relevant, and adding or
- * updating any CQs which currently exist in the database.
- *
- * @param file
- * local file to update with current CQ records.
- * @param fs
- * the file system abstraction which will be necessary to perform
- * certain file system operations.
- * @param base
- * base https:// URL of the IPzilla server.
- * @param username
- * username to login to IPzilla as. Must be a Bugzilla username
- * of someone authorized to query the project's IPzilla records.
- * @param password
- * password for {@code username}.
- * @throws IOException
- * IPzilla cannot be queried, or the local file cannot be read
- * from or written to.
- * @throws ConfigInvalidException
- * the local file cannot be read, as it is not a valid
- * configuration file format.
- */
- public void syncCQs(File file, FS fs, URL base, String username,
- String password) throws IOException, ConfigInvalidException {
- FileUtils.mkdirs(file.getParentFile(), true);
-
- LockFile lf = new LockFile(file, fs);
- if (!lf.lock())
- throw new IOException(MessageFormat.format(IpLogText.get().cannotLock, file));
- try {
- FileBasedConfig cfg = new FileBasedConfig(file, fs);
- cfg.load();
- loadFrom(cfg);
-
- IPZillaQuery ipzilla = new IPZillaQuery(base, username, password);
- Set current = ipzilla.getCQs(projects);
-
- for (CQ cq : sort(current, CQ.COMPARATOR)) {
- String id = Long.toString(cq.getID());
-
- set(cfg, S_CQ, id, K_DESCRIPTION, cq.getDescription());
- set(cfg, S_CQ, id, K_LICENSE, cq.getLicense());
- set(cfg, S_CQ, id, K_USE, cq.getUse());
- set(cfg, S_CQ, id, K_STATE, cq.getState());
- set(cfg, S_CQ, id, K_COMMENTS, cq.getComments());
- }
-
- for (CQ cq : cqs) {
- if (!current.contains(cq))
- cfg.unsetSection(S_CQ, Long.toString(cq.getID()));
- }
-
- lf.write(Constants.encode(cfg.toText()));
- if (!lf.commit())
- throw new IOException(MessageFormat.format(IpLogText.get().cannotWrite, file));
- } finally {
- lf.unlock();
- }
- }
-
- private static void set(Config cfg, String section, String subsection,
- String key, String value) {
- if (value == null || "".equals(value))
- cfg.unset(section, subsection, key);
- else
- cfg.setString(section, subsection, key, value);
- }
-
- private static > Iterable sort(
- Collection objs, Q cmp) {
- ArrayList sorted = new ArrayList(objs);
- Collections.sort(sorted, cmp);
- return sorted;
- }
-}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java
deleted file mode 100644
index a7a4fd918..000000000
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/IpLogText.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010, Sasa Zivkov
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.iplog;
-
-import org.eclipse.jgit.nls.NLS;
-import org.eclipse.jgit.nls.TranslationBundle;
-
-/**
- * Translation bundle for JGit IP Log
- */
-public class IpLogText extends TranslationBundle {
-
- /**
- * @return an instance of this translation bundle
- */
- public static IpLogText get() {
- return NLS.getBundleFor(IpLogText.class);
- }
-
- // @formatter:off
- /***/ public String CQString;
- /***/ public String CSVParsingError;
- /***/ public String cannotLock;
- /***/ public String cannotSerializeXML;
- /***/ public String cannotWrite;
- /***/ public String committerString;
- /***/ public String configurationFileInCommitHasNoProjectsDeclared;
- /***/ public String configurationFileInCommitIsInvalid;
- /***/ public String contributorString;
- /***/ public String incorrectlyScanned;
- /***/ public String invalidDate;
- /***/ public String invalidURIFormat;
- /***/ public String loginFailed;
- /***/ public String pageTitleWas;
- /***/ public String projectString;
- /***/ public String queryFailed;
- /***/ public String responseNotHTMLAsExpected;
-}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java
deleted file mode 100644
index efa1fed79..000000000
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/Project.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc.
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.iplog;
-
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectIdSubclassMap;
-
-/** Description of a project. */
-class Project {
- /** Sorts projects by unique identities. */
- static final Comparator COMPARATOR = new Comparator() {
- public int compare(Project a, Project b) {
- return a.getID().compareTo(b.getID());
- }
- };
-
- private final String id;
-
- private final String name;
-
- private String comments;
-
- private final Set licenses = new TreeSet();
-
- private final ObjectIdSubclassMap skipCommits = new ObjectIdSubclassMap();
-
- private String version;
-
- /**
- * @param id
- * @param name
- */
- Project(String id, String name) {
- this.id = id;
- this.name = name;
- }
-
- /** @return unique identity of this project. */
- String getID() {
- return id;
- }
-
- /** @return name of this project. */
- String getName() {
- return name;
- }
-
- /** @return any additional comments about this project. */
- String getComments() {
- return comments;
- }
-
- void setComments(String comments) {
- this.comments = comments;
- }
-
- /** @return the licenses this project is released under. */
- Set getLicenses() {
- return Collections.unmodifiableSet(licenses);
- }
-
- void addLicense(String licenseName) {
- licenses.add(licenseName);
- }
-
- void addSkipCommit(AnyObjectId commit) {
- skipCommits.add(commit.copy());
- }
-
- boolean isSkippedCommit(AnyObjectId commit) {
- return skipCommits.contains(commit);
- }
-
- String getVersion() {
- return version;
- }
-
- void setVersion(String v) {
- version = v;
- }
-
- @Override
- public String toString() {
- return MessageFormat.format(IpLogText.get().projectString, getID(), getName());
- }
-}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/SimpleCookieManager.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/SimpleCookieManager.java
deleted file mode 100644
index d6b3a3698..000000000
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/SimpleCookieManager.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc.
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.iplog;
-
-import java.io.IOException;
-import java.net.CookieHandler;
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Dumb implementation of a CookieManager for the JRE.
- *
- * Cookies are keyed only by the host name in the URI. Cookie attributes like
- * domain and path are ignored to simplify the implementation.
- *
- * If we are running on Java 6 or later we should favor using the standard
- * {@code java.net.CookieManager} class instead.
- */
-public class SimpleCookieManager extends CookieHandler {
- private Map> byHost = new HashMap>();
-
- @Override
- public Map> get(URI uri,
- Map> requestHeaders) throws IOException {
- String host = hostOf(uri);
-
- Map map = byHost.get(host);
- if (map == null || map.isEmpty())
- return requestHeaders;
-
- Map> r = new HashMap>();
- r.putAll(requestHeaders);
- StringBuilder buf = new StringBuilder();
- for (Map.Entry e : map.entrySet()) {
- if (buf.length() > 0)
- buf.append("; ");
- buf.append(e.getKey());
- buf.append('=');
- buf.append(e.getValue());
- }
- r.put("Cookie", Collections.singletonList(buf.toString()));
- return Collections.unmodifiableMap(r);
- }
-
- @Override
- public void put(URI uri, Map> responseHeaders)
- throws IOException {
- List list = responseHeaders.get("Set-Cookie");
- if (list == null || list.isEmpty()) {
- return;
- }
-
- String host = hostOf(uri);
- Map map = byHost.get(host);
- if (map == null) {
- map = new HashMap();
- byHost.put(host, map);
- }
-
- for (String hdr : list) {
- String attributes[] = hdr.split(";");
- String nameValue = attributes[0].trim();
- int eq = nameValue.indexOf('=');
- String name = nameValue.substring(0, eq);
- String value = nameValue.substring(eq + 1);
-
- map.put(name, value);
- }
- }
-
- private static String hostOf(URI uri) {
- StringBuilder key = new StringBuilder();
- key.append(uri.getScheme());
- key.append(':');
- key.append(uri.getHost());
- if (0 < uri.getPort())
- key.append(':' + uri.getPort());
- return key.toString();
- }
-}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/SingleContribution.java b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/SingleContribution.java
deleted file mode 100644
index 96f3defa1..000000000
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/SingleContribution.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc.
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.iplog;
-
-import java.util.Comparator;
-import java.util.Date;
-
-/** A single contribution by a {@link Contributor}. */
-class SingleContribution {
- /** Sorts contributors by their name first name, then last name. */
- public static final Comparator COMPARATOR = new Comparator() {
- public int compare(SingleContribution a, SingleContribution b) {
- return a.created.compareTo(b.created);
- }
- };
-
- private final String id;
-
- private String summary;
-
- private Date created;
-
- private String size;
-
- /**
- * @param id
- * @param created
- * @param summary
- */
- SingleContribution(String id, Date created, String summary) {
- this.id = id;
- this.summary = summary;
- this.created = created;
- }
-
- /** @return unique identity of the contribution. */
- String getID() {
- return id;
- }
-
- /** @return date the contribution was created. */
- Date getCreated() {
- return created;
- }
-
- /** @return summary of the contribution. */
- String getSummary() {
- return summary;
- }
-
- String getSize() {
- return size;
- }
-
- void setSize(String sz) {
- size = sz;
- }
-}
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/gsql_query.txt b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/gsql_query.txt
deleted file mode 100644
index 441cc978d..000000000
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/gsql_query.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# Query for Gerrit Code Review gsql to produce the .git/gerrit_committers
-# file for a project. Needing to do this manually is a horrible hack.
-
-SELECT a.account_id,
- u.external_id,
- a.full_name,
- b.email_address,
- r.added_on,
- r.removed_on
-FROM accounts a,
- account_external_ids b,
- account_groups g,
- account_group_members_audit r,
- account_external_ids u
-WHERE a.account_id = b.account_id
- AND b.email_address IS NOT NULL
- AND r.account_id = a.account_id
- AND r.group_id = g.group_id
- AND u.account_id = a.account_id
- AND u.external_id like 'username:%'
- AND g.name = 'technology.jgit-committers'
-ORDER BY a.full_name, r.added_on;
diff --git a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/sample_gerrit_committers b/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/sample_gerrit_committers
deleted file mode 100644
index 0e0b47eb0..000000000
--- a/org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/sample_gerrit_committers
+++ /dev/null
@@ -1,2 +0,0 @@
- 1 | username:spearce | Shawn Pearce | sop@google.com | 2009-09-29 16:47:03.0 | NULL
- 1 | username:spearce | Shawn Pearce | spearce@spearce.org | 2009-09-29 16:47:03.0 | NULL
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index b69e1ef5d..85d5d355c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -33,13 +33,6 @@
version="0.0.0"
unpack="false"/>
-
-
2.3.0-SNAPSHOT
-
- org.eclipse.jgit
- org.eclipse.jgit.iplog
- 2.3.0-SNAPSHOT
-
-
org.eclipse.jgit
org.eclipse.jgit.ui
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 6596bb8bb..3f971e319 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)",
org.eclipse.jgit.diff;version="[2.3.0,2.4.0)",
org.eclipse.jgit.dircache;version="[2.3.0,2.4.0)",
org.eclipse.jgit.errors;version="[2.3.0,2.4.0)",
- org.eclipse.jgit.iplog;version="[2.3.0,2.4.0)",
org.eclipse.jgit.lib;version="[2.3.0,2.4.0)",
org.eclipse.jgit.merge;version="2.3.0",
org.eclipse.jgit.nls;version="[2.3.0,2.4.0)",
@@ -45,7 +44,6 @@ Export-Package: org.eclipse.jgit.pgm;version="2.3.0";
org.eclipse.jgit.awtui,
org.eclipse.jgit.transport",
org.eclipse.jgit.pgm.debug;version="2.3.0",
- org.eclipse.jgit.pgm.eclipse;version="2.3.0",
org.eclipse.jgit.pgm.opt;version="2.3.0"
Main-Class: org.eclipse.jgit.pgm.Main
Implementation-Title: JGit Command Line Interface
diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
index f59a004da..9d59bd8c6 100644
--- a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
+++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
@@ -45,5 +45,3 @@ org.eclipse.jgit.pgm.debug.ShowPackDelta
org.eclipse.jgit.pgm.debug.TextHashFunctions
org.eclipse.jgit.pgm.debug.WriteDirCache
-org.eclipse.jgit.pgm.eclipse.Iplog
-org.eclipse.jgit.pgm.eclipse.Ipzilla
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index a6944d0e4..17ed092dc 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -82,12 +82,6 @@
${project.version}
-
- org.eclipse.jgit
- org.eclipse.jgit.iplog
- ${project.version}
-
-
org.eclipse.jgit
org.eclipse.jgit.ui
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
index 5586a2820..0a4d90b08 100644
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -5,7 +5,6 @@ ARGUMENTS=ARGUMENTS
# default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler
N=N
-IPZillaPasswordPrompt=IPZilla Password
alreadyOnBranch=Already on ''{0}''
alreadyUpToDate=Already up-to-date.
archiveEntryModeIgnored=warning: mode of {0} ignored
@@ -178,9 +177,6 @@ usage_CreateABareRepository=Create a bare repository
usage_CreateATag=Create a tag
usage_CreateAnEmptyGitRepository=Create an empty git repository
usage_DisplayTheVersionOfJgit=Display the version of jgit
-usage_IPZillaPassword=IPZilla Password
-usage_IPZillaURL=IPZilla URL
-usage_IPZillausername=IPZilla Username
usage_MergesTwoDevelopmentHistories=Merges two development histories
usage_RepositoryToReadFrom=Repository to read from
usage_RepositoryToReceiveInto=Repository to receive into
@@ -258,7 +254,6 @@ usage_outputFile=Output file
usage_path=path
usage_performFsckStyleChecksOnReceive=perform fsck style checks on receive
usage_portNumberToListenOn=port number to listen on
-usage_produceAnEclipseIPLog=Produce an Eclipse IP log
usage_pruneStaleTrackingRefs=prune stale tracking refs
usage_recordChangesToRepository=Record changes to the repository
usage_recurseIntoSubtrees=recurse into subtrees
@@ -276,7 +271,6 @@ usage_showNotes=Add this ref to the list of note branches from which notes are d
usage_squash=Squash commits as if a real merge happened, but do not make a commit or move the HEAD.
usage_srcPrefix=show the source prefix instead of "a/"
usage_symbolicVersionForTheProject=Symbolic version for the project
-usage_synchronizeIPZillaData=Synchronize IPZilla data
usage_tagMessage=tag message
usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository
usage_useNameInsteadOfOriginToTrackUpstream=use instead of 'origin' to track upstream
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
index ecf5e8d3a..552629eba 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
@@ -74,7 +74,6 @@ public static String formatLine(String line) {
}
// @formatter:off
- /***/ public String IPZillaPasswordPrompt;
/***/ public String alreadyOnBranch;
/***/ public String alreadyUpToDate;
/***/ public String archiveEntryModeIgnored;
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java
deleted file mode 100644
index 5784fecd8..000000000
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Iplog.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc.
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.pgm.eclipse;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.net.CookieHandler;
-import java.text.MessageFormat;
-
-import org.eclipse.jgit.iplog.IpLogGenerator;
-import org.eclipse.jgit.iplog.SimpleCookieManager;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.pgm.CLIText;
-import org.eclipse.jgit.pgm.Command;
-import org.eclipse.jgit.pgm.TextBuiltin;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.revwalk.RevTag;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.LockFile;
-import org.eclipse.jgit.util.FileUtils;
-import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.Option;
-
-@Command(name = "eclipse-iplog", common = false, usage = "usage_produceAnEclipseIPLog")
-class Iplog extends TextBuiltin {
- @Option(name = "--version", aliases = { "-r" }, metaVar = "metaVar_version", usage = "usage_symbolicVersionForTheProject")
- private String version;
-
- @Option(name = "--output", aliases = { "-o" }, metaVar = "metaVar_file", usage = "usage_outputFile")
- private File output;
-
- @Argument(index = 0, metaVar = "metaVar_commitOrTag")
- private ObjectId commitId;
-
- @Override
- protected void run() throws Exception {
- if (CookieHandler.getDefault() == null)
- CookieHandler.setDefault(new SimpleCookieManager());
-
- final IpLogGenerator log = new IpLogGenerator();
-
- if (commitId == null) {
- System.err.println(MessageFormat.format(
- CLIText.get().warningNoCommitGivenOnCommandLine, Constants.HEAD));
- commitId = db.resolve(Constants.HEAD);
- }
-
- final RevWalk rw = new RevWalk(db);
- final RevObject start = rw.parseAny(commitId);
- if (version == null && start instanceof RevTag)
- version = ((RevTag) start).getTagName();
- else if (version == null)
- throw die(MessageFormat.format(CLIText.get().notATagVersionIsRequired, start.name()));
-
- log.scan(db, rw.parseCommit(start), version);
-
- if (output != null) {
- FileUtils.mkdirs(output.getParentFile(), true);
- LockFile lf = new LockFile(output, db.getFS());
- if (!lf.lock())
- throw die(MessageFormat.format(CLIText.get().cannotLock, output));
- try {
- OutputStream os = lf.getOutputStream();
- try {
- log.writeTo(os);
- } finally {
- os.close();
- }
- if (!lf.commit())
- throw die(MessageFormat.format(CLIText.get().cannotWrite, output));
- } finally {
- lf.unlock();
- }
- } else {
- log.writeTo(outs);
- outs.flush();
- }
- }
-}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java
deleted file mode 100644
index a6ec91408..000000000
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/eclipse/Ipzilla.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc.
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.pgm.eclipse;
-
-import java.io.File;
-import java.net.Authenticator;
-import java.net.CookieHandler;
-import java.net.PasswordAuthentication;
-import java.net.URL;
-
-import org.eclipse.jgit.iplog.IpLogMeta;
-import org.eclipse.jgit.iplog.SimpleCookieManager;
-import org.eclipse.jgit.pgm.CLIText;
-import org.eclipse.jgit.pgm.Command;
-import org.eclipse.jgit.pgm.TextBuiltin;
-import org.kohsuke.args4j.Option;
-
-@Command(name = "eclipse-ipzilla", common = false, usage = "usage_synchronizeIPZillaData")
-class Ipzilla extends TextBuiltin {
- @Option(name = "--url", metaVar = "metaVar_url", usage = "usage_IPZillaURL")
- private String url = "https://dev.eclipse.org/ipzilla/"; //$NON-NLS-1$
-
- @Option(name = "--username", metaVar = "metaVar_user", usage = "usage_IPZillaUsername")
- private String username;
-
- @Option(name = "--password", metaVar = "metaVar_pass", usage = "usage_IPZillaPassword")
- private String password;
-
- @Option(name = "--file", aliases = { "-f" }, metaVar = "metaVar_file", usage = "usage_inputOutputFile")
- private File output;
-
- @Override
- protected void run() throws Exception {
- if (CookieHandler.getDefault() == null)
- CookieHandler.setDefault(new SimpleCookieManager());
-
- final URL ipzilla = new URL(url);
- if (username == null) {
- final PasswordAuthentication auth = Authenticator
- .requestPasswordAuthentication(ipzilla.getHost(), //
- null, //
- ipzilla.getPort(), //
- ipzilla.getProtocol(), //
- CLIText.get().IPZillaPasswordPrompt, //
- ipzilla.getProtocol(), //
- ipzilla, //
- Authenticator.RequestorType.SERVER);
- username = auth.getUserName();
- password = new String(auth.getPassword());
- }
-
- if (output == null)
- output = new File(db.getWorkTree(), IpLogMeta.IPLOG_CONFIG_FILE);
-
- IpLogMeta meta = new IpLogMeta();
- meta.syncCQs(output, db.getFS(), ipzilla, username, password);
- }
-}
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index f97bba45a..5019ca1ee 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -100,12 +100,6 @@
${project.version}
-
- org.eclipse.jgit
- org.eclipse.jgit.iplog
- ${project.version}
-
-
org.eclipse.jgit
org.eclipse.jgit.pgm
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java
index 4e694b6f4..1a1482c88 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java
@@ -46,7 +46,6 @@
import org.eclipse.jgit.awtui.UIText;
import org.eclipse.jgit.console.ConsoleText;
import org.eclipse.jgit.internal.JGitText;
-import org.eclipse.jgit.iplog.IpLogText;
import org.eclipse.jgit.pgm.CLIText;
import org.junit.Before;
import org.junit.Test;
@@ -76,9 +75,4 @@ public void testCLIText() {
public void testUIText() {
NLS.getBundleFor(UIText.class);
}
-
- @Test
- public void testIpLogText() {
- NLS.getBundleFor(IpLogText.class);
- }
}
diff --git a/pom.xml b/pom.xml
index 63af6bd12..e45218115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -474,7 +474,6 @@
org.eclipse.jgit.ant
org.eclipse.jgit.ui
org.eclipse.jgit.http.server
- org.eclipse.jgit.iplog
org.eclipse.jgit.pgm
org.eclipse.jgit.junit
org.eclipse.jgit.junit.http