]> source.dussan.org Git - jgit.git/commitdiff
Add tgz and txz archive formats 95/13295/5
authorJonathan Nieder <jrn@google.com>
Tue, 28 May 2013 23:51:39 +0000 (16:51 -0700)
committerJonathan Nieder <jrn@google.com>
Tue, 28 May 2013 23:51:39 +0000 (16:51 -0700)
Change-Id: I347e8a9a112d142ccef91cba1d6e997d645ca70a

org.eclipse.jgit.archive/META-INF/MANIFEST.MF
org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/FormatActivator.java
org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java [new file with mode: 0644]
org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java

index 3d312e139f39e6f9992eddf9f1b0cff90ab80893..da031aa419523365621e72f95075dc22329bd67a 100644 (file)
@@ -9,6 +9,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)",
  org.apache.commons.compress.archivers.tar;version="[1.3,2.0)",
  org.apache.commons.compress.archivers.zip;version="[1.3,2.0)",
+ org.apache.commons.compress.compressors.gzip;version="[1.3,2.0)",
+ org.apache.commons.compress.compressors.xz;version="[1.3,2.0)",
  org.eclipse.jgit.api;version="[3.0.0,3.1.0)",
  org.eclipse.jgit.lib;version="[3.0.0,3.1.0)",
  org.osgi.framework;version="[4.0,5.0)"
index bf027d0d8e5de0d50e709b35561f7882d6504f2b..793bfd99a66464df941c3babf700112b776baa64 100644 (file)
@@ -80,6 +80,8 @@ public class FormatActivator implements BundleActivator {
         */
        public static void start() {
                register("tar", new TarFormat());
+               register("tgz", new TgzFormat());
+               register("txz", new TxzFormat());
                register("zip", new ZipFormat());
        }
 
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java
new file mode 100644 (file)
index 0000000..d68cb68
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * 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.archive;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
+import org.eclipse.jgit.api.ArchiveCommand;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectLoader;
+
+public class TgzFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
+       private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+
+       public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
+                       throws IOException {
+               GzipCompressorOutputStream out = new GzipCompressorOutputStream(s);
+               return tarFormat.createArchiveOutputStream(out);
+       }
+
+       public void putEntry(ArchiveOutputStream out,
+                       String path, FileMode mode, ObjectLoader loader)
+                       throws IOException {
+               tarFormat.putEntry(out, path, mode, loader);
+       }
+}
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java
new file mode 100644 (file)
index 0000000..622571f
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * 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.archive;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
+import org.eclipse.jgit.api.ArchiveCommand;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectLoader;
+
+public class TxzFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
+       private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+
+       public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
+                       throws IOException {
+               XZCompressorOutputStream out = new XZCompressorOutputStream(s);
+               return tarFormat.createArchiveOutputStream(out);
+       }
+
+       public void putEntry(ArchiveOutputStream out,
+                       String path, FileMode mode, ObjectLoader loader)
+                       throws IOException {
+               tarFormat.putEntry(out, path, mode, loader);
+       }
+}
index 11c5702885f687be92cc519463780cd5dd380532..788d703cf1940f5deac1b93dd5d48a68da5883d6 100644 (file)
@@ -118,7 +118,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
         *      }
         */
        public static interface Format<T extends Closeable> {
-               T createArchiveOutputStream(OutputStream s);
+               T createArchiveOutputStream(OutputStream s) throws IOException;
                void putEntry(T out, String path, FileMode mode,
                                ObjectLoader loader) throws IOException;
        }