Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordj2011-08-12 11:35:08 -0400
committerdj2011-08-12 11:35:08 -0400
commite3653ceb2720caa3a8b3fcfe8b3523da750d4236 (patch)
tree3346a45afacc650ea178da7f6846b69ae7c37913
parent8c10f21cadeadcca856133fd9002db234b9612b6 (diff)
parent9177c55c6f5e400de365bf0c3af44011f529b4a5 (diff)
downloadrt.equinox.p2-e3653ceb2720caa3a8b3fcfe8b3523da750d4236.tar.gz
rt.equinox.p2-e3653ceb2720caa3a8b3fcfe8b3523da750d4236.tar.xz
rt.equinox.p2-e3653ceb2720caa3a8b3fcfe8b3523da750d4236.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/equinox/rt.equinox.p2 into bug350088
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.common/.project11
-rw-r--r--bundles/org.eclipse.equinox.p2.common/README.TXT2
-rw-r--r--bundles/org.eclipse.equinox.p2.director/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/spi/AbstractRepository.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/pom.xml2
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml102
15 files changed, 68 insertions, 78 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
index 3d7c46757..b365b0376 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -54,6 +54,8 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
public static final boolean MD5_CHECK_ENABLED = !"false".equals(Activator.getContext().getProperty("eclipse.p2.MD5Check")); //$NON-NLS-1$//$NON-NLS-2$
+ public static final boolean MD5_ARTIFACT_CHECK_ENABLED = !"false".equals(Activator.getContext().getProperty("eclipse.p2.MD5ArtifactCheck")); //$NON-NLS-1$//$NON-NLS-2$
+
public static final String CONTENT_FILENAME = "artifacts"; //$NON-NLS-1$
/**
@@ -425,6 +427,8 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme
private synchronized OutputStream addPostSteps(ProcessingStepHandler handler, IArtifactDescriptor descriptor, OutputStream destination, IProgressMonitor monitor) {
ArrayList<ProcessingStep> steps = new ArrayList<ProcessingStep>();
steps.add(new SignatureVerifier());
+ if (MD5_ARTIFACT_CHECK_ENABLED && descriptor.getProperty(IArtifactDescriptor.ARTIFACT_MD5) != null)
+ steps.add(new MD5Verifier(descriptor.getProperty(IArtifactDescriptor.ARTIFACT_MD5)));
if (steps.isEmpty())
return destination;
ProcessingStep[] stepArray = steps.toArray(new ProcessingStep[steps.size()]);
diff --git a/bundles/org.eclipse.equinox.p2.common/.project b/bundles/org.eclipse.equinox.p2.common/.project
deleted file mode 100644
index 9c09338e1..000000000
--- a/bundles/org.eclipse.equinox.p2.common/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.equinox.p2.common</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.equinox.p2.common/README.TXT b/bundles/org.eclipse.equinox.p2.common/README.TXT
deleted file mode 100644
index abb2b2faa..000000000
--- a/bundles/org.eclipse.equinox.p2.common/README.TXT
+++ /dev/null
@@ -1,2 +0,0 @@
-This bundle is obsolete. It was briefly introduced during p2 API development but was never
-released into HEAD stream. \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.director/pom.xml b/bundles/org.eclipse.equinox.p2.director/pom.xml
index 815cf67a2..a76faba8d 100644
--- a/bundles/org.eclipse.equinox.p2.director/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.director/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.director</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.engine/pom.xml b/bundles/org.eclipse.equinox.p2.engine/pom.xml
index 59f7f9f2f..7869ec9a4 100644
--- a/bundles/org.eclipse.equinox.p2.engine/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.engine/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.engine</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml
index 6044fe144..0ef625087 100644
--- a/bundles/org.eclipse.equinox.p2.operations/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.operations</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
index ab9c41bc3..cf8e14776 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.reconciler.dropins</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/spi/AbstractRepository.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/spi/AbstractRepository.java
index 3f3ce4a62..e9a7ac375 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/spi/AbstractRepository.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/spi/AbstractRepository.java
@@ -81,9 +81,7 @@ public abstract class AbstractRepository<T> extends PlatformObject implements IR
/**
* Returns the location of this repository.
- * TODO: Should we use URL or URI? URL requires a protocol handler
- * to be installed in Java. Can the URL have any protocol?
- * @return the URL of the repository.
+ * @return the URI of the repository.
*/
public synchronized URI getLocation() {
return location;
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
index 5cc0a368e..e6bc134b6 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.touchpoint.eclipse</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
index b62b178e2..64d4babe3 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.transport.ecf</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
index 3976c8927..b727475f1 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.sdk.scheduler</artifactId>
- <version>1.0.100-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
index 36dcf111d..7b0e33bee 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
@@ -10,9 +10,10 @@ Export-Package: org.eclipse.equinox.internal.p2.ui.sdk;x-internal:=true,
org.eclipse.equinox.internal.p2.ui.sdk.prefs;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime,
- org.eclipse.equinox.p2.ui,
- org.eclipse.compare;resolution:=optional
+ org.eclipse.equinox.p2.ui
Import-Package: javax.xml.parsers,
+ org.eclipse.compare,
+ org.eclipse.compare.structuremergeviewer,
org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.engine;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.engine.query;version="[2.0.0,3.0.0)",
diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml
index 498dbf544..0e85873f0 100644
--- a/bundles/org.eclipse.equinox.p2.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
index 0b91db6f9..58ec924ca 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.simpleconfigurator</artifactId>
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
index 3fc48ead5..32655a53a 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
@@ -15,56 +15,56 @@
<packaging>pom</packaging>
<modules>
- <module>../ie.wombat.jbdiff</module>
- <module>../ie.wombat.jbdiff.test</module>
- <module>../org.eclipse.equinox.frameworkadmin</module>
- <module>../org.eclipse.equinox.frameworkadmin.equinox</module>
- <module>../org.eclipse.equinox.frameworkadmin.test</module>
- <module>../org.eclipse.equinox.p2.artifact.optimizers</module>
- <module>../org.eclipse.equinox.p2.artifact.processors</module>
- <module>../org.eclipse.equinox.p2.artifact.repository</module>
- <module>../org.eclipse.equinox.p2.console</module>
- <module>../org.eclipse.equinox.p2.core</module>
- <module>../org.eclipse.equinox.p2.core.feature</module>
- <module>../org.eclipse.equinox.p2.director</module>
- <module>../org.eclipse.equinox.p2.director.app</module>
- <module>../org.eclipse.equinox.p2.directorywatcher</module>
- <module>../org.eclipse.equinox.p2.discovery</module>
- <module>../org.eclipse.equinox.p2.discovery.compatibility</module>
- <module>../org.eclipse.equinox.p2.engine</module>
- <module>../org.eclipse.equinox.p2.extensionlocation</module>
- <module>../org.eclipse.equinox.p2.extras.feature</module>
- <module>../org.eclipse.equinox.p2.garbagecollector</module>
- <module>../org.eclipse.equinox.p2.installer</module>
- <module>../org.eclipse.equinox.p2.jarprocessor</module>
- <module>../org.eclipse.equinox.p2.metadata</module>
- <module>../org.eclipse.equinox.p2.metadata.repository</module>
- <module>../org.eclipse.equinox.p2.operations</module>
- <module>../org.eclipse.equinox.p2.publisher</module>
- <module>../org.eclipse.equinox.p2.ql</module>
- <module>../org.eclipse.equinox.p2.reconciler.dropins</module>
- <module>../org.eclipse.equinox.p2.repository</module>
- <module>../org.eclipse.equinox.p2.repository.tools</module>
- <module>../org.eclipse.equinox.p2.sar</module>
-<!-- <module>../org.eclipse.equinox.p2.tests</module>-->
-<!-- <module>../org.eclipse.equinox.p2.tests.discovery</module>-->
-<!-- <module>../org.eclipse.equinox.p2.tests.ui</module>-->
-<!-- <module>../org.eclipse.equinox.p2.tests.verifier</module>-->
- <module>../org.eclipse.equinox.p2.testserver</module>
- <module>../org.eclipse.equinox.p2.touchpoint.eclipse</module>
- <module>../org.eclipse.equinox.p2.touchpoint.natives</module>
- <module>../org.eclipse.equinox.p2.transport.ecf</module>
- <module>../org.eclipse.equinox.p2.ui</module>
- <module>../org.eclipse.equinox.p2.ui.importexport</module>
- <module>../org.eclipse.equinox.p2.ui.admin</module>
- <module>../org.eclipse.equinox.p2.ui.admin.rcp</module>
- <module>../org.eclipse.equinox.p2.ui.discovery</module>
- <module>../org.eclipse.equinox.p2.ui.sdk</module>
- <module>../org.eclipse.equinox.p2.ui.sdk.scheduler</module>
- <module>../org.eclipse.equinox.p2.updatechecker</module>
- <module>../org.eclipse.equinox.p2.updatesite</module>
- <module>../org.eclipse.equinox.simpleconfigurator</module>
- <module>../org.eclipse.equinox.simpleconfigurator.manipulator</module>
- <module>../org.eclipse.equinox.p2.publisher.eclipse</module>
+ <module>../../bundles/ie.wombat.jbdiff</module>
+ <module>../../bundles/ie.wombat.jbdiff.test</module>
+ <module>../../bundles/org.eclipse.equinox.frameworkadmin</module>
+ <module>../../bundles/org.eclipse.equinox.frameworkadmin.equinox</module>
+ <module>../../bundles/org.eclipse.equinox.frameworkadmin.test</module>
+ <module>../../bundles/org.eclipse.equinox.p2.artifact.optimizers</module>
+ <module>../../bundles/org.eclipse.equinox.p2.artifact.processors</module>
+ <module>../../bundles/org.eclipse.equinox.p2.artifact.repository</module>
+ <module>../../bundles/org.eclipse.equinox.p2.console</module>
+ <module>../../bundles/org.eclipse.equinox.p2.core</module>
+ <module>../../features/org.eclipse.equinox.p2.core.feature</module>
+ <module>../../bundles/org.eclipse.equinox.p2.director</module>
+ <module>../../bundles/org.eclipse.equinox.p2.director.app</module>
+ <module>../../bundles/org.eclipse.equinox.p2.directorywatcher</module>
+ <module>../../bundles/org.eclipse.equinox.p2.discovery</module>
+ <module>../../bundles/org.eclipse.equinox.p2.discovery.compatibility</module>
+ <module>../../bundles/org.eclipse.equinox.p2.engine</module>
+ <module>../../bundles/org.eclipse.equinox.p2.extensionlocation</module>
+ <module>../../features/org.eclipse.equinox.p2.extras.feature</module>
+ <module>../../bundles/org.eclipse.equinox.p2.garbagecollector</module>
+ <module>../../bundles/org.eclipse.equinox.p2.installer</module>
+ <module>../../bundles/org.eclipse.equinox.p2.jarprocessor</module>
+ <module>../../bundles/org.eclipse.equinox.p2.metadata</module>
+ <module>../../bundles/org.eclipse.equinox.p2.metadata.repository</module>
+ <module>../../bundles/org.eclipse.equinox.p2.operations</module>
+ <module>../../bundles/org.eclipse.equinox.p2.publisher</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ql</module>
+ <module>../../bundles/org.eclipse.equinox.p2.reconciler.dropins</module>
+ <module>../../bundles/org.eclipse.equinox.p2.repository</module>
+ <module>../../bundles/org.eclipse.equinox.p2.repository.tools</module>
+ <module>../../bundles/org.eclipse.equinox.p2.sar</module>
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests</module>-->
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.discovery</module>-->
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.ui</module>-->
+<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.verifier</module>-->
+ <module>../../bundles/org.eclipse.equinox.p2.testserver</module>
+ <module>../../bundles/org.eclipse.equinox.p2.touchpoint.eclipse</module>
+ <module>../../bundles/org.eclipse.equinox.p2.touchpoint.natives</module>
+ <module>../../bundles/org.eclipse.equinox.p2.transport.ecf</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.importexport</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.admin</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.admin.rcp</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.discovery</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.sdk</module>
+ <module>../../bundles/org.eclipse.equinox.p2.ui.sdk.scheduler</module>
+ <module>../../bundles/org.eclipse.equinox.p2.updatechecker</module>
+ <module>../../bundles/org.eclipse.equinox.p2.updatesite</module>
+ <module>../../bundles/org.eclipse.equinox.simpleconfigurator</module>
+ <module>../../bundles/org.eclipse.equinox.simpleconfigurator.manipulator</module>
+ <module>../../bundles/org.eclipse.equinox.p2.publisher.eclipse</module>
</modules>
</project>

Back to the top