svn commit: r1695899 - in /sling/trunk/launchpad/base: pom.xml src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

[cziegeler]

Author: cziegeler
Date: Fri Aug 14 13:13:36 2015
New Revision: 1695899

URL: http://svn.apache.org/r1695899
Log:
SLING-4887 : Move to servlet 3 - correctly export servlet packages

Removed:
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
Modified:
    sling/trunk/launchpad/base/pom.xml
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

Modified: sling/trunk/launchpad/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1695899&r1=1695898&r2=1695899&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Fri Aug 14 13:13:36 2015
@@ -41,10 +41,6 @@
         by the various launchpad modules..
     </description>
 
-    <properties>
-        <felix.httpservice.version>2.3.2</felix.httpservice.version>
-    </properties>
-
     <scm>
         
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base</connection>
         
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base</developerConnection>
@@ -275,13 +271,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.proxy</artifactId>
-            <version>${felix.httpservice.version}</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.bridge</artifactId>
-            <version>${felix.httpservice.version}</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java?rev=1695899&r1=1695898&r2=1695899&view=diff
==============================================================================
--- 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
 (original)
+++ 
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
 Fri Aug 14 13:13:36 2015
@@ -346,9 +346,14 @@ public class SlingServletDelegate extend
         // The following property must start with a comma!
         final String servletVersion = getServletContext().getMajorVersion() + 
"." +
                                       getServletContext().getMinorVersion();
+        String packages = 
",javax.servlet;javax.servlet.http;javax.servlet.resources";
+        if ( getServletContext().getMajorVersion() >= 3 ) {
+            // servlet 3.x adds new packages and we should export as 2.6 and 
3.x
+            packages = packages + "; version=2.6" + packages + 
";javax.servlet.annotation;javax.servlet.descriptor";
+        }
         props.put(
             Sling.PROP_SYSTEM_PACKAGES,
-            ",javax.servlet;javax.servlet.http;javax.servlet.resources; 
version=" + servletVersion);
+            packages + "; version=" + servletVersion);
 
         // prevent system properties from being considered
         props.put(Sling.SLING_IGNORE_SYSTEM_PROPERTIES, "true");