Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java4
7 files changed, 9 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
index 6a89bec8a..2ae4ec4ea 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
@@ -170,7 +170,7 @@ public class Optimizer {
newDescriptor.setProperty(IArtifactDescriptor.FORMAT, JAR_DELTA_FORMAT);
OutputStream repositoryStream = null;
try {
- repositoryStream = repository.getOutputStream(newDescriptor);
+ repositoryStream = repository.getOutputStream(newDescriptor, null);
// Add in all the processing steps needed to optimize (e.g., pack200, ...)
ProcessingStep optimizerStep = new JarDeltaOptimizerStep(repository);
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
index eedd23545..de6361980 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
@@ -183,7 +183,7 @@ public class Optimizer {
newDescriptor.setProperty(IArtifactDescriptor.FORMAT, strategy);
OutputStream repositoryStream = null;
try {
- repositoryStream = repository.getOutputStream(newDescriptor);
+ repositoryStream = repository.getOutputStream(newDescriptor, null);
// Add in all the processing steps needed to optimize (e.g., pack200, ...)
ProcessingStep diffStep = getProcessingStep(strategy);
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
index dfbeefb23..c920cde47 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
@@ -56,7 +56,7 @@ public class Optimizer {
newDescriptor.setProperty(IArtifactDescriptor.FORMAT, PACKED_FORMAT);
OutputStream repositoryStream = null;
try {
- repositoryStream = repository.getOutputStream(newDescriptor);
+ repositoryStream = repository.getOutputStream(newDescriptor, null);
// Add in all the processing steps needed to optimize (e.g., pack200, ...)
ProcessingStepHandler handler = new ProcessingStepHandler();
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java
index b954fb99a..ba30c7fc2 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java
@@ -43,7 +43,7 @@ public class Mirror {
OutputStream repositoryStream = null;
try {
System.out.println("Mirroring: " + descriptor.getArtifactKey()); //$NON-NLS-1$
- repositoryStream = destination.getOutputStream(newDescriptor);
+ repositoryStream = destination.getOutputStream(newDescriptor, null);
if (repositoryStream == null)
return;
source.getArtifact(descriptor, repositoryStream, new NullProgressMonitor());
@@ -56,4 +56,5 @@ public class Mirror {
e.printStackTrace();
}
}
+
}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
index 896a91ee0..cc2c4ce18 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
@@ -88,7 +88,7 @@ public class MirrorRequest extends ArtifactRequest {
if (targetDescriptorProperties != null)
destinationDescriptor.addProperties(targetDescriptorProperties);
- OutputStream destination = target.getOutputStream(destinationDescriptor);
+ OutputStream destination = target.getOutputStream(destinationDescriptor, this);
if (destination == null) {
setResult(new Status(IStatus.ERROR, Activator.ID, "Can't get an output stream to " + target + " to store " + getArtifactKey()));
return;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java
index 003b6cebb..926758fdd 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java
@@ -37,7 +37,7 @@ public abstract class AbstractArtifactRepository extends AbstractRepository impl
public abstract IStatus getArtifacts(IArtifactRequest[] requests, IProgressMonitor monitor);
- public OutputStream getOutputStream(IArtifactDescriptor descriptor) {
+ public OutputStream getOutputStream(IArtifactDescriptor descriptor, IArtifactRequest request) {
if (!isModifiable())
throw new UnsupportedOperationException("Repository not modifiable");
return null;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java
index a35b65932..4bb9a4bd7 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java
@@ -512,7 +512,7 @@ public class Generator {
if (asIs && files.length == 1) {
try {
if (!destination.contains(descriptor)) {
- OutputStream output = destination.getOutputStream(descriptor);
+ OutputStream output = destination.getOutputStream(descriptor, null);
if (output == null)
throw new IOException("unable to open output stream for " + descriptor);
FileUtils.copyStream(new BufferedInputStream(new FileInputStream(files[0])), true, new BufferedOutputStream(output), true);
@@ -528,7 +528,7 @@ public class Generator {
tempFile = File.createTempFile("p2.generator", ""); //$NON-NLS-1$ //$NON-NLS-2$
FileUtils.zip(files, tempFile);
if (!destination.contains(descriptor)) {
- OutputStream output = destination.getOutputStream(descriptor);
+ OutputStream output = destination.getOutputStream(descriptor, null);
if (output == null)
throw new IOException("unable to open output stream for " + descriptor);
FileUtils.copyStream(new BufferedInputStream(new FileInputStream(tempFile)), true, new BufferedOutputStream(output), true);

Back to the top