svn commit: r1695900 - in /sling/trunk/launchpad/base: ./ src/main/java/org/apache/sling/launchpad/app/ src/main/java/org/apache/sling/launchpad/base/app/ src/main/java/org/apache/sling/launchpad/base/impl/ src/main/java/org/apache/sling/launchpad/base...

[cz...@apache.org]

Author: cziegeler
Date: Fri Aug 14 13:15:53 2015
New Revision: 1695900

URL: http://svn.apache.org/r1695900
Log:
Revert commit

Added:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
      - copied unchanged from r1695898, 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/app/   (props changed)
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/   (props changed)
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java   (props changed)
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/   (props changed)
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java   (contents, props changed)
    sling/trunk/launchpad/base/src/main/webapp/WEB-INF/   (props changed)

Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1695900&r1=1695899&r2=1695900&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Fri Aug 14 13:15:53 2015
@@ -41,6 +41,10 @@
         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>
@@ -271,13 +275,13 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.proxy</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>${felix.httpservice.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.bridge</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>${felix.httpservice.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Propchange: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/
            ('svn:mergeinfo' removed)

Propchange: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/
            ('svn:mergeinfo' removed)

Propchange: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
            ('svn:mergeinfo' removed)

Propchange: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/
            ('svn:mergeinfo' removed)

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=1695900&r1=1695899&r2=1695900&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:15:53 2015
@@ -346,14 +346,9 @@ 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);
+            ",javax.servlet;javax.servlet.http;javax.servlet.resources; version=" + servletVersion);
 
         // prevent system properties from being considered
         props.put(Sling.SLING_IGNORE_SYSTEM_PROPERTIES, "true");

Propchange: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
            ('svn:mergeinfo' removed)

Propchange: sling/trunk/launchpad/base/src/main/webapp/WEB-INF/
            ('svn:mergeinfo' removed)