fix source generation and add all sources (plugins, docs, tests, features) to the update site; move up to latest parent pom 3.10; tycho 1.1

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/docs/org.eclipse.wst.common.api.doc/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.common.api.doc/META-INF/MANIFEST.MF
index d42a974..5e97f40 100644
--- a/docs/org.eclipse.wst.common.api.doc/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.common.api.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.api.doc; singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.2.qualifier
 Bundle-Vendor: %providerName 
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/docs/org.eclipse.wst.common.api.doc/build.properties b/docs/org.eclipse.wst.common.api.doc/build.properties
index 6a7e3b1..3f67916 100644
--- a/docs/org.eclipse.wst.common.api.doc/build.properties
+++ b/docs/org.eclipse.wst.common.api.doc/build.properties
@@ -8,3 +8,7 @@
                topics_ExtPoint_Reference.xml,\
                book.css,\
                schema.css
+source.. = ./,\
+           reference/
+output.. = bin/
+src.includes = *
diff --git a/docs/org.eclipse.wst.common.api.doc/pom.xml b/docs/org.eclipse.wst.common.api.doc/pom.xml
index afa6255..afa85ba 100644
--- a/docs/org.eclipse.wst.common.api.doc/pom.xml
+++ b/docs/org.eclipse.wst.common.api.doc/pom.xml
@@ -15,12 +15,12 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.common</groupId>

-    <artifactId>org.eclipse.webtools.common.docs</artifactId>
+    <artifactId>org.eclipse.webtools.common.docs</artifactId>

     <version>3.6.0-SNAPSHOT</version>

   </parent>

 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.common.api.doc</artifactId>

-  <version>1.0.1-SNAPSHOT</version>

+  <version>1.0.2-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/docs/org.eclipse.wst.validation.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.validation.doc.isv/META-INF/MANIFEST.MF
index 931ee89..8266b47 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.validation.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.validation.doc.isv; singleton:=true
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.301.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help.ui;bundle-version="[3.2.0,5.0.0)"
diff --git a/docs/org.eclipse.wst.validation.doc.isv/build.properties b/docs/org.eclipse.wst.validation.doc.isv/build.properties
index 1a2e751..cf1941e 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/build.properties
+++ b/docs/org.eclipse.wst.validation.doc.isv/build.properties
@@ -5,3 +5,7 @@
                toc.xml,\
                topics_ExtPoint_Reference.xml,\
                about.html
+source.. = ./,\
+           reference/
+output.. = bin/
+src.includes = *
diff --git a/docs/org.eclipse.wst.validation.doc.isv/pom.xml b/docs/org.eclipse.wst.validation.doc.isv/pom.xml
index 343f6ac..d9ba519 100644
--- a/docs/org.eclipse.wst.validation.doc.isv/pom.xml
+++ b/docs/org.eclipse.wst.validation.doc.isv/pom.xml
@@ -15,12 +15,12 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.common</groupId>

-    <artifactId>org.eclipse.webtools.common.docs</artifactId>
+    <artifactId>org.eclipse.webtools.common.docs</artifactId>

     <version>3.6.0-SNAPSHOT</version>

   </parent>

 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.validation.doc.isv</artifactId>

-  <version>1.2.300-SNAPSHOT</version>

+  <version>1.2.301-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.xml b/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.xml
index ac64371..1f5c54a 100644
--- a/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature/feature.xml
@@ -20,23 +20,9 @@
       %license

    </license>

 

-   <includes

-         id="org.eclipse.jst.common.fproj.enablement.jdt"

-         version="0.0.0"/>

-

-   <plugin

-         id="org.eclipse.jst.common.project.facet.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.jst.common.project.facet.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <requires>

+      <import feature="org.eclipse.jst.common.fproj.enablement.jdt"/>

+   </requires>

 

    <plugin

          id="org.eclipse.jst.common.fproj.enablement.jdt.sdk"

diff --git a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml
index 5d97230..fac6c48 100644
--- a/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.common.fproj.sdk.feature/feature.xml
@@ -20,23 +20,9 @@
       %license

    </license>

 

-   <includes

-         id="org.eclipse.wst.common.fproj"

-         version="0.0.0"/>

-

-   <plugin

-         id="org.eclipse.wst.common.project.facet.core.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.eclipse.wst.common.project.facet.ui.source"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

+   <requires>

+      <import feature="org.eclipse.wst.common.fproj"/>

+   </requires>

 

    <plugin

          id="org.eclipse.wst.common.project.facet.doc.api"

diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.xml b/features/org.eclipse.wst.common_sdk.feature/feature.xml
index 329bfd9..e98f6e8 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.xml
@@ -19,13 +19,9 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.wst.common_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_ui.feature.source"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.wst.common_ui.feature"/>
+   </requires>
 
    <plugin
          id="org.eclipse.wst.common.api.doc"
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.xml b/features/org.eclipse.wst.common_ui.feature/feature.xml
index 412208d..ffe7d0d 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature/feature.xml
@@ -19,10 +19,10 @@
       %license

    </license>

 

-   <includes

-         id="org.eclipse.wst.common_core.feature"

-         version="0.0.0"/>

-

+   <requires>

+      <import feature="org.eclipse.wst.common_core.feature"/>

+   </requires>

+   

    <plugin

          id="org.eclipse.wst.common.frameworks.ui"

          download-size="0"

diff --git a/features/pom.xml b/features/pom.xml
index de2dae0..11bbc78 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -20,5 +20,38 @@
             <module>org.eclipse.wst.common_tests.feature</module>
             <module>org.eclipse.wst.common_ui.feature</module>
 	</modules>
+
+	<build>
+        <plugins>
+                <plugin>
+                        <groupId>org.eclipse.tycho.extras</groupId>
+                        <artifactId>tycho-source-feature-plugin</artifactId>
+                        <version>${tycho-extras.version}</version>
+                        <executions>
+                                <execution>
+                                        <id>source-feature</id>
+                                        <phase>package</phase>
+                                        <goals>
+                                                <goal>source-feature</goal>
+                                        </goals>
+                                </execution>
+                        </executions>
+                </plugin>
+                <plugin>
+                        <groupId>org.eclipse.tycho</groupId>
+                        <artifactId>tycho-p2-plugin</artifactId>
+                        <version>${tycho.version}</version>
+                        <executions>
+                                <execution>
+                                        <id>attached-p2-metadata</id>
+                                        <phase>package</phase>
+                                        <goals>
+                                                <goal>p2-metadata</goal>
+                                        </goals>
+                                </execution>
+                        </executions>
+                </plugin>
+        </plugins>
+	</build>
 </project>
 	
diff --git a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/META-INF/MANIFEST.MF
index 91fe524..e4e6f90 100644
--- a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.common.fproj.enablement.jdt.sdk; singleton:=true
-Bundle-Version: 1.4.200.qualifier
+Bundle-Version: 1.4.201.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/build.properties b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/build.properties
index 5237c90..db535ea 100644
--- a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/build.properties
+++ b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/build.properties
@@ -1,4 +1,4 @@
-source.. = src/
+source.. = ./
 output.. = bin/
 bin.includes = .,\
                META-INF/,\
@@ -7,3 +7,5 @@
                images/,\
                about.ini,\
                about.properties
+src.includes = *
+src.excludes = bin/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml
index 3dcc44d..7146d26 100644
--- a/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml
+++ b/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk/pom.xml
@@ -15,12 +15,12 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.common</groupId>

-    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>

     <version>3.6.0-SNAPSHOT</version>

   </parent>

 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.jst.common.fproj.enablement.jdt.sdk</artifactId>

-  <version>1.4.200-SNAPSHOT</version>

+  <version>1.4.201-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

-</project>
+</project>

diff --git a/plugins/org.eclipse.jst.common.project.facet.core/build.properties b/plugins/org.eclipse.jst.common.project.facet.core/build.properties
index 18151cb..9fbebdc 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/build.properties
+++ b/plugins/org.eclipse.jst.common.project.facet.core/build.properties
@@ -1,4 +1,6 @@
-source.. = src/
+source.. = src/,\
+           schemas/,
+           images/
 output.. = bin/
 bin.includes = .,\
                plugin.xml,\
@@ -9,4 +11,5 @@
                about.properties,\
                images/,\
                schemas/
-src.includes = about.html
+src.includes = *
+src.excludes = src/
diff --git a/plugins/org.eclipse.jst.common.project.facet.ui/build.properties b/plugins/org.eclipse.jst.common.project.facet.ui/build.properties
index 0f0deda..c94860a 100644
--- a/plugins/org.eclipse.jst.common.project.facet.ui/build.properties
+++ b/plugins/org.eclipse.jst.common.project.facet.ui/build.properties
@@ -1,4 +1,6 @@
-source.. = src/
+source.. = src/,\
+           schemas/,
+           images/
 output.. = bin/
 bin.includes = .,\
                plugin.xml,\
@@ -7,4 +9,5 @@
                about.html,\
                images/,\
                schemas/
-src.includes = about.html
+src.includes = *
+src.excludes = src/
diff --git a/plugins/org.eclipse.wst.common.core/build.properties b/plugins/org.eclipse.wst.common.core/build.properties
index cd3e92f..1f5bbdd 100644
--- a/plugins/org.eclipse.wst.common.core/build.properties
+++ b/plugins/org.eclipse.wst.common.core/build.properties
@@ -6,3 +6,4 @@
                schema/,\
                plugin.properties,\
                about.html
+src.includes = *
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties b/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
index a288ad7..3df22d3 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/build.properties
@@ -9,7 +9,7 @@
 # IBM Corporation - initial API and implementation
 ###############################################################################
 source.. = src/,\
-                              property_file/
+           property_file/
 output.. = bin/
 bin.includes = plugin.xml,\
                .,\
diff --git a/plugins/org.eclipse.wst.common.environment/build.properties b/plugins/org.eclipse.wst.common.environment/build.properties
index 19c4009..c8aea41 100644
--- a/plugins/org.eclipse.wst.common.environment/build.properties
+++ b/plugins/org.eclipse.wst.common.environment/build.properties
@@ -15,3 +15,4 @@
                about.html,\
                plugin.properties,\
                .options
+src.includes = *
diff --git a/plugins/org.eclipse.wst.common.fproj.sdk/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.fproj.sdk/META-INF/MANIFEST.MF
index 74bc690..4cec0b3 100644
--- a/plugins/org.eclipse.wst.common.fproj.sdk/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.fproj.sdk/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.fproj.sdk; singleton:=true
-Bundle-Version: 1.4.500.qualifier
+Bundle-Version: 1.4.501.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.wst.common.fproj.sdk/build.properties b/plugins/org.eclipse.wst.common.fproj.sdk/build.properties
index 5237c90..238e77c 100644
--- a/plugins/org.eclipse.wst.common.fproj.sdk/build.properties
+++ b/plugins/org.eclipse.wst.common.fproj.sdk/build.properties
@@ -7,3 +7,4 @@
                images/,\
                about.ini,\
                about.properties
+src.includes = *
diff --git a/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml b/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml
index d604686..c5e890b 100644
--- a/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml
+++ b/plugins/org.eclipse.wst.common.fproj.sdk/pom.xml
@@ -15,12 +15,12 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.common</groupId>

-    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>

     <version>3.6.0-SNAPSHOT</version>

   </parent>

 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.common.fproj.sdk</artifactId>

-  <version>1.4.500-SNAPSHOT</version>

+  <version>1.4.501-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

-</project>
+</project>

diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties b/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
index 4d7ef95..599bd39 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
@@ -15,5 +15,5 @@
                plugin.properties,\
                about.html
 source.. = wtp_ui/,\
-                    property_files/
+           property_files/
 src.includes = schema/
diff --git a/plugins/org.eclipse.wst.common.infopop/build.properties b/plugins/org.eclipse.wst.common.infopop/build.properties
index f062f30..bdab23c 100644
--- a/plugins/org.eclipse.wst.common.infopop/build.properties
+++ b/plugins/org.eclipse.wst.common.infopop/build.properties
@@ -7,3 +7,5 @@
                plugin.properties.xml,\
                about.html,\
                SnippetsContexts.xml
+source.. = src/
+output.. = bin/
diff --git a/plugins/org.eclipse.wst.common.project.facet.doc.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.project.facet.doc.api/META-INF/MANIFEST.MF
index f8f1e24..c93be2b 100644
--- a/plugins/org.eclipse.wst.common.project.facet.doc.api/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.project.facet.doc.api/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.project.facet.doc.api;singleton:=true
-Bundle-Version: 1.4.400.qualifier
+Bundle-Version: 1.4.401.qualifier
 Bundle-Localization: plugin
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/org.eclipse.wst.common.project.facet.doc.api/build.properties b/plugins/org.eclipse.wst.common.project.facet.doc.api/build.properties
index dc7fa72..ad117e0 100644
--- a/plugins/org.eclipse.wst.common.project.facet.doc.api/build.properties
+++ b/plugins/org.eclipse.wst.common.project.facet.doc.api/build.properties
@@ -10,3 +10,4 @@
                reference/,\
                .,\
                about.html
+src.includes = *
diff --git a/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml b/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml
index 11a3eac..65ec867 100644
--- a/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml
+++ b/plugins/org.eclipse.wst.common.project.facet.doc.api/pom.xml
@@ -15,12 +15,12 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.common</groupId>

-    <artifactId>org.eclipse.webtools.common.plugins</artifactId>
+    <artifactId>org.eclipse.webtools.common.plugins</artifactId>

     <version>3.6.0-SNAPSHOT</version>

   </parent>

 

   <groupId>org.eclipse.webtools.common</groupId>

   <artifactId>org.eclipse.wst.common.project.facet.doc.api</artifactId>

-  <version>1.4.400-SNAPSHOT</version>

+  <version>1.4.401-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

-</project>
+</project>

diff --git a/plugins/org.eclipse.wst.common.uriresolver/build.properties b/plugins/org.eclipse.wst.common.uriresolver/build.properties
index a1aa98a..40f1416 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/build.properties
+++ b/plugins/org.eclipse.wst.common.uriresolver/build.properties
@@ -1,3 +1,5 @@
+src.includes = *
+src.excludes = src
 source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
diff --git a/plugins/org.eclipse.wst.validation.ui/build.properties b/plugins/org.eclipse.wst.validation.ui/build.properties
index 1749ccd..6f3d6eb 100644
--- a/plugins/org.eclipse.wst.validation.ui/build.properties
+++ b/plugins/org.eclipse.wst.validation.ui/build.properties
@@ -18,3 +18,4 @@
            property_files/,\
            vf2/
 output.. = bin/
+src.includes = *
diff --git a/pom.xml b/pom.xml
index 3e50f2e..b7dedfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>wtp-parent</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
     <relativePath>../wtp-parent</relativePath>
   </parent>
 
@@ -29,8 +29,6 @@
 
   <properties>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/webtools-common/webtools.common.git</tycho.scmUrl>
-    <tycho.version>1.0.0</tycho.version>
-    <tycho-extras.version>1.0.0</tycho-extras.version>
   </properties>
 
   <repositories>
diff --git a/site/category.xml b/site/category.xml
index 15e2db9..8727ed1 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-    <feature id="org.eclipse.wst.common_ui.feature" version="0.0.0"><category name="common"/></feature>
-    <feature id="org.eclipse.wst.common_core.feature" version="0.0.0"><category name="common"/></feature>
-    <feature id="org.eclipse.jst.common.fproj.enablement.jdt" version="0.0.0"><category name="common"/></feature>
-    <feature id="org.eclipse.wst.common.fproj" version="0.0.0"><category name="common"/></feature>
+    <feature id="org.eclipse.wst.common_ui.feature"><category name="common"/></feature>
+    <feature id="org.eclipse.wst.common_core.feature"><category name="common"/></feature>
+    <feature id="org.eclipse.wst.common.fproj"><category name="common"/></feature>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt"><category name="common"/></feature>
 
-    <feature id="org.eclipse.wst.common_sdk.feature" version="0.0.0"><category name="common.sdk"/></feature>
-    <feature id="org.eclipse.wst.common.fproj.sdk" version="0.0.0"><category name="common.sdk"/></feature>
-    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk" version="0.0.0"><category name="common.sdk"/></feature>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk"><category name="common.sdk"/></feature>
+    <feature id="org.eclipse.wst.common.fproj.sdk"><category name="common.sdk"/></feature>
+    <feature id="org.eclipse.wst.common_sdk.feature"><category name="common.sdk"/></feature>
      
-    <feature id="org.eclipse.wst.common_tests.feature" version="0.0.0"><category name="common.tests"/></feature>
+    <feature id="org.eclipse.wst.common_tests.feature"><category name="common.tests"/></feature>
+
+    <feature id="org.eclipse.wst.common_core.feature.source"/>
+    <feature id="org.eclipse.wst.common_ui.feature.source"/>
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.source"/>
+    <feature id="org.eclipse.wst.common.fproj.source"/>
+
+    <feature id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.source"/>
+    <feature id="org.eclipse.wst.common.fproj.sdk.source"/>
+    <feature id="org.eclipse.wst.common_sdk.feature.source"/>
+     
+    <feature id="org.eclipse.wst.common_tests.feature.source"/>
 
     <category-def name="common" label="Web Tools Platform (WTP) Common"><description>
     Common plugins shared by WTP features
@@ -21,4 +32,81 @@
     These features provide Unit tests for WTP. WTP Committers, or others testing WTP, will need these in at least their PDE Targets.
     </description></category-def>
 
+    <bundle id="org.eclipse.jem.util"/>
+    <bundle id="org.eclipse.jst.common.fproj.enablement.jdt.sdk"/>
+    <bundle id="org.eclipse.jst.common.project.facet.core"/>
+    <bundle id="org.eclipse.jst.common.project.facet.ui"/>
+    <bundle id="org.eclipse.wst.common.core"/>
+    <bundle id="org.eclipse.wst.common.emf"/>
+    <bundle id="org.eclipse.wst.common.emfworkbench.integration"/>
+    <bundle id="org.eclipse.wst.common.environment"/>
+    <bundle id="org.eclipse.wst.common.fproj.sdk"/>
+    <bundle id="org.eclipse.wst.common.frameworks"/>
+    <bundle id="org.eclipse.wst.common.frameworks.ui"/>
+    <bundle id="org.eclipse.wst.common.infopop"/>
+    <bundle id="org.eclipse.wst.common.modulecore"/>
+    <bundle id="org.eclipse.wst.common.modulecore.ui"/>
+    <bundle id="org.eclipse.wst.common.project.facet.core"/>
+    <bundle id="org.eclipse.wst.common.project.facet.doc.api"/>
+    <bundle id="org.eclipse.wst.common.project.facet.ui"/>
+    <bundle id="org.eclipse.wst.common.snippets"/>
+    <bundle id="org.eclipse.wst.common.ui"/>
+    <bundle id="org.eclipse.wst.common.uriresolver"/>
+    <bundle id="org.eclipse.wst.internet.cache"/>
+    <bundle id="org.eclipse.wst.validation"/>
+    <bundle id="org.eclipse.wst.validation.ui"/>
+
+    <bundle id="org.eclipse.wst.common.api.doc"/>
+    <bundle id="org.eclipse.wst.validation.doc.isv"/>
+    <bundle id="org.eclipse.wst.validation.infopop"/>
+
+    <bundle id="org.eclipse.wst.common.project.facet.core.tests"/>
+    <bundle id="org.eclipse.wst.common.project.facet.ui.tests"/>
+    <bundle id="org.eclipse.wst.common.snippets.tests"/>
+    <bundle id="org.eclipse.wst.common.tests"/>
+    <bundle id="org.eclipse.wst.common.tests.collector"/>
+    <bundle id="org.eclipse.wst.common.tests.ui"/>
+    <bundle id="org.eclipse.wst.common.tests.validation"/>
+    <bundle id="org.eclipse.wst.common.tests.validation.guard"/>
+    <bundle id="org.eclipse.wst.common.uriresolver.tests"/>
+    <bundle id="org.eclipse.wst.internet.cache.tests"/>
+
+    <bundle id="org.eclipse.jem.util.source"/>
+    <bundle id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.source"/>
+    <bundle id="org.eclipse.jst.common.project.facet.core.source"/>
+    <bundle id="org.eclipse.jst.common.project.facet.ui.source"/>
+    <bundle id="org.eclipse.wst.common.core.source"/>
+    <bundle id="org.eclipse.wst.common.emf.source"/>
+    <bundle id="org.eclipse.wst.common.emfworkbench.integration.source"/>
+    <bundle id="org.eclipse.wst.common.environment.source"/>
+    <bundle id="org.eclipse.wst.common.fproj.sdk.source"/>
+    <bundle id="org.eclipse.wst.common.frameworks.source"/>
+    <bundle id="org.eclipse.wst.common.frameworks.ui.source"/>
+    <bundle id="org.eclipse.wst.common.infopop.source"/>
+    <bundle id="org.eclipse.wst.common.modulecore.source"/>
+    <bundle id="org.eclipse.wst.common.modulecore.ui.source"/>
+    <bundle id="org.eclipse.wst.common.project.facet.core.source"/>
+    <bundle id="org.eclipse.wst.common.project.facet.doc.api.source"/>
+    <bundle id="org.eclipse.wst.common.project.facet.ui.source"/>
+    <bundle id="org.eclipse.wst.common.snippets.source"/>
+    <bundle id="org.eclipse.wst.common.ui.source"/>
+    <bundle id="org.eclipse.wst.common.uriresolver.source"/>
+    <bundle id="org.eclipse.wst.internet.cache.source"/>
+    <bundle id="org.eclipse.wst.validation.source"/>
+    <bundle id="org.eclipse.wst.validation.ui.source"/>
+
+    <bundle id="org.eclipse.wst.common.api.doc.source"/>
+    <bundle id="org.eclipse.wst.validation.doc.isv.source"/>
+    <bundle id="org.eclipse.wst.validation.infopop.source"/>
+
+    <bundle id="org.eclipse.wst.common.project.facet.core.tests.source"/>
+    <bundle id="org.eclipse.wst.common.project.facet.ui.tests.source"/>
+    <bundle id="org.eclipse.wst.common.snippets.tests.source"/>
+    <bundle id="org.eclipse.wst.common.tests.source"/>
+    <bundle id="org.eclipse.wst.common.tests.collector.source"/>
+    <bundle id="org.eclipse.wst.common.tests.ui.source"/>
+    <bundle id="org.eclipse.wst.common.tests.validation.source"/>
+    <bundle id="org.eclipse.wst.common.tests.validation.guard.source"/>
+    <bundle id="org.eclipse.wst.common.uriresolver.tests.source"/>
+    <bundle id="org.eclipse.wst.internet.cache.tests.source"/>
 </site>