From ed5199f63b090063e07b19c8651bbfc484361462 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 5 Jun 2013 19:12:37 -0700 Subject: [PATCH] Add tbz2 archive format Change-Id: Idb7ff75877a0cfe23f47e10e3f6f93386f5bb145 --- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 1 + .../eclipse/jgit/archive/ArchiveFormats.java | 1 + .../org/eclipse/jgit/archive/Tbz2Format.java | 71 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 4dd03e115a..48027d712e 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ 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.bzip2;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)", diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java index 3a86c05c7b..f065871969 100644 --- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ArchiveFormats.java @@ -72,6 +72,7 @@ public class ArchiveFormats { public static void registerAll() { register("tar", new TarFormat()); register("tgz", new TgzFormat()); + register("tbz2", new Tbz2Format()); register("txz", new TxzFormat()); register("zip", new ZipFormat()); } diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java new file mode 100644 index 0000000000..9883118ea2 --- /dev/null +++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java @@ -0,0 +1,71 @@ +/* + * 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.bzip2.BZip2CompressorOutputStream; +import org.eclipse.jgit.api.ArchiveCommand; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.ObjectLoader; + +/** + * bzip2-compressed tarball (tar.bz2) format. + */ +public class Tbz2Format implements ArchiveCommand.Format { + private final ArchiveCommand.Format tarFormat = new TarFormat(); + + public ArchiveOutputStream createArchiveOutputStream(OutputStream s) + throws IOException { + BZip2CompressorOutputStream out = new BZip2CompressorOutputStream(s); + return tarFormat.createArchiveOutputStream(out); + } + + public void putEntry(ArchiveOutputStream out, + String path, FileMode mode, ObjectLoader loader) + throws IOException { + tarFormat.putEntry(out, path, mode, loader); + } +} -- 2.39.5