Add support for javax.servlet-3.0

jbosgi · Sep 23, 2011 · 1c5e7eb · 1c5e7eb
1 parent 38d7d0f
commit 1c5e7eb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
@@ -1,4 +1,4 @@
-#Thu Sep 22 20:16:20 CEST 2011
+#Fri Sep 23 11:31:55 CEST 2011
 activeProfiles=
 eclipse.preferences.version=1
 fullBuildGoals=process-test-resources

diff --git a/bundle/.settings/org.maven.ide.eclipse.prefs b/bundle/.settings/org.maven.ide.eclipse.prefs
@@ -1,4 +1,4 @@
-#Thu Sep 22 20:16:21 CEST 2011
+#Fri Sep 23 11:31:55 CEST 2011
 activeProfiles=
 eclipse.preferences.version=1
 fullBuildGoals=process-test-resources

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -85,24 +85,33 @@
               org.ops4j.pax.web.extender.war.internal,
             </Private-Package>
             <Import-Package>
+              <!-- system -->
               javax.security.auth.x500,
-              javax.servlet,
-              javax.servlet.http,
               javax.xml.parsers,
+              org.w3c.dom,
+              org.xml.sax,
 
-              org.apache.commons.logging;version="[1.1,1.2)",
+              <!-- javax.servlet -->
+              javax.servlet;version="[2.5,4.0)",
+              javax.servlet.http;version="[2.5,4.0)",
+
+              <!-- logging -->
               org.jboss.logging;version="[3.0,4.0)",
+              org.apache.commons.logging;version="[1.1,1.2)";resolution:=optional,
+
+              <!-- jboss-osgi --> 
               org.jboss.osgi.deployment*;version="[1.0,2.0)",
               org.jboss.osgi.http;version="[1.0,2.0)",
               org.jboss.osgi.spi*;version="[1.0,2.0)",
               org.jboss.osgi.vfs;version="[1.0,2.0)",
 
+              <!-- pax-web -->              
               org.ops4j.pax.web.service,
+
+              <!-- osgi -->              
               org.osgi.service.http,
               org.osgi.framework,
               org.osgi.util.tracker,
-              org.w3c.dom,
-              org.xml.sax,
 
               !javax.microedition.io, 
               !org.ops4j.pax.web.service.spi

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
   <!-- Properties -->
   <properties>
     <version.jboss.osgi.deployment>1.0.10</version.jboss.osgi.deployment>
-    <version.jboss.osgi.http>1.0.4</version.jboss.osgi.http>
+    <version.jboss.osgi.http>1.0.5</version.jboss.osgi.http>
     <version.jboss.osgi.spi>1.0.28</version.jboss.osgi.spi>
     <version.ops4j.pax.web>1.0.3</version.ops4j.pax.web>
     <version.osgi>4.2.0</version.osgi>