You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/08/17 16:47:30 UTC
svn commit: r1696298 - in /sling/trunk/launchpad: base/
base/src/main/java/org/apache/sling/launchpad/base/webapp/
base/src/main/java/org/apache/sling/launchpad/webapp/
base/src/main/webapp/WEB-INF/ builder/src/main/provisioning/
Author: cziegeler
Date: Mon Aug 17 14:47:30 2015
New Revision: 1696298
URL: http://svn.apache.org/r1696298
Log:
SLING-4954 : Update to Apache Felix Http 3
Modified:
sling/trunk/launchpad/base/pom.xml
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingServletDelegate.java
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingSessionListener.java
sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt
sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt
Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Aug 17 14:47:30 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</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</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/webapp/SlingHttpSessionListenerDelegate.java Mon Aug 17 14:47:30 2015
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSessionLis
import org.apache.felix.http.proxy.ProxyListener;
+@Deprecated
public class SlingHttpSessionListenerDelegate implements
HttpSessionAttributeListener, HttpSessionListener,
ServletContextListener {
@@ -35,34 +36,41 @@ public class SlingHttpSessionListenerDel
// ---------- ServletContextListener
+ @Override
public void contextInitialized(final ServletContextEvent sce) {
this.proxyListener.contextInitialized(sce);
}
+ @Override
public void contextDestroyed(final ServletContextEvent sce) {
this.proxyListener.contextDestroyed(sce);
}
// ---------- HttpSessionListener
+ @Override
public void sessionCreated(HttpSessionEvent se) {
proxyListener.sessionCreated(se);
}
+ @Override
public void sessionDestroyed(HttpSessionEvent se) {
proxyListener.sessionDestroyed(se);
}
// ---------- HttpSessionAttributeListener
+ @Override
public void attributeAdded(HttpSessionBindingEvent se) {
proxyListener.attributeAdded(se);
}
+ @Override
public void attributeRemoved(HttpSessionBindingEvent se) {
proxyListener.attributeRemoved(se);
}
+ @Override
public void attributeReplaced(HttpSessionBindingEvent se) {
proxyListener.attributeReplaced(se);
}
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=1696298&r1=1696297&r2=1696298&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 Mon Aug 17 14:47:30 2015
@@ -351,14 +351,10 @@ public class SlingServletDelegate extend
// 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(
+ 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);
-
// prevent system properties from being considered
props.put(Sling.SLING_IGNORE_SYSTEM_PROPERTIES, "true");
Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingServlet.java Mon Aug 17 14:47:30 2015
@@ -193,8 +193,6 @@ public class SlingServlet extends Generi
*/
@Override
public void destroy() {
- SlingSessionListener.stopDelegatee();
-
if (sling != null) {
sling.destroy();
}
@@ -215,6 +213,7 @@ public class SlingServlet extends Generi
* Note, that a new request coming in while the web application is still
* running, will actually cause Sling to restart !
*/
+ @Override
public void stopped() {
/**
* This method is called if the framework is stopped from within by
@@ -228,7 +227,6 @@ public class SlingServlet extends Generi
// clear the reference to the framework
sling = null;
- SlingSessionListener.stopDelegatee();
}
/**
@@ -243,13 +241,13 @@ public class SlingServlet extends Generi
* file. If <code>null</code> the existing launcher jar will be
* used again.
*/
+ @Override
public void updated(File updateFile) {
// drop the sling reference to be able to restart
synchronized (this) {
if (startingSling == null) {
sling = null;
- SlingSessionListener.stopDelegatee();
}
}
@@ -285,6 +283,7 @@ public class SlingServlet extends Generi
if (startingSling == null) {
slingHome = getSlingHome((HttpServletRequest) request);
Thread starter = new Thread(new Runnable() {
+ @Override
public void run() {
startSling();
}
@@ -377,8 +376,6 @@ public class SlingServlet extends Generi
slingLauncher.setSlingHome(slingHome);
}
- SlingSessionListener.startDelegate(sling.getClass().getClassLoader());
-
try {
log("Starting launcher ...");
sling.init(getServletConfig());
Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingSessionListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingSessionListener.java?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingSessionListener.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/webapp/SlingSessionListener.java Mon Aug 17 14:47:30 2015
@@ -18,7 +18,6 @@
*/
package org.apache.sling.launchpad.webapp;
-import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.http.HttpSessionAttributeListener;
@@ -26,103 +25,37 @@ import javax.servlet.http.HttpSessionBin
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import org.apache.sling.launchpad.base.shared.SharedConstants;
-
+@Deprecated
public class SlingSessionListener implements HttpSessionAttributeListener,
HttpSessionListener, ServletContextListener {
- private static ServletContext servletContext;
-
- private static ServletContextListener delegateeContextListener;
-
- private static HttpSessionListener delegateeSessionListener;
-
- private static HttpSessionAttributeListener delegateeSessionAttributeListener;
-
- static void startDelegate(final ClassLoader classLoader) {
-
- // if the listener has not been configured, do nothing because
- // there is no servlet context to forward and there are no
- // events ever sent to this listener
- if (servletContext == null) {
- return;
- }
-
- Object delegatee = null;
- try {
- Class<?> delegateeClass = classLoader.loadClass(SharedConstants.DEFAULT_SLING_LISTENER);
- delegatee = delegateeClass.newInstance();
- } catch (Exception e) {
- servletContext.log(
- "Delegatee Event Listener class "
- + SharedConstants.DEFAULT_SLING_LISTENER
- + " cannot be loaded or instantiated; Http Session Event forwarding is disabled",
- e);
- }
-
- if (delegatee instanceof ServletContextListener) {
- delegateeContextListener = (ServletContextListener) delegatee;
- delegateeContextListener.contextInitialized(new ServletContextEvent(
- servletContext));
-
- delegateeSessionListener = (HttpSessionListener) delegatee;
- delegateeSessionAttributeListener = (HttpSessionAttributeListener) delegatee;
- }
- }
-
- static void stopDelegatee() {
- if (delegateeContextListener != null) {
- delegateeContextListener.contextDestroyed(new ServletContextEvent(
- servletContext));
- }
-
- delegateeContextListener = null;
- delegateeSessionListener = null;
- delegateeSessionAttributeListener = null;
- }
-
+ @Override
public void contextInitialized(ServletContextEvent sce) {
- SlingSessionListener.servletContext = sce.getServletContext();
+ sce.getServletContext().log("Deprecated SlingSessionListener is used. Please remove it from your web.xml");
}
+ @Override
public void contextDestroyed(ServletContextEvent sce) {
- stopDelegatee();
- SlingSessionListener.servletContext = null;
}
+ @Override
public void sessionCreated(HttpSessionEvent se) {
- final HttpSessionListener delegateeSessionListener = SlingSessionListener.delegateeSessionListener;
- if (delegateeSessionListener != null) {
- delegateeSessionListener.sessionCreated(se);
- }
}
+ @Override
public void sessionDestroyed(HttpSessionEvent se) {
- final HttpSessionListener delegateeSessionListener = SlingSessionListener.delegateeSessionListener;
- if (delegateeSessionListener != null) {
- delegateeSessionListener.sessionDestroyed(se);
- }
}
+ @Override
public void attributeAdded(HttpSessionBindingEvent se) {
- final HttpSessionAttributeListener delegateeSessionAttributeListener = SlingSessionListener.delegateeSessionAttributeListener;
- if (delegateeSessionAttributeListener != null) {
- delegateeSessionAttributeListener.attributeAdded(se);
- }
}
+ @Override
public void attributeRemoved(HttpSessionBindingEvent se) {
- final HttpSessionAttributeListener delegateeSessionAttributeListener = SlingSessionListener.delegateeSessionAttributeListener;
- if (delegateeSessionAttributeListener != null) {
- delegateeSessionAttributeListener.attributeRemoved(se);
- }
}
+ @Override
public void attributeReplaced(HttpSessionBindingEvent se) {
- final HttpSessionAttributeListener delegateeSessionAttributeListener = SlingSessionListener.delegateeSessionAttributeListener;
- if (delegateeSessionAttributeListener != null) {
- delegateeSessionAttributeListener.attributeReplaced(se);
- }
}
}
Modified: sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml (original)
+++ sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml Mon Aug 17 14:47:30 2015
@@ -23,13 +23,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_0.xsd">
<display-name>Sling Launchpad Web Application</display-name>
- <!-- The Felix Http Service Listener Proxy for HTTP Session events -->
- <listener>
- <listener-class>
- org.apache.sling.launchpad.webapp.SlingSessionListener
- </listener-class>
- </listener>
-
<servlet>
<display-name>Sling Servlet</display-name>
<servlet-name>sling</servlet-name>
Modified: sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt Mon Aug 17 14:47:30 2015
@@ -23,4 +23,4 @@
org.apache.derby/derby/10.5.3.0_1
commons-pool/commons-pool/1.6
org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1
- org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.3.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.3.0
Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Mon Aug 17 14:47:30 2015
@@ -20,4 +20,4 @@
# Only a single artifact is allowed within this feature.
#
[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/5.0.1-2.6.2
+ org.apache.sling/org.apache.sling.launchpad.base/5.0.1-2.6.3-SNAPSHOT
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Aug 17 14:47:30 2015
@@ -69,7 +69,7 @@
org.apache.geronimo.bundles/jstl/1.2_1
org.apache.sling/org.apache.sling.models.api/1.2.0
org.apache.sling/org.apache.sling.models.impl/1.2.0
- org.apache.felix/org.apache.felix.http.whiteboard/2.3.2
+ org.apache.felix/org.apache.felix.http.whiteboard/3.0.0
org.apache.sling/org.apache.sling.installer.console/1.0.0
org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.16
@@ -96,6 +96,7 @@
org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.0.0
[artifacts startLevel=10]
+ org.apache.felix/org.apache.felix.http.sslfilter/1.0.2
org.apache.felix/org.apache.felix.scr/2.0.0
org.apache.felix/org.apache.felix.metatype/1.1.2
org.apache.tika/tika-core/1.6
@@ -104,8 +105,8 @@
[artifacts startLevel=15]
commons-io/commons-io/2.4
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
- org.apache.sling/org.apache.sling.jcr.api/2.3.1-SNAPSHOT
- org.apache.sling/org.apache.sling.jcr.base/2.3.1-SNAPSHOT
+ org.apache.sling/org.apache.sling.jcr.api/2.3.0
+ org.apache.sling/org.apache.sling.jcr.base/2.3.0
org.apache.sling/org.apache.sling.jcr.registration/1.0.2
org.apache.jackrabbit/jackrabbit-api/2.10.1
org.apache.jackrabbit/jackrabbit-jcr-commons/2.10.1
Modified: sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt?rev=1696298&r1=1696297&r2=1696298&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/standalone.txt Mon Aug 17 14:47:30 2015
@@ -22,6 +22,6 @@
# Add a servlet implementation for the standalone case
[artifacts startLevel=5 runModes=:standalone]
- org.apache.felix/org.apache.felix.http.api/2.3.2
- org.apache.felix/org.apache.felix.http.servlet-api/1.1.0
- org.apache.felix/org.apache.felix.http.jetty/3.0.2
+ org.apache.felix/org.apache.felix.http.api/3.0.0
+ org.apache.felix/org.apache.felix.http.servlet-api/1.1.2
+ org.apache.felix/org.apache.felix.http.jetty/3.1.0