### Eclipse Workspace Patch 1.0
#P org.eclipse.equinox.p2.metadata.generator
Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java,v
retrieving revision 1.67
diff -u -r1.67 MetadataGeneratorHelper.java
--- src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java 12 Feb 2009 22:33:02 -0000 1.67
+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java 20 Feb 2009 00:10:24 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata.generator;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import java.io.*;
@@ -196,7 +198,7 @@
// TODO - this is wrong but I'm testing a work-around for bug 205842
result.setProperty(IArtifactDescriptor.DOWNLOAD_SIZE, Long.toString(pathOnDisk.length()));
}
- ProcessingStepDescriptor[] steps = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)}; //$NON-NLS-1$
+ IProcessingStepDescriptor[] steps = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)}; //$NON-NLS-1$
result.setProcessingSteps(steps);
result.setProperty(IArtifactDescriptor.FORMAT, PACKED_FORMAT);
return result;
#P org.eclipse.equinox.p2.artifact.optimizers
Index: src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java,v
retrieving revision 1.4
diff -u -r1.4 AbstractDeltaStep.java
--- src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java 14 May 2008 22:43:45 -0000 1.4
+++ src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java 20 Feb 2009 00:10:25 -0000
@@ -10,13 +10,14 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.optimizers;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.artifact.processing.AbstractBufferingStep;
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
/**
@@ -39,12 +40,12 @@
this.repository = repository;
}
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
readArtifactKey(descriptor);
}
- protected void readArtifactKey(ProcessingStepDescriptor descriptor) {
+ protected void readArtifactKey(IProcessingStepDescriptor descriptor) {
try {
key = ArtifactKey.parse(descriptor.getData());
} catch (IllegalArgumentException e) {
Index: src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java,v
retrieving revision 1.9
diff -u -r1.9 Optimizer.java
--- src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java 15 Feb 2008 16:49:30 -0000 1.9
+++ src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java 20 Feb 2009 00:10:25 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
@@ -179,8 +181,8 @@
System.out.println("\t with " + strategy + " against " + descriptors[i].getArtifactKey());
String predecessorData = descriptors[i].getArtifactKey().toExternalForm();
ArtifactDescriptor newDescriptor = new ArtifactDescriptor(complete);
- ProcessingStepDescriptor patchStep = new ProcessingStepDescriptor(strategy, predecessorData, true);
- ProcessingStepDescriptor[] steps = new ProcessingStepDescriptor[] {patchStep};
+ IProcessingStepDescriptor patchStep = new ProcessingStepDescriptor(strategy, predecessorData, true);
+ IProcessingStepDescriptor[] steps = new IProcessingStepDescriptor[] {patchStep};
newDescriptor.setProcessingSteps(steps);
newDescriptor.setProperty(IArtifactDescriptor.FORMAT, strategy);
OutputStream repositoryStream = null;
Index: src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java,v
retrieving revision 1.11
diff -u -r1.11 Optimizer.java
--- src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java 15 Feb 2008 16:49:30 -0000 1.11
+++ src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java 20 Feb 2009 00:10:25 -0000
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.optimizers.pack200;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import java.io.OutputStream;
import org.eclipse.core.runtime.IStatus;
@@ -58,7 +60,7 @@
private void optimize(IArtifactDescriptor descriptor) {
ArtifactDescriptor newDescriptor = new ArtifactDescriptor(descriptor);
- ProcessingStepDescriptor[] steps = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)}; //$NON-NLS-1$
+ IProcessingStepDescriptor[] steps = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)}; //$NON-NLS-1$
newDescriptor.setProcessingSteps(steps);
newDescriptor.setProperty(IArtifactDescriptor.FORMAT, PACKED_FORMAT);
OutputStream repositoryStream = null;
Index: src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java,v
retrieving revision 1.11
diff -u -r1.11 Optimizer.java
--- src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java 22 Dec 2008 15:30:52 -0000 1.11
+++ src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java 20 Feb 2009 00:10:25 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.optimizers.jardelta;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
@@ -166,8 +168,8 @@
System.out.println("\t with jar delta against " + descriptors[i].getArtifactKey());
String predecessorData = descriptors[i].getArtifactKey().toExternalForm();
ArtifactDescriptor newDescriptor = new ArtifactDescriptor(canonical);
- ProcessingStepDescriptor patchStep = new ProcessingStepDescriptor(JAR_DELTA_PATCH_STEP, predecessorData, true);
- ProcessingStepDescriptor[] steps = new ProcessingStepDescriptor[] {patchStep};
+ IProcessingStepDescriptor patchStep = new ProcessingStepDescriptor(JAR_DELTA_PATCH_STEP, predecessorData, true);
+ IProcessingStepDescriptor[] steps = new IProcessingStepDescriptor[] {patchStep};
newDescriptor.setProcessingSteps(steps);
newDescriptor.setProperty(IArtifactDescriptor.FORMAT, JAR_DELTA_FORMAT);
OutputStream repositoryStream = null;
#P org.eclipse.equinox.p2.artifact.repository
Index: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/ArtifactDescriptor.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/ArtifactDescriptor.java,v
retrieving revision 1.6
diff -u -r1.6 ArtifactDescriptor.java
--- src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/ArtifactDescriptor.java 12 Nov 2008 16:00:57 -0000 1.6
+++ src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/ArtifactDescriptor.java 20 Feb 2009 00:10:27 -0000
@@ -10,10 +10,11 @@
*******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.artifact.repository;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.util.Arrays;
import java.util.Map;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
/**
@@ -22,13 +23,13 @@
public class ArtifactDescriptor implements IArtifactDescriptor {
public static final String ARTIFACT_REFERENCE = "artifact.reference"; //$NON-NLS-1$
- private static final ProcessingStepDescriptor[] EMPTY_STEPS = new ProcessingStepDescriptor[0];
+ private static final IProcessingStepDescriptor[] EMPTY_STEPS = new IProcessingStepDescriptor[0];
protected IArtifactKey key; // The key associated with this artifact
// The list of post processing steps that must be applied one the artifact once it
// has been downloaded (e.g, unpack, then md5 checksum, then...)
- protected ProcessingStepDescriptor[] processingSteps = EMPTY_STEPS;
+ protected IProcessingStepDescriptor[] processingSteps = EMPTY_STEPS;
protected Map properties = new OrderedProperties();
protected Map repositoryProperties = new OrderedProperties();
@@ -110,11 +111,11 @@
return OrderedProperties.unmodifiableProperties(repositoryProperties);
}
- public ProcessingStepDescriptor[] getProcessingSteps() {
+ public IProcessingStepDescriptor[] getProcessingSteps() {
return processingSteps;
}
- public void setProcessingSteps(ProcessingStepDescriptor[] value) {
+ public void setProcessingSteps(IProcessingStepDescriptor[] value) {
processingSteps = value == null ? EMPTY_STEPS : value;
}
Index: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactDescriptor.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactDescriptor.java,v
retrieving revision 1.3
diff -u -r1.3 IArtifactDescriptor.java
--- src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactDescriptor.java 29 May 2008 21:54:29 -0000 1.3
+++ src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactDescriptor.java 20 Feb 2009 00:10:27 -0000
@@ -10,8 +10,9 @@
*******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.artifact.repository;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.util.Map;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
public interface IArtifactDescriptor {
@@ -50,7 +51,7 @@
* copy of the artifact in its native form.
* @return the list of processing steps for this descriptor
*/
- public abstract ProcessingStepDescriptor[] getProcessingSteps();
+ public abstract IProcessingStepDescriptor[] getProcessingSteps();
/**
* Return the artifact repository that holds the artifact described by this descriptor.
Index: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java,v
retrieving revision 1.3
diff -u -r1.3 ProcessingStepHandler.java
--- src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java 28 May 2008 20:37:13 -0000 1.3
+++ src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java 20 Feb 2009 00:10:28 -0000
@@ -40,7 +40,7 @@
IExtensionPoint point = registry.getExtensionPoint(PROCESSING_STEPS_EXTENSION_ID);
if (point == null)
return false;
- ProcessingStepDescriptor[] steps = descriptor.getProcessingSteps();
+ IProcessingStepDescriptor[] steps = descriptor.getProcessingSteps();
for (int i = 0; i < steps.length; i++) {
if (point.getExtension(steps[i].getProcessorId()) == null)
return false;
@@ -92,14 +92,14 @@
return null;
}
- public ProcessingStep[] create(ProcessingStepDescriptor[] descriptors, IArtifactDescriptor context) {
+ public ProcessingStep[] create(IProcessingStepDescriptor[] descriptors, IArtifactDescriptor context) {
ProcessingStep[] result = new ProcessingStep[descriptors.length];
for (int i = 0; i < descriptors.length; i++)
result[i] = create(descriptors[i], context);
return result;
}
- public ProcessingStep create(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public ProcessingStep create(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
IExtensionRegistry registry = RegistryFactory.getRegistry();
IExtension extension = registry.getExtension(PROCESSING_STEPS_EXTENSION_ID, descriptor.getProcessorId());
Exception error;
@@ -122,7 +122,7 @@
return result;
}
- public OutputStream createAndLink(ProcessingStepDescriptor[] descriptors, IArtifactDescriptor context, OutputStream output, IProgressMonitor monitor) {
+ public OutputStream createAndLink(IProcessingStepDescriptor[] descriptors, IArtifactDescriptor context, OutputStream output, IProgressMonitor monitor) {
if (descriptors == null)
return output;
ProcessingStep[] steps = create(descriptors, context);
Index: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepDescriptor.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepDescriptor.java,v
retrieving revision 1.2
diff -u -r1.2 ProcessingStepDescriptor.java
--- src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepDescriptor.java 29 Sep 2008 14:45:13 -0000 1.2
+++ src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepDescriptor.java 20 Feb 2009 00:10:28 -0000
@@ -13,7 +13,7 @@
/**
* The description of a processor step.
*/
-public class ProcessingStepDescriptor {
+public class ProcessingStepDescriptor implements IProcessingStepDescriptor {
private final String processorId; //the operation to be applied (e.g: unpack, md5, signature verification, etc.)
private final String data; //data requested for the processing (eg. expected checksum)
@@ -45,9 +45,6 @@
return required;
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -57,28 +54,25 @@
return result;
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
- if (!(obj instanceof ProcessingStepDescriptor))
+ if (!(obj instanceof IProcessingStepDescriptor))
return false;
- final ProcessingStepDescriptor other = (ProcessingStepDescriptor) obj;
+ final IProcessingStepDescriptor other = (IProcessingStepDescriptor) obj;
if (data == null) {
- if (other.data != null)
+ if (other.getData() != null)
return false;
- } else if (!data.equals(other.data))
+ } else if (!data.equals(other.getData()))
return false;
if (processorId == null) {
- if (other.processorId != null)
+ if (other.getProcessorId() != null)
return false;
- } else if (!processorId.equals(other.processorId))
+ } else if (!processorId.equals(other.getProcessorId()))
return false;
- if (required != other.required)
+ if (required != other.isRequired())
return false;
return true;
}
Index: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java,v
retrieving revision 1.3
diff -u -r1.3 ProcessingStep.java
--- src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java 28 May 2008 20:37:13 -0000 1.3
+++ src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java 20 Feb 2009 00:10:27 -0000
@@ -39,7 +39,7 @@
* @param descriptor description of the step
* @param context the context in which the step is being used
*/
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
// nothing to do here!
}
Index: src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java,v
retrieving revision 1.22
diff -u -r1.22 SimpleArtifactRepositoryIO.java
--- src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java 18 Feb 2009 19:38:44 -0000 1.22
+++ src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java 20 Feb 2009 00:10:27 -0000
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.repository.simple;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.net.URL;
import java.util.*;
@@ -190,7 +192,7 @@
end(ARTIFACTS_ELEMENT);
}
- private void writeProcessingSteps(ProcessingStepDescriptor[] processingSteps) {
+ private void writeProcessingSteps(IProcessingStepDescriptor[] processingSteps) {
if (processingSteps.length > 0) {
start(PROCESSING_STEPS_ELEMENT);
attribute(COLLECTION_SIZE_ATTRIBUTE, processingSteps.length);
@@ -449,7 +451,7 @@
properties = (repositoryPropertiesHandler == null ? new OrderedProperties(0) : repositoryPropertiesHandler.getProperties());
currentArtifact.addRepositoryProperties(properties);
- ProcessingStepDescriptor[] processingSteps = (processingStepsHandler == null ? new ProcessingStepDescriptor[0] //
+ IProcessingStepDescriptor[] processingSteps = (processingStepsHandler == null ? new IProcessingStepDescriptor[0] //
: processingStepsHandler.getProcessingSteps());
currentArtifact.setProcessingSteps(processingSteps);
artifacts.add(currentArtifact);
@@ -467,8 +469,8 @@
processingSteps = (size != null ? new ArrayList(new Integer(size).intValue()) : new ArrayList(4));
}
- public ProcessingStepDescriptor[] getProcessingSteps() {
- return (ProcessingStepDescriptor[]) processingSteps.toArray(new ProcessingStepDescriptor[processingSteps.size()]);
+ public IProcessingStepDescriptor[] getProcessingSteps() {
+ return (IProcessingStepDescriptor[]) processingSteps.toArray(new IProcessingStepDescriptor[processingSteps.size()]);
}
public void startElement(String name, Attributes attributes) {
Index: src/org/eclipse/equinox/internal/p2/artifact/processors/md5/MD5Verifier.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/md5/MD5Verifier.java,v
retrieving revision 1.1
diff -u -r1.1 MD5Verifier.java
--- src/org/eclipse/equinox/internal/p2/artifact/processors/md5/MD5Verifier.java 21 Oct 2008 00:20:30 -0000 1.1
+++ src/org/eclipse/equinox/internal/p2/artifact/processors/md5/MD5Verifier.java 20 Feb 2009 00:10:26 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.processors.md5;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -19,7 +21,6 @@
import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.osgi.util.NLS;
public class MD5Verifier extends ProcessingStep {
@@ -38,7 +39,7 @@
}
//This handle the case where the MD5 verification is initiated by a processing step
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
String data = descriptor.getData();
if (IArtifactDescriptor.DOWNLOAD_MD5.equals(data))
@@ -50,7 +51,7 @@
basicInitialize(descriptor);
}
- private void basicInitialize(ProcessingStepDescriptor descriptor) {
+ private void basicInitialize(IProcessingStepDescriptor descriptor) {
int code = (descriptor == null) ? IStatus.ERROR : descriptor.isRequired() ? IStatus.ERROR : IStatus.INFO;
if (expectedMD5 == null || expectedMD5.length() != 32)
setStatus(new Status(code, Activator.ID, NLS.bind(Messages.Error_invalid_hash, expectedMD5)));
Index: src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java,v
retrieving revision 1.1
diff -u -r1.1 Pack200ProcessorStep.java
--- src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java 14 May 2008 22:43:44 -0000 1.1
+++ src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java 20 Feb 2009 00:10:27 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.processors.pack200;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -19,7 +21,6 @@
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor;
import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor.Options;
@@ -36,7 +37,7 @@
return new BufferedOutputStream(new FileOutputStream(incoming));
}
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
if (!UnpackStep.canUnpack())
setStatus(new Status(IStatus.ERROR, Activator.ID, "Unpack facility not configured")); //$NON-NLS-1$
Index: src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java,v
retrieving revision 1.28
diff -u -r1.28 MirrorRequest.java
--- src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java 18 Feb 2009 23:36:14 -0000 1.28
+++ src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java 20 Feb 2009 00:10:27 -0000
@@ -12,11 +12,12 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.repository;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.Properties;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
@@ -26,7 +27,7 @@
* A request to mirror (copy) an artifact into a given destination artifact repository.
*/
public class MirrorRequest extends ArtifactRequest {
- private static final ProcessingStepDescriptor[] EMPTY_STEPS = new ProcessingStepDescriptor[0];
+ private static final IProcessingStepDescriptor[] EMPTY_STEPS = new IProcessingStepDescriptor[0];
private final IArtifactRepository target;
Index: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/IProcessingStepDescriptor.java
===================================================================
RCS file: src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/IProcessingStepDescriptor.java
diff -N src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/IProcessingStepDescriptor.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/IProcessingStepDescriptor.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,45 @@
+/*******************************************************************************
+* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
+* program and the accompanying materials are made available under the terms of
+* the Eclipse Public License v1.0 which accompanies this distribution, and is
+* available at http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* EclipseSource - initial API and implementation
+******************************************************************************/
+package org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing;
+
+/**
+ * The description of a processor step.
+ */
+public interface IProcessingStepDescriptor {
+
+ /**
+ * Returns the ProcessorID for the Processing step
+ */
+ public abstract String getProcessorId();
+
+ /**
+ * Returns the Data for the Processing Step
+ */
+ public abstract String getData();
+
+ /**
+ * Returns true if this step is required
+ */
+ public abstract boolean isRequired();
+
+ /**
+ * Returns whether this ProcessingStepDescriptor is equal to the given object.
+ *
+ * This method returns true if:
+ *
+ * - Both this object and the given object are of type IProcessingStepDescriptor
+ *
- The result of getProcessorId() on both objects are equal
+ *
- The result of getData() on both objects are equal
+ *
- The result of isRequired() on both objects are equal
+ *
+ */
+ public abstract boolean equals(Object obj);
+
+}
\ No newline at end of file
#P org.eclipse.equinox.p2.publisher
Index: src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java,v
retrieving revision 1.17
diff -u -r1.17 AbstractPublisherAction.java
--- src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java 11 Feb 2009 16:25:48 -0000 1.17
+++ src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java 20 Feb 2009 00:10:29 -0000
@@ -10,6 +10,8 @@
******************************************************************************/
package org.eclipse.equinox.p2.publisher;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.*;
import org.eclipse.core.runtime.*;
@@ -169,7 +171,7 @@
// TODO - this is wrong but I'm testing a work-around for bug 205842
result.setProperty(IArtifactDescriptor.DOWNLOAD_SIZE, Long.toString(pathOnDisk.length()));
}
- ProcessingStepDescriptor[] steps = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)}; //$NON-NLS-1$
+ IProcessingStepDescriptor[] steps = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)}; //$NON-NLS-1$
result.setProcessingSteps(steps);
result.setProperty(IArtifactDescriptor.FORMAT, PACKED_FORMAT);
return result;
#P org.eclipse.equinox.p2.ui
Index: src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java,v
retrieving revision 1.9
diff -u -r1.9 ProvElementLabelProvider.java
--- src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java 30 Dec 2008 15:57:39 -0000 1.9
+++ src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java 20 Feb 2009 00:10:30 -0000
@@ -11,10 +11,11 @@
package org.eclipse.equinox.internal.provisional.p2.ui.viewers;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import org.eclipse.equinox.internal.p2.ui.model.IIUElement;
import org.eclipse.equinox.internal.p2.ui.model.ProvElement;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
@@ -67,8 +68,8 @@
IArtifactKey key = (IArtifactKey) obj;
return key.getId() + " [" + key.getClassifier() + "]"; //$NON-NLS-1$//$NON-NLS-2$
}
- if (obj instanceof ProcessingStepDescriptor) {
- ProcessingStepDescriptor descriptor = (ProcessingStepDescriptor) obj;
+ if (obj instanceof IProcessingStepDescriptor) {
+ IProcessingStepDescriptor descriptor = (IProcessingStepDescriptor) obj;
return descriptor.getProcessorId();
}
if (obj instanceof IRequiredCapability) {
#P org.eclipse.equinox.p2.artifact.processors
Index: src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java,v
retrieving revision 1.9
diff -u -r1.9 AbstractDeltaProcessorStep.java
--- src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java 24 Oct 2008 19:21:58 -0000 1.9
+++ src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java 20 Feb 2009 00:10:31 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.internal.p2.artifact.processors;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
import java.net.URI;
@@ -19,7 +21,6 @@
import org.eclipse.equinox.internal.p2.artifact.optimizers.AbstractDeltaStep;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
/**
@@ -30,7 +31,7 @@
*/
public abstract class AbstractDeltaProcessorStep extends AbstractDeltaStep {
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
if (!getStatus().isOK())
return;
#P org.eclipse.equinox.p2.tests
Index: src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java,v
retrieving revision 1.5
diff -u -r1.5 Multiplier.java
--- src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java 12 Sep 2008 21:39:05 -0000 1.5
+++ src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java 20 Feb 2009 00:10:32 -0000
@@ -11,13 +11,14 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository.processing;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class Multiplier extends ProcessingStep {
@@ -32,7 +33,7 @@
this.operand = operand;
}
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
try {
operand = Integer.valueOf(descriptor.getData()).intValue();
Index: src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java,v
retrieving revision 1.13
diff -u -r1.13 ProcessingStepHandlerTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java 15 Sep 2008 17:19:10 -0000 1.13
+++ src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java 20 Feb 2009 00:10:32 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository.processing;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.Arrays;
import junit.framework.TestCase;
@@ -29,7 +31,7 @@
IProgressMonitor monitor = new NullProgressMonitor();
public void testExecuteNoPSs() throws IOException {
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[0];
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[0];
OutputStream result = new ByteArrayOutputStream(10);
OutputStream testStream = handler.createAndLink(descriptors, null, result, monitor);
testStream.write("Test".getBytes());
@@ -125,7 +127,7 @@
//this test is only applicable if pack200 is available
if (!PackStep.canPack())
return;
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)};
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)};
ProcessingStep[] steps = handler.create(descriptors, null);
ByteArrayOutputStream result = new ByteArrayOutputStream(100000);
OutputStream testStream = handler.link(steps, result, monitor);
@@ -137,7 +139,7 @@
}
public void testCreateByteShifterPS() {
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.ByteShifter", "1", true)};
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.ByteShifter", "1", true)};
ProcessingStep[] steps = handler.create(descriptors, null);
assertNotNull(steps);
assertEquals(1, steps.length);
@@ -153,7 +155,7 @@
// }
public void testCreateAdderPS() {
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true)};
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true)};
ProcessingStep[] steps = handler.create(descriptors, null);
assertNotNull(steps);
assertEquals(1, steps.length);
@@ -161,7 +163,7 @@
}
public void testCreateMultiplierPS() {
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true)};
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true)};
ProcessingStep[] steps = handler.create(descriptors, null);
assertNotNull(steps);
assertEquals(1, steps.length);
@@ -169,7 +171,7 @@
}
public void testCreatePack200UnpackerPS() {
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)};
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true)};
ProcessingStep[] steps = handler.create(descriptors, null);
assertNotNull(steps);
assertEquals(1, steps.length);
@@ -177,9 +179,9 @@
}
public void testCreatePSsAndAssureOrderingOfPSs1() throws IOException {
- ProcessingStepDescriptor adder = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
- ProcessingStepDescriptor multiplier = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {adder, multiplier};
+ IProcessingStepDescriptor adder = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
+ IProcessingStepDescriptor multiplier = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {adder, multiplier};
ProcessingStep[] steps = handler.create(descriptors, null);
ByteArrayOutputStream result = new ByteArrayOutputStream(10);
OutputStream testStream = handler.link(steps, result, monitor);
@@ -189,9 +191,9 @@
}
public void testCreatePSsAndAssureOrderingOfPSs2() throws IOException {
- ProcessingStepDescriptor adder = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
- ProcessingStepDescriptor multiplier = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {multiplier, adder};
+ IProcessingStepDescriptor adder = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
+ IProcessingStepDescriptor multiplier = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {multiplier, adder};
ProcessingStep[] steps = handler.create(descriptors, null);
ByteArrayOutputStream result = new ByteArrayOutputStream(10);
OutputStream testStream = handler.link(steps, result, monitor);
@@ -201,9 +203,9 @@
}
public void testLinkPSs() throws IOException {
- ProcessingStepDescriptor adder = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
- ProcessingStepDescriptor multiplier = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
- ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {adder, multiplier};
+ IProcessingStepDescriptor adder = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
+ IProcessingStepDescriptor multiplier = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
+ IProcessingStepDescriptor[] descriptors = new IProcessingStepDescriptor[] {adder, multiplier};
ByteArrayOutputStream result = new ByteArrayOutputStream(10);
OutputStream testStream = handler.createAndLink(descriptors, null, result, monitor);
testStream.write(new byte[] {1, 2, 3, 4, 5});
Index: src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java,v
retrieving revision 1.6
diff -u -r1.6 Counter.java
--- src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java 12 Sep 2008 21:39:05 -0000 1.6
+++ src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java 20 Feb 2009 00:10:32 -0000
@@ -10,13 +10,14 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository.processing;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class Counter extends ProcessingStep {
@@ -33,7 +34,7 @@
basicInitialize(null);
}
- private void basicInitialize(ProcessingStepDescriptor descriptor) {
+ private void basicInitialize(IProcessingStepDescriptor descriptor) {
// if the status is already set to something that not ok, we've already found a problem.
if (!getStatus().isOK())
return;
@@ -51,7 +52,7 @@
setStatus(new Status(code, Activator.ID, "Counter size not set"));
}
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
String data = descriptor.getData();
if (data == null)
Index: src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java,v
retrieving revision 1.5
diff -u -r1.5 Adder.java
--- src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java 12 Sep 2008 21:39:05 -0000 1.5
+++ src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java 20 Feb 2009 00:10:32 -0000
@@ -11,13 +11,14 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository.processing;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class Adder extends ProcessingStep {
@@ -32,7 +33,7 @@
this.operand = operand;
}
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
try {
operand = Integer.valueOf(descriptor.getData()).intValue();
Index: src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java,v
retrieving revision 1.5
diff -u -r1.5 ByteShifter.java
--- src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java 12 Sep 2008 21:39:05 -0000 1.5
+++ src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java 20 Feb 2009 00:10:32 -0000
@@ -11,13 +11,14 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.repository.processing;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class ByteShifter extends ProcessingStep {
@@ -33,7 +34,7 @@
basicInitialize(null);
}
- private void basicInitialize(ProcessingStepDescriptor descriptor) {
+ private void basicInitialize(IProcessingStepDescriptor descriptor) {
// if the status is already set to something that not ok, we've already found a problem.
if (!getStatus().isOK())
return;
@@ -51,7 +52,7 @@
setStatus(new Status(code, Activator.ID, "ByteShifter operand invalid: " + operand));
}
- public void initialize(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
+ public void initialize(IProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
super.initialize(descriptor, context);
try {
operand = Integer.valueOf(descriptor.getData()).intValue();
Index: src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryWithReferenceDescriptors.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryWithReferenceDescriptors.java,v
retrieving revision 1.5
diff -u -r1.5 ArtifactRepositoryWithReferenceDescriptors.java
--- src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryWithReferenceDescriptors.java 30 Dec 2008 15:58:14 -0000 1.5
+++ src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryWithReferenceDescriptors.java 20 Feb 2009 00:10:32 -0000
@@ -1,5 +1,7 @@
package org.eclipse.equinox.p2.tests.artifact.repository;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import org.eclipse.core.runtime.IStatus;
@@ -7,7 +9,6 @@
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor;
import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
@@ -30,13 +31,13 @@
repo = createArtifactRepository(getTempFolder().toURI(), null);
File fileLocation = getTestData("Artifacts for repositor with references", "testData/referenceArtifactRepo/test1 Reference.jar");
descriptor1 = new ArtifactDescriptor(new ArtifactKey("osgi.bundle", "test1Reference", new Version("1.0.0")));
- descriptor1.setProcessingSteps(new ProcessingStepDescriptor[0]);
+ descriptor1.setProcessingSteps(new IProcessingStepDescriptor[0]);
descriptor1.setRepositoryProperty("artifact.reference", fileLocation.toURL().toExternalForm());
descriptor1.setRepositoryProperty("file.name", fileLocation.getAbsolutePath());
descriptor1.setRepositoryProperty("file.lastModified", Long.toString(fileLocation.lastModified()));
descriptor2 = new ArtifactDescriptor(new ArtifactKey("osgi.bundle", "test1Reference", new Version("1.0.0")));
- descriptor2.setProcessingSteps(new ProcessingStepDescriptor[0]);
+ descriptor2.setProcessingSteps(new IProcessingStepDescriptor[0]);
descriptor2.setRepositoryProperty("artifact.reference", fileLocation.toURI().toString());
descriptor2.setRepositoryProperty("file.name", fileLocation.getAbsolutePath());
descriptor2.setRepositoryProperty("file.lastModified", Long.toString(fileLocation.lastModified()));
#P org.eclipse.equinox.p2.tests.optimizers
Index: src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java,v
retrieving revision 1.4
diff -u -r1.4 JBDiffZipStepTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java 22 Dec 2008 15:30:48 -0000 1.4
+++ src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java 20 Feb 2009 00:10:34 -0000
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.optimizers;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.Arrays;
import junit.framework.TestCase;
@@ -38,7 +40,7 @@
public void testDiffJdt32to33() throws IOException {
IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar");
MockableJBDiffZipStep differ = new MockableJBDiffZipStep(repoMock);
- ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
+ IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1"));
ArtifactDescriptor descriptor = new ArtifactDescriptor(key);
differ.initialize(stepDescriptor, descriptor);
Index: src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java,v
retrieving revision 1.4
diff -u -r1.4 JarDeltaOptimizerTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java 22 Dec 2008 15:30:48 -0000 1.4
+++ src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java 20 Feb 2009 00:10:34 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.optimizers;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.zip.ZipInputStream;
import junit.framework.TestCase;
@@ -54,7 +56,7 @@
public void testOptimization() throws IOException {
IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/testdata_1.0.0.1.jar");
ProcessingStep step = new MockableJarDeltaOptimizerStep(repoMock);
- ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true);
+ IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true);
IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.0.0.2"));
ArtifactDescriptor descriptor = new ArtifactDescriptor(key);
step.initialize(stepDescriptor, descriptor);
Index: src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java,v
retrieving revision 1.4
diff -u -r1.4 JBDiffStepTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java 22 Dec 2008 15:30:48 -0000 1.4
+++ src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java 20 Feb 2009 00:10:33 -0000
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.optimizers;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.Arrays;
import junit.framework.TestCase;
@@ -46,7 +48,7 @@
IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/eclipse-3.2.exe");
MockableJBDiffStep differ = new MockableJBDiffStep(repoMock);
- ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
+ IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1"));
ArtifactDescriptor descriptor = new ArtifactDescriptor(key);
differ.initialize(stepDescriptor, descriptor);
Index: src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java,v
retrieving revision 1.4
diff -u -r1.4 JarDeltaProcessorTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java 22 Dec 2008 15:30:48 -0000 1.4
+++ src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java 20 Feb 2009 00:10:34 -0000
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.processors;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.zip.ZipInputStream;
import junit.framework.TestCase;
@@ -39,7 +41,7 @@
public void testProcessing() throws IOException {
IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/testdata_1.0.0.1.jar");
ProcessingStep step = new MockableJarDeltaProcessorStep(repoMock);
- ProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true);
+ IProcessingStepDescriptor stepDescriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0.0.1", true);
IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.0.0.2"));
ArtifactDescriptor descriptor = new ArtifactDescriptor(key);
step.initialize(stepDescriptor, descriptor);
Index: src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java,v
retrieving revision 1.4
diff -u -r1.4 JBPatchZipStepTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java 22 Dec 2008 15:30:48 -0000 1.4
+++ src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java 20 Feb 2009 00:10:34 -0000
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.processors;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.Arrays;
import junit.framework.TestCase;
@@ -52,7 +54,7 @@
IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/org.eclipse.jdt_3.2.0.v20060605-1400.njar");
ProcessingStep patcher = new MockableJBPatchZipStep(repoMock);
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
+ IProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1"));
ArtifactDescriptor context = new ArtifactDescriptor(key);
patcher.initialize(descriptor, context);
Index: src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java
===================================================================
RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.optimizers/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java,v
retrieving revision 1.4
diff -u -r1.4 JBPatchStepTest.java
--- src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java 22 Dec 2008 15:30:48 -0000 1.4
+++ src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java 20 Feb 2009 00:10:34 -0000
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.equinox.p2.tests.artifact.processors;
+import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.IProcessingStepDescriptor;
+
import java.io.*;
import java.util.Arrays;
import junit.framework.TestCase;
@@ -34,7 +36,7 @@
public void testPatchEclipseExe32to33() throws IOException {
IArtifactRepository repoMock = ArtifactRepositoryMock.getMock("testData/optimizers/eclipse-3.2.exe");
ProcessingStep patcher = new MockableJBPatchStep(repoMock);
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
+ IProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("id", "ns,cl,id1,1.0", true);
IArtifactKey key = new ArtifactKey("cl", "id1", new Version("1.1"));
ArtifactDescriptor context = new ArtifactDescriptor(key);
patcher.initialize(descriptor, context);