Author: cziegeler
Date: Thu Mar 25 08:56:41 2010
New Revision: 927309
URL: http://svn.apache.org/viewvc?rev=927309&view=rev
Log:
SLING-1464 : Move EngineConstants.SLING_CURRENT_SERVLET_NAME to SlingConstants
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/EngineConstants.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java?rev=927309&r1=927308&r2=927309&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/SlingConstants.java
Thu Mar 25 08:56:41 2010
@@ -379,4 +379,14 @@ public class SlingConstants {
* @since 2.1
*/
public static final String SLING_HOME_URL = "sling.home.url";
+
+ /**
+ * The name of the request attribute providing the name of the currently
+ * executing servlet (value is "sling.core.current.servletName"). This
+ * attribute is set immediately before calling the
+ * <code>Servlet.service()</code> method and reset to any previously
+ * stored value after the service method returns.
+ * @since 2.1
+ */
+ public static final String SLING_CURRENT_SERVLET_NAME =
"sling.core.current.servletName";
}
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/EngineConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/EngineConstants.java?rev=927309&r1=927308&r2=927309&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/EngineConstants.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/EngineConstants.java
Thu Mar 25 08:56:41 2010
@@ -64,7 +64,9 @@ public class EngineConstants {
* attribute is set immediately before calling the
* <code>Servlet.service()</code> method and reset to any previously
* stored value after the service method returns.
+ * @deprecated Use {...@link
org.apache.sling.api.SlingConstants#SLING_CURRENT_SERVLET_NAME}
*/
+ @Deprecated
public static final String SLING_CURRENT_SERVLET_NAME =
"sling.core.current.servletName";
/**
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java?rev=927309&r1=927308&r2=927309&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
Thu Mar 25 08:56:41 2010
@@ -18,7 +18,7 @@
*/
package org.apache.sling.engine.impl.request;
-import static
org.apache.sling.engine.EngineConstants.SLING_CURRENT_SERVLET_NAME;
+import static org.apache.sling.api.SlingConstants.SLING_CURRENT_SERVLET_NAME;
import java.io.BufferedReader;
import java.io.IOException;
@@ -472,7 +472,7 @@ public class RequestData implements Buff
* sent and the method terminates.
* <p>
* If the the servlet exists, the
- * {...@link
org.apache.sling.engine.EngineConstants#SLING_CURRENT_SERVLET_NAME} request
attribute is set
+ * {...@link
org.apache.sling.api.SlingConstants#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
