Author: bodewig
Date: Sat Aug 15 04:59:10 2009
New Revision: 804435
URL: http://svn.apache.org/viewvc?rev=804435&view=rev
Log:
There will be a lot of extra data to deal with when (cross-)archiving from
existing archives
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java?rev=804435&r1=804434&r2=804435&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
Sat Aug 15 04:59:10 2009
@@ -21,14 +21,29 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import java.util.zip.ZipException;
+import org.apache.ant.compress.resources.ArFileSet;
+import org.apache.ant.compress.resources.CommonsCompressArchiveResource;
+import org.apache.ant.compress.resources.CpioFileSet;
+import org.apache.ant.compress.resources.TarFileSet;
+import org.apache.ant.compress.resources.TarResource;
+import org.apache.ant.compress.resources.ZipFileSet;
+import org.apache.ant.compress.resources.ZipResource;
+import org.apache.ant.compress.util.EntryHelper;
import org.apache.ant.compress.util.StreamFactory;
+import org.apache.commons.compress.archivers.zip.ExtraFieldUtils;
+import org.apache.commons.compress.archivers.zip.ZipExtraField;
+import org.apache.commons.compress.archivers.zip.ZipShort;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.ArchiveFileSet;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.ArchiveResource;
import org.apache.tools.ant.types.resources.FileResource;
/**
@@ -40,6 +55,7 @@
private Resource dest;
private List/*<ResourceCollection>*/ sources = new ArrayList();
private Mode mode = new Mode();
+ private String encoding;
protected ArchiveBase(StreamFactory factory) {
this.factory = factory;
@@ -77,17 +93,186 @@
mode = m;
}
+ /**
+ * Encoding of file names.
+ */
+ public void setEncoding(String e) {
+ encoding = e;
+ }
+
public void execute() {
+ validate();
+ if (!dest.isExists()) {
+ // create mode
+ mode = new Mode();
+ }
+ }
+
+ /**
+ * Argument validation.
+ */
+ protected void validate() throws BuildException {
if (dest == null) {
throw new BuildException("must provide a destination resource");
}
if (sources.size() == 0) {
throw new BuildException("must provide sources");
}
- if (!dest.isExists()) {
- // create mode
- mode = new Mode();
+ }
+
+ /**
+ * Extracts flags from a resource.
+ *
+ * <p>All those exceptions are only here for the code that
+ * translates Ant's ZipExtraFields to CC ZipExtraFields and should
+ * never actually be thrown.</p>
+ */
+ protected ResourceFlags getFlags(Resource r)
+ throws ZipException, InstantiationException, IllegalAccessException {
+ if (r instanceof ArchiveResource) {
+ if (r instanceof CommonsCompressArchiveResource) {
+ if (r instanceof TarResource) {
+ TarResource tr = (TarResource) r;
+ return new ResourceFlags(tr.getMode(), tr.getUid(),
+ tr.getGid(), tr.getUserName(),
+ tr.getGroup());
+ } else if (r instanceof ZipResource) {
+ ZipResource zr = (ZipResource) r;
+ return new ResourceFlags(zr.getMode(),
zr.getExtraFields());
+ } else {
+ CommonsCompressArchiveResource cr =
+ (CommonsCompressArchiveResource) r;
+ return new ResourceFlags(cr.getMode(), cr.getUid(),
+ cr.getGid());
+ }
+ } else if (r instanceof
+ org.apache.tools.ant.types.resources.TarResource) {
+ org.apache.tools.ant.types.resources.TarResource tr =
+ (org.apache.tools.ant.types.resources.TarResource) r;
+ return new ResourceFlags(tr.getMode(), tr.getUid(),
+ tr.getGid(), tr.getUserName(),
+ tr.getGroup());
+ } else if (r instanceof
+ org.apache.tools.ant.types.resources.ZipResource) {
+ org.apache.tools.ant.types.resources.ZipResource zr =
+ (org.apache.tools.ant.types.resources.ZipResource) r;
+
+ org.apache.tools.zip.ZipExtraField[] extra =
zr.getExtraFields();
+ ZipExtraField[] ex =
+ new ZipExtraField[extra == null ? 0 : extra.length];
+ if (extra != null && extra.length > 0) {
+ for (int i = 0; i < extra.length; i++) {
+ ex[i] = ExtraFieldUtils
+ .createExtraField(new
ZipShort(extra[i].getHeaderId()
+ .getValue()));
+ byte[] b = extra[i].getCentralDirectoryData();
+ ex[i].parseFromCentralDirectoryData(b, 0, b.length);
+ b = extra[i].getLocalFileDataData();
+ ex[i].parseFromLocalFileData(b, 0, b.length);
+ }
+ }
+
+ return new ResourceFlags(zr.getMode(), ex);
+ } else {
+ ArchiveResource ar = (ArchiveResource) r;
+ return new ResourceFlags(ar.getMode());
+ }
}
+ return new ResourceFlags();
+ }
+
+ /**
+ * Extracts flags from a resource collection.
+ */
+ protected ResourceCollectionFlags getFlags(ResourceCollection rc) {
+ if (rc instanceof ArchiveFileSet) {
+ if (rc instanceof ArFileSet) {
+ ArFileSet ar = (ArFileSet) rc;
+ return new ResourceCollectionFlags(ar.getPrefix(getProject()),
+
ar.getFullpath(getProject()),
+ ar.hasFileModeBeenSet()
+ ?
ar.getFileMode(getProject())
+ : -1,
+ ar.hasDirModeBeenSet()
+ ?
ar.getDirMode(getProject())
+ : -1,
+ ar.hasUserIdBeenSet()
+ ? ar.getUid()
+ : EntryHelper.UNKNOWN_ID,
+ ar.hasGroupIdBeenSet()
+ ? ar.getGid()
+ : EntryHelper.UNKNOWN_ID);
+ } else if (rc instanceof CpioFileSet) {
+ CpioFileSet cr = (CpioFileSet) rc;
+ return new ResourceCollectionFlags(cr.getPrefix(getProject()),
+
cr.getFullpath(getProject()),
+ cr.hasFileModeBeenSet()
+ ?
cr.getFileMode(getProject())
+ : -1,
+ cr.hasDirModeBeenSet()
+ ?
cr.getDirMode(getProject())
+ : -1,
+ cr.hasUserIdBeenSet()
+ ? cr.getUid()
+ : EntryHelper.UNKNOWN_ID,
+ cr.hasGroupIdBeenSet()
+ ? cr.getGid()
+ : EntryHelper.UNKNOWN_ID);
+ } else if (rc instanceof TarFileSet) {
+ TarFileSet tr = (TarFileSet) rc;
+ return new ResourceCollectionFlags(tr.getPrefix(getProject()),
+
tr.getFullpath(getProject()),
+ tr.hasFileModeBeenSet()
+ ?
tr.getFileMode(getProject())
+ : -1,
+ tr.hasDirModeBeenSet()
+ ?
tr.getDirMode(getProject())
+ : -1,
+ tr.hasUserIdBeenSet()
+ ? tr.getUid()
+ : EntryHelper.UNKNOWN_ID,
+ tr.hasGroupIdBeenSet()
+ ? tr.getGid()
+ : EntryHelper.UNKNOWN_ID,
+ tr.hasUserNameBeenSet()
+ ? tr.getUserName() : null,
+ tr.hasGroupBeenSet()
+ ? tr.getGroup() : null);
+ } else if (rc instanceof
+ org.apache.tools.ant.types.TarFileSet) {
+ org.apache.tools.ant.types.TarFileSet tr =
+ (org.apache.tools.ant.types.TarFileSet) rc;
+ return new ResourceCollectionFlags(tr.getPrefix(getProject()),
+
tr.getFullpath(getProject()),
+ tr.hasFileModeBeenSet()
+ ?
tr.getFileMode(getProject())
+ : -1,
+ tr.hasDirModeBeenSet()
+ ?
tr.getDirMode(getProject())
+ : -1,
+ tr.hasUserIdBeenSet()
+ ? tr.getUid()
+ : EntryHelper.UNKNOWN_ID,
+ tr.hasGroupIdBeenSet()
+ ? tr.getGid()
+ : EntryHelper.UNKNOWN_ID,
+ tr.hasUserNameBeenSet()
+ ? tr.getUserName() : null,
+ tr.hasGroupBeenSet()
+ ? tr.getGroup() : null);
+ } else {
+ ArchiveFileSet ar = (ArchiveFileSet) rc;
+ return new ResourceCollectionFlags(ar.getPrefix(getProject()),
+
ar.getFullpath(getProject()),
+ ar.hasFileModeBeenSet()
+ ?
ar.getFileMode(getProject())
+ : -1,
+ ar.hasDirModeBeenSet()
+ ?
ar.getDirMode(getProject())
+ : -1);
+ }
+ }
+ return new ResourceCollectionFlags();
}
/**
@@ -119,4 +304,138 @@
}
}
+
+ /**
+ * Various flags a (archive) resource may hold in addition to
+ * being a plain resource.
+ */
+ public static class ResourceFlags {
+ private final int mode;
+ private final int gid;
+ private final int uid;
+ private final ZipExtraField[] extraFields;
+ private final String userName;
+ private final String groupName;
+
+ public ResourceFlags() {
+ this(-1);
+ }
+
+ public ResourceFlags(int mode) {
+ this(mode, new ZipExtraField[0]);
+ }
+
+ public ResourceFlags(int mode, ZipExtraField[] extraFields) {
+ this(mode, extraFields, EntryHelper.UNKNOWN_ID,
+ EntryHelper.UNKNOWN_ID, null, null);
+ }
+
+ public ResourceFlags(int mode, int uid, int gid) {
+ this(mode, new ZipExtraField[0], uid, gid, null, null);
+ }
+
+ public ResourceFlags(int mode, int uid, int gid, String userName,
+ String groupName) {
+ this(mode, new ZipExtraField[0], uid, gid, userName, groupName);
+ }
+
+ private ResourceFlags(int mode, ZipExtraField[] extraFields,
+ int uid, int gid,
+ String userName, String groupName) {
+ this.mode = mode;
+ this.extraFields = extraFields;
+ this.gid = gid;
+ this.uid = uid;
+ this.userName = userName;
+ this.groupName = groupName;
+ }
+
+ public boolean hasModeBeenSet() { return mode >= 0; }
+ public int getMode() { return mode; }
+
+ public ZipExtraField[] getZipExtraFields() { return extraFields; }
+
+ public boolean hasUserIdBeenSet() {
+ return uid != EntryHelper.UNKNOWN_ID;
+ }
+ public int getUserId() { return uid; }
+
+ public boolean hasGroupIdBeenSet() {
+ return gid != EntryHelper.UNKNOWN_ID;
+ }
+ public int getGroupId() { return gid; }
+
+ public boolean hasUserNameBeenSet() { return userName != null; }
+ public String getUserName() { return userName; }
+
+ public boolean hasGroupNameBeenSet() { return groupName != null; }
+ public String getGroupName() { return groupName; }
+ }
+
+ /**
+ * Various flags a (archive) resource collection may hold.
+ */
+ public static class ResourceCollectionFlags extends ResourceFlags {
+ private final String prefix, fullpath;
+ private final int dirMode;
+
+ public ResourceCollectionFlags() {
+ this(null, null);
+ }
+
+ public ResourceCollectionFlags(String prefix, String fullpath) {
+ this(prefix, fullpath, -1, -1);
+ }
+
+ public ResourceCollectionFlags(String prefix, String fullpath,
+ int fileMode, int dirMode) {
+ this(prefix, fullpath, fileMode, dirMode, EntryHelper.UNKNOWN_ID,
+ EntryHelper.UNKNOWN_ID);
+ }
+
+ public ResourceCollectionFlags(String prefix, String fullpath,
+ int fileMode, int dirMode,
+ int uid, int gid) {
+ this(prefix, fullpath, fileMode, dirMode, uid, gid, null, null);
+ }
+
+ public ResourceCollectionFlags(String prefix, String fullpath,
+ int fileMode, int dirMode,
+ int uid, int gid,
+ String userName, String groupName) {
+ super(fileMode, uid, gid, userName, groupName);
+ this.dirMode = dirMode;
+ this.prefix = prefix;
+ this.fullpath = fullpath;
+ }
+
+ public boolean hasDirModeBeenSet() { return dirMode >= 0; }
+ public int getDirMode() { return dirMode; }
+
+ public boolean hasPrefix() { return prefix != null; }
+ public String getPrefix() { return prefix; }
+
+ public boolean hasFullpath() { return fullpath != null; }
+ public String getFullpath() { return fullpath; }
+ }
+
+ /**
+ * Binds a resource to additional data that may be present.
+ */
+ public static class ResourceWithFlags {
+ private final Resource r;
+ private final ResourceCollectionFlags rcFlags;
+ private final ResourceFlags rFlags;
+
+ public ResourceWithFlags(Resource r, ResourceCollectionFlags rcFlags,
+ ResourceFlags rFlags) {
+ this.r = r;
+ this.rcFlags = rcFlags;
+ this.rFlags = rFlags;
+ }
+
+ public Resource getResource() { return r; }
+ public ResourceCollectionFlags getCollectionFlags() { return rcFlags; }
+ public ResourceFlags getResourceFlags() { return rFlags; }
+ }
}
