bug #290658 generate an Eclipse-SourceBundle

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1426 7e9141cc-0065-0410-87d8-b60c137991c4

28 files changed, 242 insertions, 80 deletions

diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index e132fc8b1c..944d0fd956 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -7,6 +7,9 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-ajp</artifactId>
   <name>Jetty :: AJP</name>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.ajp</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -51,6 +54,14 @@
           </execution>
         </executions>
       </plugin>
+      
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 1e2b029c4c..a8d68185fa 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-annotations</artifactId>
   <name>Jetty :: Servlet Annotations</name>
   <description>Annotation support for deploying servlets in jetty.</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -35,6 +38,14 @@
           </archive>
         </configuration>
       </plugin>
+      
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 9241382790..7d6929b79a 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-client</artifactId>
   <name>Jetty :: Asynchronous HTTP Client</name>
   <url>{$jetty.url}</url>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -35,6 +38,13 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index cae514c8f4..b4b8c5a9b7 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-continuation</artifactId>
   <name>Jetty :: Continuation</name>
   <description>Asynchronous API</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.continuation</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -55,14 +58,6 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>attach-sources</id>
-             <goals>
-               <goal>jar</goal>
-             </goals>
-           </execution>
-         </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index b410766087..7560450c7f 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-deploy</artifactId>
   <name>Jetty :: Deployers</name>
   <description>Jetty deployers</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.deploy</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -39,14 +42,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 526ac41a77..23909a996e 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -8,6 +8,9 @@
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-http</artifactId>
   <name>Jetty :: Http Utility</name>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.http</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -58,6 +61,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index d65fed7d15..551145e012 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -8,6 +8,9 @@
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-io</artifactId>
   <name>Jetty :: IO Utility</name>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.io</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -52,6 +55,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 9566f38811..2af428bd4e 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-jaspi</artifactId>
   <name>Jetty :: JASPI Security</name>
   <description>Jetty security infrastructure</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.jaspi</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -39,14 +42,6 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>attach-sources</id>
-             <goals>
-               <goal>jar</goal>
-             </goals>
-           </execution>
-         </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index c498e81d9d..00760e53c2 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-jmx</artifactId>
   <name>Jetty :: JMX Management</name>
   <description>JMX management artifact for jetty.</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.jmx</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -52,6 +55,12 @@
           </execution>
         </executions>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 776019779a..20dc3d351f 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-jndi</artifactId>
   <name>Jetty :: JNDI Naming</name>
   <description>JNDI spi impl for java namespace.</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.jndi</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -35,6 +38,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 983ad22fa0..ec68c56f95 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -10,6 +10,9 @@
   <artifactId>jetty-osgi-boot-jsp</artifactId>
   <name>Jetty :: OSGi :: Boot JSP</name>
   <description>Jetty OSGi Boot JSP bundle</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.jsp</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -84,6 +87,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
index e28bf4a9a9..f318f2c609 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
@@ -10,6 +10,9 @@
   <artifactId>jetty-osgi-boot-logback</artifactId>
   <name>Jetty :: OSGi :: Boot Logback</name>
   <description>Jetty OSGi Boot Logback bundle</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.logback</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.osgi</groupId>
@@ -92,6 +95,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index f2742c3a36..28b9c6bbac 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -10,6 +10,9 @@
   <artifactId>jetty-osgi-boot-warurl</artifactId>
   <name>Jetty :: OSGi :: Boot :: Warurl</name>
   <description>Jetty OSGi Boot-Warurl bundle</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.warurl</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -62,6 +65,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 4fd2651c1d..cb2b72e13c 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -10,6 +10,9 @@
   <artifactId>jetty-osgi-boot</artifactId>
   <name>Jetty :: OSGi :: Boot</name>
   <description>Jetty OSGi Boot bundle</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.boot</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -75,6 +78,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index f107853e31..11ee5e7f70 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -10,6 +10,9 @@
   <artifactId>jetty-httpservice</artifactId>
   <name>Jetty :: OSGi :: HttpService</name>
   <description>Jetty OSGi HttpService bundle</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.httpservice</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.equinox.http</groupId>
@@ -26,19 +29,6 @@
   </dependencies>
 
   <build>
-    <!-- resources>
-        <resource>
-            <directory>META-INF/..</directory>
-            <excludes>
-                <exclude>**/.*</exclude>
-            </excludes>
-            <includes>
-                <include>contexts</include>
-            </includes>
-        </resource>
-    </resources -->
-
-  
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -82,6 +72,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 56ae02748e..9520ae9ee9 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -25,7 +25,7 @@
     <module>jetty-osgi-boot-logback</module>
     <module>jetty-osgi-boot-warurl</module>
     <module>jetty-osgi-httpservice</module>
-    <module>example-jetty-osgi</module>
+    <!-- module>example-jetty-osgi</module -->
   </modules>
   <build>
     <resources>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index de19a4c195..550d45f7f7 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-plus</artifactId>
   <name>Jetty :: Plus</name>
   <description>Jetty JavaEE style services</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
 <!-- 
@@ -45,14 +48,6 @@
       <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>attach-sources</id>
-             <goals>
-               <goal>jar</goal>
-             </goals>
-           </execution>
-         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -71,6 +66,12 @@
           </execution>
         </executions>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index 8127c17c4e..05ed35656a 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -12,6 +12,7 @@
   <properties>
     <jetty.test.policy>1.0</jetty.test.policy>
     <jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
+    <bundle-symbolic-name>${project.groupId}.policy</bundle-symbolic-name>
   </properties>
   <build>
     <plugins>
@@ -110,6 +111,12 @@
           </execution>
         </executions>  
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>   
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 1ff5c50023..fa6ce5f7e8 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-rewrite</artifactId>
   <name>Jetty :: Rewrite Handler</name>
   <description>Jetty Rewrite Handler</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.rewrite</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -52,6 +55,12 @@
           </execution>
         </executions>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 254861bbf4..5b0e120c4c 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-security</artifactId>
   <name>Jetty :: Security</name>
   <description>Jetty security infrastructure</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.security</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -45,14 +48,6 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>attach-sources</id>
-             <goals>
-               <goal>jar</goal>
-             </goals>
-           </execution>
-         </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 2c175e596b..a1bb747cde 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -9,6 +9,9 @@
   <name>Jetty :: Server Core</name>
   <description>The core jetty server artifact.</description>
   <url>${jetty.url}</url>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -57,14 +60,6 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>attach-sources</id>
-             <goals>
-               <goal>jar</goal>
-             </goals>
-           </execution>
-         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 99bce72f73..208159325d 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -9,6 +9,9 @@
   <artifactId>jetty-servlet</artifactId>
   <name>Jetty :: Servlet Handling</name>
   <description>Jetty Servlet Container</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.servlet</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -44,6 +47,12 @@
           </execution>
         </executions>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 291a65c2c0..6a8e12551b 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -9,6 +9,9 @@
   <artifactId>jetty-servlets</artifactId>
   <name>Jetty :: Utility Servlets and Filters</name>
   <description>Utility Servlets from Jetty</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.servlets</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -36,6 +39,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 3d20e817c1..40010bc1cc 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-util</artifactId>
   <name>Jetty :: Utilities</name>
   <description>Utility classes for Jetty</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.util</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -57,6 +60,12 @@
           </execution>
         </executions>
       </plugin>
+     <!-- Always create the source bundle. the configuration is inherited by the parent pom. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 8fe8629878..24d4b8588b 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-webapp</artifactId>
   <name>Jetty :: Webapp Application Support</name>
   <description>Jetty web application support</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.webapp</bundle-symbolic-name>
+  </properties>
   <build>
     <resources>
       <resource><directory>src/main/resources</directory></resource>
@@ -81,17 +84,8 @@
       </plugin>
       <!-- always include sources since jetty-xbean makes use of them -->
       <plugin>
-        <groupId>org.apache.maven.plugins
-        </groupId>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 5db4043f50..fb8d257a15 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -8,6 +8,9 @@
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-websocket</artifactId>
   <name>Jetty :: Websocket</name>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.websocket</bundle-symbolic-name>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -63,6 +66,12 @@
           </archive>
         </configuration>
       </plugin>
+      <!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
+      with a snapshot. -->
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 67059bbb25..ed61ecb39a 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -8,6 +8,9 @@
   <artifactId>jetty-xml</artifactId>
   <name>Jetty :: XML utilities</name>
   <description>The jetty xml utilities.</description>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.xml</bundle-symbolic-name>
+  </properties>
   <build>
     <plugins>
       <plugin>
@@ -39,14 +42,6 @@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
-         <executions>
-           <execution>
-             <id>attach-sources</id>
-             <goals>
-               <goal>jar</goal>
-             </goals>
-           </execution>
-         </executions>
       </plugin>
 <!--
       <plugin>
diff --git a/pom.xml b/pom.xml
index a6c2d36e17..69d218b68d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,22 @@
             </execution>
           </executions>
         </plugin>
+        
+      <!-- Build helper maven plugin sets the parsedVersion.osgiVersion property -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <id>set-osgi-version</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>        
     </plugins>
     <pluginManagement>
       <plugins>
@@ -117,6 +133,35 @@
             </dependency>
           </dependencies>
        </plugin>
+       
+       <!-- source maven plugin creates the source bundle and adds manifest -->
+       <plugin>
+          <inherited>true</inherited>
+          <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+              <id>attach-sources</id>
+              <phase>process-classes</phase>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                  <Bundle-Name>${name}</Bundle-Name>
+                  <Bundle-SymbolicName>${bundle-symbolic-name}.source;singleton:=true</Bundle-SymbolicName>
+                  <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
+                  <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+                  <Eclipse-SourceBundle>${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="."</Eclipse-SourceBundle>
+                </manifestEntries>
+              </archive>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>