@@ -6,7 +6,8 @@ Bundle-Version: 2.2.0.qualifier | |||
Bundle-Vendor: %provider_name | |||
Bundle-Localization: plugin | |||
Bundle-RequiredExecutionEnvironment: J2SE-1.5 | |||
Import-Package: org.eclipse.jgit.api;version="[2.2.0,2.3.0)", | |||
Import-Package: org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", | |||
org.eclipse.jgit.api;version="[2.2.0,2.3.0)", | |||
org.eclipse.jgit.api.errors;version="[2.2.0,2.3.0)", | |||
org.eclipse.jgit.awtui;version="[2.2.0,2.3.0)", | |||
org.eclipse.jgit.blame;version="[2.2.0,2.3.0)", |
@@ -71,6 +71,11 @@ | |||
<artifactId>args4j</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.commons</groupId> | |||
<artifactId>commons-compress</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jgit</groupId> | |||
<artifactId>org.eclipse.jgit</artifactId> |
@@ -46,9 +46,9 @@ package org.eclipse.jgit.pgm; | |||
import java.lang.String; | |||
import java.lang.System; | |||
import java.text.MessageFormat; | |||
import java.util.zip.ZipEntry; | |||
import java.util.zip.ZipOutputStream; | |||
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; | |||
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.MutableObjectId; | |||
import org.eclipse.jgit.lib.ObjectLoader; | |||
@@ -69,7 +69,7 @@ class Archive extends TextBuiltin { | |||
final TreeWalk walk = new TreeWalk(db); | |||
final ObjectReader reader = walk.getObjectReader(); | |||
final MutableObjectId idBuf = new MutableObjectId(); | |||
final ZipOutputStream out = new ZipOutputStream(outs); | |||
final ZipArchiveOutputStream out = new ZipArchiveOutputStream(outs); | |||
if (tree == null) | |||
throw die(CLIText.get().treeIsRequired); | |||
@@ -87,11 +87,12 @@ class Archive extends TextBuiltin { | |||
continue; | |||
walk.getObjectId(idBuf, 0); | |||
final ZipEntry entry = new ZipEntry(name); | |||
final ZipArchiveEntry entry = new ZipArchiveEntry(name); | |||
final ObjectLoader loader = reader.open(idBuf); | |||
entry.setSize(loader.getSize()); | |||
out.putNextEntry(entry); | |||
out.putArchiveEntry(entry); | |||
loader.copyTo(out); | |||
out.closeArchiveEntry(); | |||
if (mode != FileMode.REGULAR_FILE) | |||
System.err.println(MessageFormat.format( // |
@@ -173,6 +173,7 @@ | |||
<jsch-version>0.1.44-1</jsch-version> | |||
<junit-version>4.5</junit-version> | |||
<args4j-version>2.0.12</args4j-version> | |||
<commons-compress-version>1.3</commons-compress-version> | |||
<servlet-api-version>2.5</servlet-api-version> | |||
<jetty-version>7.6.0.v20120127</jetty-version> | |||
<clirr-version>2.4</clirr-version> | |||
@@ -415,6 +416,12 @@ | |||
<version>${servlet-api-version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.commons</groupId> | |||
<artifactId>commons-compress</artifactId> | |||
<version>${commons-compress-version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-servlet</artifactId> |