cleaned up OSGi manifest creation
diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml
index 1f7cb0b..6a9c8f7 100644
--- a/tests/test-continuation/pom.xml
+++ b/tests/test-continuation/pom.xml
@@ -28,6 +28,9 @@
<packaging>jar</packaging>
<name>Test :: Continuation</name>
<description>Asynchronous API</description>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.continuation</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index e08d858..dfe8aed 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -31,6 +31,8 @@
<test-wars-dir>${project.build.directory}/test-wars</test-wars-dir>
<test-libs-dir>${project.build.directory}/test-libs</test-libs-dir>
<test-dist-dir>${project.build.directory}/test-dist</test-dist-dir>
+ <bundle-symbolic-name>${project.groupId}.integrations</bundle-symbolic-name>
+
</properties>
<build>
<plugins>
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 75fc5d9..be9a618 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-loginservice</artifactId>
<name>Jetty Tests :: Login Service</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.loginservice</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index d03667e..ea44811 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-hash-sessions</artifactId>
<name>Jetty Tests :: Sessions :: Hash</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.hash</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 39f905d..2d69ff7 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-jdbc-sessions</artifactId>
<name>Jetty Tests :: Sessions :: JDBC</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.jdbc</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index e08bc42..30bb7f3 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-mongodb-sessions</artifactId>
<name>Jetty Tests :: Sessions :: Mongo</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.mongo</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index e608d5d..e15e013 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-sessions-common</artifactId>
<name>Jetty Tests :: Sessions :: Common</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.common</bundle-symbolic-name>
+ </properties>
<build>
</build>
<dependencies>
diff --git a/tests/test-webapps/test-dispatch-webapp/pom.xml b/tests/test-webapps/test-dispatch-webapp/pom.xml
index 497fdd5..5afe024 100644
--- a/tests/test-webapps/test-dispatch-webapp/pom.xml
+++ b/tests/test-webapps/test-dispatch-webapp/pom.xml
@@ -9,6 +9,9 @@
<name>Jetty Tests :: Webapps :: Dispatch Webapp</name>
<artifactId>test-dispatch-webapp</artifactId>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.dispatch</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml
index 34ab300..7c1e889 100644
--- a/tests/test-webapps/test-jaas-webapp/pom.xml
+++ b/tests/test-webapps/test-jaas-webapp/pom.xml
@@ -9,6 +9,9 @@
<artifactId>test-jaas-webapp</artifactId>
<name>Jetty Tests :: WebApp :: JAAS</name>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
index 49ee812..5affbf4 100644
--- a/tests/test-webapps/test-jetty-webapp/pom.xml
+++ b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -29,6 +29,9 @@
<name>Test :: Jetty Test Webapp</name>
<url>http://www.eclipse.org/jetty</url>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.tests.webapp</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
@@ -70,15 +73,6 @@
</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>
@@ -97,7 +91,6 @@
</goals>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
<Import-Package>javax.servlet.jsp.*;version="[2.2.0,3.0)",javax.servlet.*;version="[2.6,3.2)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file
@@ -114,6 +107,15 @@
</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.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml
index dfcea3f..4c4e5e2 100644
--- a/tests/test-webapps/test-jndi-webapp/pom.xml
+++ b/tests/test-webapps/test-jndi-webapp/pom.xml
@@ -9,6 +9,9 @@
<artifactId>test-jndi-webapp</artifactId>
<name>Jetty Tests :: WebApp :: JNDI</name>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.jndi</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml
index 3083716..2e4c235 100644
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@@ -8,6 +8,9 @@
<name>Jetty Tests :: WebApp :: Mock Resources</name>
<artifactId>test-mock-resources</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.mocks</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
@@ -28,12 +31,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml
index a3448f8..aca97c0 100644
--- a/tests/test-webapps/test-proxy-webapp/pom.xml
+++ b/tests/test-webapps/test-proxy-webapp/pom.xml
@@ -28,6 +28,9 @@
<artifactId>test-proxy-webapp</artifactId>
<name>Test :: Jetty Proxy Webapp</name>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.proxy</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
index 7f5f90c..b1af392 100644
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@@ -8,6 +8,9 @@
<artifactId>test-container-initializer</artifactId>
<packaging>jar</packaging>
<name>Jetty Tests :: WebApp :: Servlet Spec :: ServletContainerInitializer Test Jar</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sci</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
index 7a9dcc3..a2ae9b9 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
@@ -9,6 +9,9 @@
<name>Jetty Tests :: Webapps :: Spec Webapp</name>
<artifactId>test-spec-webapp</artifactId>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.spec</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
index e9469b8..64cc72f 100644
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@@ -9,6 +9,9 @@
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-web-fragment</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.fragment</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 803813f..b7a3e83 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -27,6 +27,9 @@
<name>Jetty Tests :: WebApp :: RFC2616</name>
<url>http://www.eclipse.org/jetty</url>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.rfc2616</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
