More for bug 370650: Create source bundles and feature

Include more bundles, rename feature to .source.feature

5 files changed, 92 insertions, 5 deletions

diff --git a/features/org.eclipse.objectteams.otdt.feature/category.xml b/features/org.eclipse.objectteams.otdt.feature/category.xml
index 2b7801a95..5f9454f70 100644
--- a/features/org.eclipse.objectteams.otdt.feature/category.xml
+++ b/features/org.eclipse.objectteams.otdt.feature/category.xml
@@ -19,6 +19,9 @@
    <iu id="org.eclipse.objectteams.otdt.feature.group" range="[2.1.0,2.2.0)">
       <category name="org.eclipse.objectteams.otdt_2.1"/>
    </iu>
+   <iu id="org.eclipse.objectteams.otdt.source.feature.feature.group" range="[2.1.0,2.2.0)">
+      <category name="org.eclipse.objectteams.otdt_2.1"/>
+   </iu>
    <iu id="org.eclipse.objectteams.otequinox.feature.group" range="[2.1.0,2.2.0)">
       <category name="org.eclipse.objectteams.otdt_2.1"/>
    </iu>
diff --git a/features/org.eclipse.objectteams.otdt.source.feature/build.properties b/features/org.eclipse.objectteams.otdt.source.feature/build.properties
index 102404bef..3ab252c97 100644
--- a/features/org.eclipse.objectteams.otdt.source.feature/build.properties
+++ b/features/org.eclipse.objectteams.otdt.source.feature/build.properties
@@ -5,4 +5,14 @@ bin.includes = feature.xml,\
                feature.properties
 
 generate.plugin@org.eclipse.jdt.core.source=org.eclipse.jdt.core
+generate.plugin@org.eclipse.objectteams.otdt.debug.source=org.eclipse.objectteams.otdt.debug
+generate.plugin@org.eclipse.objectteams.otdt.debug.ui.source=org.eclipse.objectteams.otdt.debug.ui
 generate.plugin@org.eclipse.objectteams.otdt.ui.source=org.eclipse.objectteams.otdt.ui
+generate.plugin@org.eclipse.objectteams.otdt.ui.help.source=org.eclipse.objectteams.otdt.help
+generate.plugin@org.eclipse.objectteams.otdt.jdt.ui.source=org.eclipse.objectteams.otdt.jdt.ui
+generate.plugin@org.eclipse.objectteams.otdt.compiler.adaptor.source=org.eclipse.objectteams.otdt.compiler.adaptor
+generate.plugin@org.eclipse.objectteams.otdt.debug.adaptor.source=org.eclipse.objectteams.otdt.debug.adaptor
+generate.plugin@org.eclipse.objectteams.otdt.pde.ui.source=org.eclipse.objectteams.otdt.pde.ui
+generate.plugin@org.eclipse.objectteams.otdt.refactoring.source=org.eclipse.objectteams.otdt.refactoring
+generate.plugin@org.eclipse.objectteams.otdt.samples.source=org.eclipse.objectteams.otdt.samples
+generate.plugin@org.eclipse.objectteams.otdt.apt.source=org.eclipse.objectteams.otdt.apt
diff --git a/features/org.eclipse.objectteams.otdt.source.feature/feature.xml b/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
index 9e79093ea..7e938faea 100644
--- a/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.source.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.objectteams.otdt.source"
+      id="org.eclipse.objectteams.otdt.source.feature"
       label="%featureName"
       version="2.1.0.qualifier"
       provider-name="%providerName">
@@ -58,11 +58,85 @@ Project Leader:
 
    <plugin
          id="org.eclipse.jdt.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.debug.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.debug.ui.source"
+         download-size="0"
+         install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.objectteams.otdt.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.ui.help.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.jdt.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.compiler.adaptor.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.debug.adaptor.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.pde.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.refactoring.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.samples.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.objectteams.otdt.apt.source"
+         download-size="0"
+         install-size="0"
          version="0.0.0"
          unpack="false"/>
 
diff --git a/releng/build-scripts/build/OTDT-Build/allElements.xml b/releng/build-scripts/build/OTDT-Build/allElements.xml
index 8ff428eb5..8dcbbdd6a 100644
--- a/releng/build-scripts/build/OTDT-Build/allElements.xml
+++ b/releng/build-scripts/build/OTDT-Build/allElements.xml
@@ -34,7 +34,7 @@
 
 		<ant antfile="${genericTargets}" target="${target}" >
 			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.objectteams.otdt.source" />
+			<property name="id" value="org.eclipse.objectteams.otdt.source.feature" />
 		</ant>
 		
 	  	<condition property="really.run.tests">
@@ -101,8 +101,8 @@
 	</target>
 	
 	<!-- set output repository for otdt.source.feature: -->
-	<property name="assemble.org.eclipse.objectteams.otdt.source.p2" value="true" />
-    <target   name="assemble.org.eclipse.objectteams.otdt.source.p2">
+	<property name="assemble.org.eclipse.objectteams.otdt.source.feature.p2" value="true" />
+    <target   name="assemble.org.eclipse.objectteams.otdt.source.feature.p2">
         <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 			<property name="p2.build.repo" value="file://${otdtUpdatesDir}"/>
 		</ant>
diff --git a/releng/map/otdt.map b/releng/map/otdt.map
index 850405fb9..4d934e688 100644
--- a/releng/map/otdt.map
+++ b/releng/map/otdt.map
@@ -2,7 +2,7 @@
 

 !-- Don't set version numbers for features, otherwise pdebuild would complain about a non-existent Basedir: -- 

 feature@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.feature

-feature@org.eclipse.objectteams.otdt.source=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature

+feature@org.eclipse.objectteams.otdt.source.feature=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature

 feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch

 feature@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.feature,tag=builds/201201311800