Bug 406825 - consolidate master-x features into one.

Bug 432776 - move and simplify eclipse.platform.repository

5 files changed, 51 insertions, 20 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
index ae669d004..abe3d1809 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -34,5 +34,6 @@
         <module>platform.sdk</module>
         <module>sdk</module>
         <module>eclipse-junit-tests</module>
+        <module>eclipse.platform.repository</module>
     </modules>
 </project>
diff --git a/eclipse.platform.repository/category.xml b/eclipse.platform.repository/category.xml
index d43cbbff3..6f6526bed 100644
--- a/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.repository/category.xml
@@ -1,8 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-    <feature
-        url="../eclipse.platform.releng/features/master/master-3.4.0-SNAPSHOT.jar"
-        id="master"
-        version="0.0.0">
-    </feature>
+  <feature
+    id="org.eclipse.sdk.tests"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.equinox.p2.sdk"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.equinox.p2.discovery.feature"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.core.runtime.feature"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.equinox.sdk"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.sdk.examples.source"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.releng.tools"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.equinox.executable"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.sdk"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.osgi.compatibility.plugins.feature"
+    version="0.0.0" />
+  <feature
+    id="org.eclipse.pde.api.tools.ee.feature"
+    version="0.0.0" />
+  <bundle
+    id="org.eclipse.jdt.core.compiler.batch"
+    version="0.0.0" />
 </site>
diff --git a/eclipse.platform.repository/pom.xml b/eclipse.platform.repository/pom.xml
index fc4f60682..9c8a00339 100644
--- a/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.repository/pom.xml
@@ -15,10 +15,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
-    <relativePath>../eclipse-platform-parent</relativePath>
+        <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId>
+        <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId>
+        <version>4.4.0-SNAPSHOT</version>
   </parent>
   <groupId>eclipse.platform.repository</groupId>
   <artifactId>eclipse.platform.repository</artifactId>
@@ -123,38 +122,38 @@
                      main repository.
                 -->
                 <repository>
-                  <url>${project.baseUri}../eclipse.platform.releng.tychoeclipsebuilder/platform/target/targetPlatformRepository</url>
+                  <url>${project.baseUri}../platform/target/targetPlatformRepository</url>
                   <layout>p2-metadata</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
 
                 <repository>
-                  <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/rcp/target/repository</url>
+                  <url>${project.baseUri}/../rcp/target/repository</url>
                   <layout>p2</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
                 <repository>
-                  <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/target/repository</url>
+                  <url>${project.baseUri}/../rcp.sdk/target/repository</url>
                   <layout>p2</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
                 <repository>
-                  <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/platform/target/repository</url>
+                  <url>${project.baseUri}/../platform/target/repository</url>
                   <layout>p2</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
                 <repository>
-                  <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/target/repository</url>
+                  <url>${project.baseUri}/../platform.sdk/target/repository</url>
                   <layout>p2</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
                 <repository>
-                  <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/sdk/target/repository</url>
+                  <url>${project.baseUri}/../sdk/target/repository</url>
                   <layout>p2</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
                 <repository>
-                  <url>${project.baseUri}/../eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/repository</url>
+                  <url>${project.baseUri}/../eclipse-junit-tests/target/repository</url>
                   <layout>p2</layout>
                     <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
                 </repository>
diff --git a/pom.xml b/pom.xml
index 0a3fd55a5..aea32c5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,6 @@
 
     <module>eclipse.platform.releng</module>
     <module>eclipse.platform.releng.tychoeclipsebuilder</module>
-    <module>eclipse.platform.repository</module>
+
   </modules>
 </project>
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 157b06ebb..876990236 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -750,7 +750,7 @@ fn-gather-repo ()
        mv ${ORIG_DIR_REPOSITORY} ${REPO_DIR_REPOSITORY}
 
     else
-       TARGET_PATH=eclipse.platform.repository/target/repository
+       TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository
        REPO_DIR_REPOSITORY=$REPO_DIR/$TAGET_PATH
     fi
     if [[ -d "$REPO_DIR_REPOSITORY" ]]
@@ -938,7 +938,7 @@ fn-slice-repos ()
     BUILD_DIR="$1"; shift
     BASEBUILDER_LAUNCHER="$1"; shift
     ANT_SCRIPT="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml
-    REPO_DIR_DIR="$REPO_DIR"/eclipse.platform.repository/target/repository
+    REPO_DIR_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository
     if [[ -d "$REPO_DIR_DIR" ]]
     then
         pushd "$REPO_DIR"
@@ -1196,7 +1196,7 @@ fn-publish-eclipse ()
         -v \
         -buildfile "$EBuilderDir"/eclipse/helper.xml \
         -DbuildId="$BUILD_ID" \
-        -DbuildRepo="$AGGR_DIR"/eclipse.platform.repository/target/repository \
+        -DbuildRepo="$AGGR_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
         -DpostingDirectory="$BUILD_ROOT/siteDir/eclipse/downloads/drops4" \
         -DequinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" \
         -DpublishingContent="$EBuilderDir"/eclipse/publishingFiles \