svn commit: r1695903 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

[cziegeler]

Author: cziegeler
Date: Fri Aug 14 13:18:04 2015
New Revision: 1695903

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

Modified:
    
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java

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=1695903&r1=1695902&r2=1695903&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:18:04 2015
@@ -346,6 +346,15 @@ 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,
+                 packages + "; version=" + servletVersion);
+
         props.put(
             Sling.PROP_SYSTEM_PACKAGES,
             ",javax.servlet;javax.servlet.http;javax.servlet.resources; 
version=" + servletVersion);