diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2013-01-09 13:56:32 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-01-09 14:21:40 +0100 |
commit | 850e5bc24e31c8c510592b24c8a2f425bc2988f0 (patch) | |
tree | ee52bb8c96781bceddd30f7a25081855a46ab347 /org.eclipse.jgit.pgm | |
parent | 04214819784b722b7ab24bb82150b393a085b6b8 (diff) | |
download | jgit-850e5bc24e31c8c510592b24c8a2f425bc2988f0.tar.gz jgit-850e5bc24e31c8c510592b24c8a2f425bc2988f0.zip |
Delete the iplog generator
It stopped working when we moved to the Eclipse foundation's Gerrit
server since it doesn't use the Gerrit internal user store but LDAP.
Instead, since 2.0, we use the Eclipse foundation's automatic IP log
generator [1] to generate IP logs for releasing jgit and egit.
[1] http://www.eclipse.org/projects/ip_log_selector.php
Change-Id: I98dc65efb62909bc0258e6c680df0c93a57e9677
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm')
7 files changed, 0 insertions, 237 deletions
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 6596bb8bb7..3f971e319f 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 f59a004da6..9d59bd8c6e 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 a6944d0e4a..17ed092dc4 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -84,12 +84,6 @@ <dependency> <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit.iplog</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> <version>${project.version}</version> </dependency> 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 5586a28200..0a4d90b088 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 <name> 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 ecf5e8d3a3..552629eba1 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 class CLIText extends TranslationBundle { } // @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 5784fecd8d..0000000000 --- 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 a6ec91408d..0000000000 --- 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); - } -} |