diff options
| author | Pascal Rapicault | 2008-05-29 14:54:57 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2008-05-29 14:54:57 +0000 |
| commit | 6d312abb94922d5336c8de7ccec87de1af9697cc (patch) | |
| tree | eaae368629ffe7876ead1d2aa5694ca143775a37 /bundles | |
| parent | 03290ff9c7c5569ef01d3db04acc56f071137c03 (diff) | |
| download | rt.equinox.p2-6d312abb94922d5336c8de7ccec87de1af9697cc.tar.gz rt.equinox.p2-6d312abb94922d5336c8de7ccec87de1af9697cc.tar.xz rt.equinox.p2-6d312abb94922d5336c8de7ccec87de1af9697cc.zip | |
remove part of a patch accidentally released
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java index 44a94c898..c215ef1e3 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java @@ -20,7 +20,8 @@ import org.eclipse.equinox.internal.p2.metadata.generator.*; import org.eclipse.equinox.internal.p2.metadata.generator.Messages; import org.eclipse.equinox.internal.p2.metadata.generator.features.*; import org.eclipse.equinox.internal.provisional.frameworkadmin.*; -import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; import org.eclipse.equinox.internal.provisional.p2.metadata.*; @@ -364,7 +365,6 @@ public class Generator { IArtifactKey key = MetadataGeneratorHelper.createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString()); IArtifactDescriptor ad = MetadataGeneratorHelper.createArtifactDescriptor(key, new File(bd.getLocation()), true, false); - ((ArtifactDescriptor) ad).setProperty(IArtifactDescriptor.DOWNLOAD_CONTENTTYPE, IArtifactDescriptor.TYPE_ZIP); File bundleFile = new File(bd.getLocation()); if (bundleFile.isDirectory()) publishArtifact(ad, bundleFile.listFiles(), destination, false); @@ -1216,7 +1216,6 @@ public class Generator { tempFile = File.createTempFile("p2.generator", ""); //$NON-NLS-1$ //$NON-NLS-2$ FileUtils.zip(files, tempFile); if (!destination.contains(descriptor)) { - destination.setProperty(IArtifactDescriptor.DOWNLOAD_CONTENTTYPE, IArtifactDescriptor.TYPE_ZIP); OutputStream output = new BufferedOutputStream(destination.getOutputStream(descriptor)); FileUtils.copyStream(new BufferedInputStream(new FileInputStream(tempFile)), true, output, true); } |