From a544ff72dbf62671d2530f4cfca0e8f9dd693d78 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 24 May 2013 16:57:10 -0700 Subject: [PATCH] Remove dependency by ArchiveCommand on archive formats Provide static registerFormat and unregisterFormat methods to allow formats to register themselves without the ArchiveCommand code being aware of them. Register the basic "zip" and "tar" support at bundle activation time (and deregister them when unloading the bundle). For anyone using this code as an OSGi plugin it should continue to just work. The jgit program does not load org.eclipse.jgit.pgm as an OSGi bundle, so let the Archive command register the formats it uses explicitly with registerFormat. Change-Id: Id39c03ea6923d0aed8316ed7b6bd04d5ced570a7 --- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 5 ++ .../jgit/pgm/internal/CLIText.properties | 2 + .../src/org/eclipse/jgit/pgm/Archive.java | 7 +++ .../jgit/pgm/archive/ArchiveCommand.java | 40 ++++++++++++- .../jgit/pgm/archive/FormatActivator.java | 58 +++++++++++++++++++ .../eclipse/jgit/pgm/archive/TarFormat.java | 2 +- .../eclipse/jgit/pgm/archive/ZipFormat.java | 2 +- .../eclipse/jgit/pgm/internal/CLIText.java | 2 + pom.xml | 7 +++ 10 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/FormatActivator.java diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index a6e5e2191..a26e4b466 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -34,8 +34,10 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.eclipse.jgit.util;version="[3.0.0,3.1.0)", org.eclipse.jgit.util.io;version="[3.0.0,3.1.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", - org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" + org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)", + org.osgi.framework;version="[4.0,5.0)" Bundle-ActivationPolicy: lazy +Bundle-Activator: org.eclipse.jgit.pgm.archive.FormatActivator Export-Package: org.eclipse.jgit.pgm;version="3.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.nls, diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index b51019c18..fe1c3b2a1 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -87,6 +87,11 @@ org.eclipse.jgit.ui ${project.version} + + + org.osgi + org.osgi.core + diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 3fa167e95..4a1548134 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -7,6 +7,8 @@ N=N alreadyOnBranch=Already on ''{0}'' alreadyUpToDate=Already up-to-date. +archiveFormatAlreadyRegistered=Archive format already registered: {0} +archiveFormatAlreadyAbsent=Archive format already absent: {0} authorInfo=Author: {0} <{1}> averageMSPerRead=average {0} ms/read branchAlreadyExists=A branch named ''{0}'' already exists. diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java index 6d4f5aa51..06f6f40f9 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java @@ -47,12 +47,19 @@ import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.pgm.archive.ArchiveCommand; +import org.eclipse.jgit.pgm.archive.TarFormat; +import org.eclipse.jgit.pgm.archive.ZipFormat; import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @Command(common = true, usage = "usage_archive") class Archive extends TextBuiltin { + static { + ArchiveCommand.registerFormat("tar", new TarFormat()); + ArchiveCommand.registerFormat("zip", new ZipFormat()); + } + @Argument(index = 0, metaVar = "metaVar_treeish") private ObjectId tree; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java index 437c613a3..5e572373f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java @@ -71,24 +71,28 @@ import org.eclipse.jgit.treewalk.TreeWalk; * Create a tarball from HEAD: * * 
+ * ArchiveCommand.registerFormat("tar", new TarFormat());
  * cmd = new ArchiveCommand(git.getRepository());
  * try {
  *	cmd.setTree(db.resolve("HEAD"))
  *		.setOutputStream(out).call();
  * } finally {
  *	cmd.release();
+ *	ArchiveCommand.unregisterFormat("tar");
  * }
  *
*

* Create a ZIP file from master: * * 

+ * ArchiveCommand.registerFormat("zip", new ZipFormat());
  * try {
  *	cmd.setTree(db.resolve("master"))
  *		.setFormat("zip")
  *		.setOutputStream(out).call();
  * } finally {
  *	cmd.release();
+ *	ArchiveCommand.unregisterFormat("zip");
  * }
  *
* @@ -150,9 +154,39 @@ public class ArchiveCommand extends GitCommand { private static final ConcurrentMap> formats = new ConcurrentHashMap>(); - static { - formats.put("zip", new ZipFormat()); - formats.put("tar", new TarFormat()); + /** + * Adds support for an additional archival format. To avoid + * unnecessary dependencies, ArchiveCommand does not have support + * for any formats built in; use this function to add them. + * + * OSGi plugins providing formats should call this function at + * bundle activation time. + * + * @param name name of a format (e.g., "tar" or "zip"). + * @param fmt archiver for that format + * @throws JGitInternalException + * An archival format with that name was already registered. + */ + public static void registerFormat(String name, Format fmt) { + if (formats.putIfAbsent(name, fmt) != null) + throw new JGitInternalException(MessageFormat.format( + CLIText.get().archiveFormatAlreadyRegistered, + name)); + } + + /** + * Removes support for an archival format so its Format can be + * garbage collected. + * + * @param name name of format (e.g., "tar" or "zip"). + * @throws JGitInternalException + * No such archival format was registered. + */ + public static void unregisterFormat(String name) { + if (formats.remove(name) == null) + throw new JGitInternalException(MessageFormat.format( + CLIText.get().archiveFormatAlreadyAbsent, + name)); } private static Format lookupFormat(String formatName) throws UnsupportedFormatException { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/FormatActivator.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/FormatActivator.java new file mode 100644 index 000000000..4889faf33 --- /dev/null +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/FormatActivator.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2013 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.archive; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class FormatActivator implements BundleActivator { + public void start(BundleContext context) throws Exception { + ArchiveCommand.registerFormat("tar", new TarFormat()); + ArchiveCommand.registerFormat("zip", new ZipFormat()); + } + + public void stop(BundleContext context) throws Exception { + ArchiveCommand.unregisterFormat("zip"); + ArchiveCommand.unregisterFormat("tar"); + } +} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/TarFormat.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/TarFormat.java index 52252593d..55f6ca942 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/TarFormat.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/TarFormat.java @@ -52,7 +52,7 @@ import org.apache.commons.compress.archivers.tar.TarConstants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectLoader; -class TarFormat implements ArchiveCommand.Format { +public class TarFormat implements ArchiveCommand.Format { public ArchiveOutputStream createArchiveOutputStream(OutputStream s) { return new TarArchiveOutputStream(s); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ZipFormat.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ZipFormat.java index d264161c5..a23cc9f38 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ZipFormat.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ZipFormat.java @@ -51,7 +51,7 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectLoader; -class ZipFormat implements ArchiveCommand.Format { +public class ZipFormat implements ArchiveCommand.Format { public ArchiveOutputStream createArchiveOutputStream(OutputStream s) { return new ZipArchiveOutputStream(s); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java index 937707bd3..b5580bf34 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java @@ -76,6 +76,8 @@ public class CLIText extends TranslationBundle { // @formatter:off /***/ public String alreadyOnBranch; /***/ public String alreadyUpToDate; + /***/ public String archiveFormatAlreadyRegistered; + /***/ public String archiveFormatAlreadyAbsent; /***/ public String authorInfo; /***/ public String averageMSPerRead; /***/ public String branchAlreadyExists; diff --git a/pom.xml b/pom.xml index ee1e45f40..76ba5c006 100644 --- a/pom.xml +++ b/pom.xml @@ -182,6 +182,7 @@ 2.0.12 1.4.1 + 4.3.1 2.5 7.6.0.v20120127 2.4 @@ -441,6 +442,12 @@ jetty-servlet ${jetty-version} + + + org.osgi + org.osgi.core + ${osgi-core-version} +