diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/metadata/IDependencyMetadata.java b/tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/IDependencyMetadata.java
similarity index 62%
rename from tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/metadata/IDependencyMetadata.java
rename to tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/IDependencyMetadata.java
index 245dfeb7e1..53c3375661 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/metadata/IDependencyMetadata.java
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/IDependencyMetadata.java
@@ -10,14 +10,21 @@
* Contributors:
* Sonatype Inc. - initial API and implementation
*******************************************************************************/
-package org.eclipse.tycho.p2.metadata;
+package org.eclipse.tycho;
+import java.util.Collection;
import java.util.Set;
public interface IDependencyMetadata {
- Set getMetadata(boolean primary);
+ enum DependencyMetadataType {
+ SEED, RESOLVE;
+ }
- Set getMetadata();
+ Set /* IInstallableUnit */> getDependencyMetadata(DependencyMetadataType type);
+
+ Set /* IInstallableUnit */> getDependencyMetadata();
+
+ void setDependencyMetadata(DependencyMetadataType type, Collection /* IInstallableUnit */> units);
}
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/ReactorProject.java b/tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/ReactorProject.java
index d6f6523ed3..9ea17b5024 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/ReactorProject.java
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/src/main/java/org/eclipse/tycho/ReactorProject.java
@@ -14,26 +14,11 @@
package org.eclipse.tycho;
import java.io.File;
-import java.util.Set;
/**
* A Tycho project in the reactor.
*/
-public interface ReactorProject {
- /**
- * Conventional key used to store ReactorProject in MavenProject.context
- */
- public static final String CTX_REACTOR_PROJECT = "tycho.reactor-project";
-
- /**
- * Conventional key used to store dependency metadata in MavenProject.context
- */
- public static final String CTX_DEPENDENCY_METADATA = "tycho.dependency-metadata";
-
- /**
- * Conventional key used to store secondary dependency metadata in MavenProject.context
- */
- public static final String CTX_SECONDARY_DEPENDENCY_METADATA = "tycho.secondary-dependency-metadata";
+public interface ReactorProject extends IDependencyMetadata {
/**
* Conventional sources jar Maven artifact classifier.
@@ -76,22 +61,6 @@ public interface ReactorProject {
public void setContextValue(String key, Object value);
- //
-
- public void setDependencyMetadata(boolean primary, Set /* IInstallableUnit */> installableUnits);
-
- /**
- * Returns set of p2 IInstallableUnits that describe requirements and provided
- * capabilities of this project.
- */
- public Set> getDependencyMetadata(boolean primary);
-
- /**
- * Returns project dependency metadata with both primary and secondary project installable
- * units.
- */
- public Set> getDependencyMetadata();
-
public String getBuildQualifier();
public String getExpandedVersion();
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/test/ArtifactMock.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/test/ArtifactMock.java
index 313d449709..bbc7c620dc 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/test/ArtifactMock.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/test/ArtifactMock.java
@@ -16,8 +16,9 @@
import java.util.LinkedHashSet;
import java.util.Set;
+import org.eclipse.tycho.IDependencyMetadata;
+import org.eclipse.tycho.IDependencyMetadata.DependencyMetadataType;
import org.eclipse.tycho.p2.metadata.IArtifactFacade;
-import org.eclipse.tycho.p2.metadata.IDependencyMetadata;
public class ArtifactMock implements IArtifactFacade {
private File location;
@@ -51,8 +52,8 @@ public ArtifactMock(File location, String groupId, String artifactId, String ver
}
public ArtifactMock(ReactorProjectStub project, String classifier) {
- this(project.getBasedir(), project.getGroupId(), project.getArtifactId(), project.getVersion(), project
- .getPackaging(), classifier);
+ this(project.getBasedir(), project.getGroupId(), project.getArtifactId(), project.getVersion(),
+ project.getPackaging(), classifier);
}
@Override
@@ -94,7 +95,9 @@ public Set