bug 316560 and bug 316909 geenrate a web-bundle from the test-jetty-webapp that will be used during the automated testing of jetty-osgi

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

test-jetty-webapp/pom.xml

@@ -38,11 +38,54 @@
             <configuration>
               <descriptors>
                 <descriptor>config.xml</descriptor>
+                <descriptor>src/main/assembly/web-bundle.xml</descriptor>
               </descriptors>
+	      <archive>
+		<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+	      </archive>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <!-- also make this webapp an osgi bundle -->
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${felix.bundle.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+	  <supportedProjectTypes>
+	    <supportedProjectType>war</supportedProjectType>
+	  </supportedProjectTypes>
+	</configuration>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Import-Package>*</Import-Package>
+                <Export-Package>!com.acme*</Export-Package>
+                <Web-ContextPath>/</Web-ContextPath>
+                <Bundle-ClassPath>WEB-INF/classes</Bundle-ClassPath>
+                <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+              </instructions>
+            </configuration>
+           </execution>
+        </executions>
+      </plugin>
+      
 <!--
       <plugin>
         <groupId>org.mortbay.jetty</groupId>

test-jetty-webapp/src/main/assembly/web-bundle.xml

@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>webbundle</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <!-- baseDirectory>${basedir}/${project.build.directory}/${project.build.finalName}</baseDirectory -->
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/${project.build.directory}/${project.build.finalName}/</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>**/*.*</include>
+      </includes>
+      <excludes>
+        <exclude>WEB-INF/lib/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>

test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +1,23 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: TestIt
+Bundle-SymbolicName: TestIt
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: testit.Activator
+Import-Package: javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp,
+ javax.servlet.jsp.tagext
+Require-Bundle: org.eclipse.jetty.client,
+ org.eclipse.jetty.continuation,
+ org.eclipse.jetty.http,
+ org.eclipse.jetty.io,
+ org.eclipse.jetty.servlets,
+ org.eclipse.jetty.util,
+ org.eclipse.jetty.websocket
+Bundle-ClassPath: WEB-INF/classes
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Web-ContextPath: /
 Class-Path: