svn commit: r985805 - in /sling/trunk/bundles/engine: pom.xml src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java

[fmeschbe]

Author: fmeschbe
Date: Mon Aug 16 06:25:10 2010
New Revision: 985805

URL: http://svn.apache.org/viewvc?rev=985805&view=rev
Log:
SLING-1650 Use new Auth Core dependency (and adapt service interface)

Modified:
    sling/trunk/bundles/engine/pom.xml
    
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java

Modified: sling/trunk/bundles/engine/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=985805&r1=985804&r2=985805&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Mon Aug 16 06:25:10 2010
@@ -109,7 +109,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.auth</artifactId>
+            <artifactId>org.apache.sling.auth.core</artifactId>
             <version>0.9.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=985805&r1=985804&r2=985805&view=diff
==============================================================================
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
 Mon Aug 16 06:25:10 2010
@@ -57,7 +57,7 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.servlets.ServletResolver;
-import org.apache.sling.commons.auth.AuthenticationSupport;
+import org.apache.sling.auth.core.AuthenticationSupport;
 import org.apache.sling.commons.mime.MimeTypeService;
 import org.apache.sling.commons.osgi.OsgiUtil;
 import org.apache.sling.engine.impl.filter.RequestSlingFilterChain;
@@ -190,11 +190,11 @@ public class SlingMainServlet extends Ge
 
             HttpServletRequest request = (HttpServletRequest) req;
 
-               requestListenerManager.sendEvent( request, 
SlingRequestEvent.EventType.EVENT_INIT );
-
             // set the thread name according to the request
             String threadName = setThreadName(request);
 
+            requestListenerManager.sendEvent( request, 
SlingRequestEvent.EventType.EVENT_INIT );
+
             try {
                 if (!allowTrace && "TRACE".equals(request.getMethod())) {
                     HttpServletResponse response = (HttpServletResponse) res;
@@ -245,6 +245,7 @@ public class SlingMainServlet extends Ge
             } finally {
 
                 requestListenerManager.sendEvent( request, 
SlingRequestEvent.EventType.EVENT_DESTROY );
+
                 // reset the thread name
                 if (threadName != null) {
                     Thread.currentThread().setName(threadName);