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 2008/05/14 12:11:08 UTC
svn commit: r656209 - in /incubator/sling/trunk: engine/src/main/java/org/apache/sling/engine/ engine/src/main/java/org/apache/sling/engine/impl/ engine/src/main/java/org/apache/sling/engine/impl/auth/ engine/src/main/java/org/apache/sling/engine/impl/...

Author: cziegeler
Date: Wed May 14 03:11:08 2008
New Revision: 656209

URL: http://svn.apache.org/viewvc?rev=656209&view=rev
Log:
SLING-449: Refactor core to engine.

Added:
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/EngineConstants.java
      - copied, changed from r656207, incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java
Removed:
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java
Modified:
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
    incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
    incubator/sling/trunk/sling/servlet-resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java

Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/EngineConstants.java (from r656207, incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/EngineConstants.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/EngineConstants.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java&r1=656207&r2=656209&rev=656209&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/EngineConstants.java Wed May 14 03:11:08 2008
@@ -24,7 +24,7 @@
  * never change, it is recommended that applications refer to the symbolic
  * constants instead of code the strings themselves.
  */
-public class CoreConstants {
+public class EngineConstants {
 
     /**
      * The name of the framework property defining the Sling home directory

Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=656209&r1=656208&r2=656209&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java Wed May 14 03:11:08 2008
@@ -20,7 +20,7 @@
 
 import static org.apache.sling.api.SlingConstants.ERROR_REQUEST_URI;
 import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
-import static org.apache.sling.engine.CoreConstants.SESSION;
+import static org.apache.sling.engine.EngineConstants.SESSION;
 
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java?rev=656209&r1=656208&r2=656209&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/SlingAuthenticator.java Wed May 14 03:11:08 2008
@@ -32,7 +32,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.sling.engine.CoreConstants;
+import org.apache.sling.engine.EngineConstants;
 import org.apache.sling.engine.auth.AuthenticationHandler;
 import org.apache.sling.engine.auth.AuthenticationInfo;
 import org.apache.sling.jcr.api.TooManySessionsException;
@@ -180,7 +180,7 @@
         // 0. Nothing to do, if the session is also in the request
         // this might be the case if the request is handled as a result
         // of a servlet container include inside another Sling request
-        Object sessionAttr = req.getAttribute(CoreConstants.SESSION);
+        Object sessionAttr = req.getAttribute(EngineConstants.SESSION);
         if (sessionAttr instanceof Session) {
             log.debug("authenticate: Request already authenticated, nothing to do");
             return true;
@@ -189,7 +189,7 @@
             log.warn(
                 "authenticate: Overwriting existing Session attribute ({})",
                 sessionAttr);
-            req.removeAttribute(CoreConstants.SESSION);
+            req.removeAttribute(EngineConstants.SESSION);
         }
 
         // 1. Ask all authentication handlers to try to extract credentials
@@ -434,7 +434,7 @@
 
         request.setAttribute(HttpContext.REMOTE_USER, session.getUserID());
         request.setAttribute(HttpContext.AUTHENTICATION_TYPE, authType);
-        request.setAttribute(CoreConstants.SESSION, session);
+        request.setAttribute(EngineConstants.SESSION, session);
 
         log.debug("Session stored as request attribute: user={}, workspace={}",
                 session.getUserID(), session.getWorkspace().getName());

Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java?rev=656209&r1=656208&r2=656209&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java Wed May 14 03:11:08 2008
@@ -20,7 +20,7 @@
 
 import static org.apache.sling.api.SlingConstants.ATTR_REQUEST_CONTENT;
 import static org.apache.sling.api.SlingConstants.ATTR_REQUEST_SERVLET;
-import static org.apache.sling.engine.CoreConstants.SLING_CURRENT_SERVLET_NAME;
+import static org.apache.sling.engine.EngineConstants.SLING_CURRENT_SERVLET_NAME;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -419,7 +419,7 @@
      * sent and the method terminates.
      * <p>
      * If the the servlet exists, the
-     * {@link org.apache.sling.engine.CoreConstants#SLING_CURRENT_SERVLET_NAME} request attribute is set
+     * {@link org.apache.sling.engine.EngineConstants#SLING_CURRENT_SERVLET_NAME} request attribute is set
      * to the name of that servlet and that servlet name is also set as the
      * {@link #setActiveServletName(String) currently active servlet}. After
      * the termination of the servlet (normal or throwing a Throwable) the

Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java?rev=656209&r1=656208&r2=656209&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java Wed May 14 03:11:08 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.sling.engine.servlets;
 
-import static org.apache.sling.engine.CoreConstants.SLING_SERLVET_NAME;
+import static org.apache.sling.engine.EngineConstants.SLING_SERLVET_NAME;
 import static org.osgi.framework.Constants.SERVICE_ID;
 import static org.osgi.framework.Constants.SERVICE_PID;
 import static org.osgi.service.component.ComponentConstants.COMPONENT_NAME;

Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=656209&r1=656208&r2=656209&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java Wed May 14 03:11:08 2008
@@ -21,7 +21,7 @@
 import static org.apache.sling.api.SlingConstants.ERROR_MESSAGE;
 import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
 import static org.apache.sling.api.SlingConstants.ERROR_STATUS;
-import static org.apache.sling.engine.CoreConstants.SLING_CURRENT_SERVLET_NAME;
+import static org.apache.sling.engine.EngineConstants.SLING_CURRENT_SERVLET_NAME;
 
 import java.io.IOException;
 import java.util.ArrayList;

Modified: incubator/sling/trunk/sling/servlet-resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java?rev=656209&r1=656208&r2=656209&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java Wed May 14 03:11:08 2008
@@ -36,7 +36,7 @@
 import org.apache.sling.commons.testing.sling.MockResource;
 import org.apache.sling.commons.testing.sling.MockResourceResolver;
 import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
-import org.apache.sling.engine.CoreConstants;
+import org.apache.sling.engine.EngineConstants;
 import org.apache.sling.servlet.resolver.resource.MockServletResource;
 import org.osgi.framework.Constants;
 
@@ -62,7 +62,7 @@
             bundle, SlingServletResolverTest.this.servlet);
         MockServiceReference serviceReference = new MockServiceReference(bundle);
         serviceReference.setProperty(Constants.SERVICE_ID, 1L);
-        serviceReference.setProperty(CoreConstants.SLING_SERLVET_NAME,
+        serviceReference.setProperty(EngineConstants.SLING_SERLVET_NAME,
             SERVLET_NAME);
         serviceReference.setProperty(
             ServletResolverConstants.SLING_SERVLET_PATHS, SERVLET_PATH);