diff options
| author | Simon Kaegi | 2009-04-09 16:03:50 +0000 |
|---|---|---|
| committer | Simon Kaegi | 2009-04-09 16:03:50 +0000 |
| commit | b954df11db3ae7575fd018878cdc9f65e5110a29 (patch) | |
| tree | 4fea99bc50f4607697d2d42430f5e47ea6bbe9cf /bundles/org.eclipse.equinox.p2.engine | |
| parent | dd37e9de06fcadcb728eef5f9bf4a5072a8f3f68 (diff) | |
| download | rt.equinox.p2-b954df11db3ae7575fd018878cdc9f65e5110a29.tar.gz rt.equinox.p2-b954df11db3ae7575fd018878cdc9f65e5110a29.tar.xz rt.equinox.p2-b954df11db3ae7575fd018878cdc9f65e5110a29.zip | |
Bug 253224 CheckTrust phase shouldn't use PARM_ARTIFACT_REQUESTS
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.engine')
4 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java index d76df1cdd..fa7c2feec 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java @@ -18,7 +18,6 @@ import org.eclipse.equinox.internal.p2.engine.InstructionParser; import org.eclipse.equinox.internal.provisional.p2.metadata.*; public abstract class InstallableUnitPhase extends Phase { - public static final String PARM_ARTIFACT_REQUESTS = "artifactRequests"; //$NON-NLS-1$ public static final String PARM_ARTIFACT = "artifact"; //$NON-NLS-1$ public static final String PARM_IU = "iu"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java index 809c71fdb..5edd3713d 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java @@ -24,6 +24,7 @@ import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType; public class CheckTrust extends InstallableUnitPhase { private static final String PHASE_ID = "checkTrust"; //$NON-NLS-1$ + public static final String PARM_ARTIFACT_FILES = "artifactFiles"; //$NON-NLS-1$ public CheckTrust(int weight) { super(PHASE_ID, weight); @@ -34,7 +35,7 @@ public class CheckTrust extends InstallableUnitPhase { } protected IStatus completePhase(IProgressMonitor monitor, IProfile profile, Map parameters) { - Collection artifactRequests = (Collection) parameters.get(PARM_ARTIFACT_REQUESTS); + Collection artifactRequests = (Collection) parameters.get(PARM_ARTIFACT_FILES); // Instantiate a check trust manager CertificateChecker certificateChecker = new CertificateChecker(); @@ -70,7 +71,7 @@ public class CheckTrust extends InstallableUnitPhase { } protected IStatus initializePhase(IProgressMonitor monitor, IProfile profile, Map parameters) { - parameters.put(PARM_ARTIFACT_REQUESTS, new ArrayList()); + parameters.put(PARM_ARTIFACT_FILES, new ArrayList()); return super.initializePhase(monitor, profile, parameters); } diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java index 7ec973c6e..6daed6b75 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java @@ -25,6 +25,7 @@ import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType; */ public class Collect extends InstallableUnitPhase { private static final String PHASE_ID = "collect"; //$NON-NLS-1$ + public static final String PARM_ARTIFACT_REQUESTS = "artifactRequests"; //$NON-NLS-1$ public Collect(int weight) { super(PHASE_ID, weight); diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java index 0a8332b5e..d67eb839e 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java @@ -68,7 +68,7 @@ public class Sizing extends InstallableUnitPhase { } protected IStatus completePhase(IProgressMonitor monitor, IProfile profile, Map parameters) { - List artifactRequests = (List) parameters.get("artifactRequests"); //$NON-NLS-1$ + List artifactRequests = (List) parameters.get(Collect.PARM_ARTIFACT_REQUESTS); ProvisioningContext context = (ProvisioningContext) parameters.get(PARM_CONTEXT); int statusCode = 0; @@ -129,7 +129,7 @@ public class Sizing extends InstallableUnitPhase { } protected IStatus initializePhase(IProgressMonitor monitor, IProfile profile, Map parameters) { - parameters.put(PARM_ARTIFACT_REQUESTS, new ArrayList()); + parameters.put(Collect.PARM_ARTIFACT_REQUESTS, new ArrayList()); return null; } } |