Updates to servlet API bundle:
o Replaced manifest.mf with osgi-bundle packaging type.
o Added javax.servlet module to parent POM.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@390266 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/javax.servlet/pom.xml b/javax.servlet/pom.xml
index 714edfb..a3e0b5b 100644
--- a/javax.servlet/pom.xml
+++ b/javax.servlet/pom.xml
@@ -1,22 +1,33 @@
<project>
- <artifactId>javax.servlet</artifactId>
- <groupId>javax.servlet</groupId>
- <version>2.1</version>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<name>Servlet 2.1 API</name>
+ <artifactId>javax.servlet</artifactId>
+ <packaging>osgi-bundle</packaging>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix.plugins</groupId>
+ <artifactId>maven-osgi-plugin</artifactId>
+ <version>${pom.version}</version>
+ <extensions>true</extensions>
<configuration>
- <archive>
- <manifestFile>src/main/resources/Manifest.mf</manifestFile>
- </archive>
+ <osgiManifest>
+ <bundleName>servlet</bundleName>
+ <bundleVendor>Apache Software Foundation</bundleVendor>
+ <!--<bundleVersion>2.1</bundleVersion>-->
+ <bundleSymbolicName>javax.servlet</bundleSymbolicName>
+ <bundleDescription>Servlet 2.1 API</bundleDescription>
+ <!--<bundleCopyright>Copyright 1999,2005 The Apache Software Foundation</bundleCopyright>-->
+ <bundleCategory>servlet</bundleCategory>
+ <exportPackage>javax.servlet;specification-version="2.1",javax.servlet.http;specification-version="2.1"</exportPackage>
+ </osgiManifest>
</configuration>
</plugin>
</plugins>
</build>
</project>
-
diff --git a/javax.servlet/src/main/resources/Manifest.mf b/javax.servlet/src/main/resources/Manifest.mf
deleted file mode 100644
index bd6ded2..0000000
--- a/javax.servlet/src/main/resources/Manifest.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: javax.servlet
-Bundle-Name: servlet
-Bundle-Description: Servlet 2.1 API
-Bundle-Version: 2.1
-Bundle-Category: servlet
-Bundle-Copyright: Copyright 1999,2005 The Apache Software Foundation
-Export-Package: javax.servlet;specification-version="2.1",
- javax.servlet.http;specification-version="2.1"
diff --git a/pom.xml b/pom.xml
index d28bda8..a0e17d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,7 @@
<modules>
<!-- <module>javax.servlet</module> -->
<module>tools/maven2/maven-osgi-plugin</module>
+ <module>javax.servlet</module>
<module>org.osgi.core</module>
<module>org.osgi.compendium</module>
<module>org.apache.felix.framework</module>