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 11:48:36 UTC
svn commit: r656196 - in /incubator/sling/trunk: ./ engine/
engine/src/main/java/org/apache/sling/core/
engine/src/main/java/org/apache/sling/engine/
engine/src/main/java/org/apache/sling/engine/auth/
engine/src/main/java/org/apache/sling/engine/impl/ ...
Author: cziegeler
Date: Wed May 14 02:48:34 2008
New Revision: 656196
URL: http://svn.apache.org/viewvc?rev=656196&view=rev
Log:
SLING-449: Refactor core to engine.
Added:
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java
- copied, changed from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/CoreConstants.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestLog.java
- copied, changed from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestLog.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestUtil.java
- copied, changed from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestUtil.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/auth/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
- copied, changed from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
- copied, changed from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
- copied, changed from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/adapter/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/auth/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/debug/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/debug/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/filter/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/helper/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/log/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/output/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/parameters/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/request/
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/
- copied from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/servlets/
Removed:
incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/
Modified:
incubator/sling/trunk/engine/NOTICE
incubator/sling/trunk/engine/pom.xml
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/MissingRepositoryException.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/debug/RequestProgressTrackerLogFilter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/NullResourceBundle.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/FileRequestLog.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/LoggerRequestLog.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogServiceFacade.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/Buffer.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferProvider.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedPrintWriter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedServletOutputStream.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/AbstractRequestParameter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartPostParameter.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/ContentData.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/impl/request/SlingRequestDispatcher.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestPathInfo.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/AbstractServiceReferenceConfig.java
incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java
incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/log/CustomLogFormatTest.java
incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/request/SlingRequestPathInfoTest.java
incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
incubator/sling/trunk/extensions/httpauth/src/main/java/org/apache/sling/httpauth/impl/AuthorizationHeaderAuthenticationHandler.java
incubator/sling/trunk/pom.xml
incubator/sling/trunk/samples/simple-demo/src/main/java/org/apache/sling/sample/filter/ZipFilter.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingServletConfig.java
Modified: incubator/sling/trunk/engine/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/NOTICE?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/NOTICE (original)
+++ incubator/sling/trunk/engine/NOTICE Wed May 14 02:48:34 2008
@@ -1,4 +1,4 @@
-Apache Sling Core
+Apache Sling Engine
Copyright 2007-2008 The Apache Software Foundation
Based on source code originally developed by
Modified: incubator/sling/trunk/engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/pom.xml?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/pom.xml (original)
+++ incubator/sling/trunk/engine/pom.xml Wed May 14 02:48:34 2008
@@ -27,44 +27,30 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.core</artifactId>
+ <artifactId>org.apache.sling.engine</artifactId>
<packaging>bundle</packaging>
<version>2.0.0-incubator-SNAPSHOT</version>
- <name>Sling - Core Implementation</name>
+ <name>Sling - Engine Implementation</name>
<description>
- Bundle implementing the core framework using the Component
- Framework
+ Bundle implementing the core of Sling.
</description>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/sling/core
+ scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/engine
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/core
+ scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/engine
</developerConnection>
<url>
- http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core
+ http://svn.apache.org/viewvc/incubator/sling/trunk/sling/engine
</url>
</scm>
<build>
<plugins>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-jcrocm-plugin</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <executions>
- <execution>
- <id>generate-JCR-OCM-descriptor</id>
- <goals>
- <goal>ocm</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
@@ -75,13 +61,13 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.core;
- org.apache.sling.core.auth;
- org.apache.sling.core.servlets;version=${pom.version}
+ org.apache.sling.engine;
+ org.apache.sling.engine.auth;
+ org.apache.sling.engine.servlets;version=${pom.version}
</Export-Package>
<Private-Package>
- org.apache.sling.core.impl,
- org.apache.sling.core.impl.*
+ org.apache.sling.engine.impl,
+ org.apache.sling.engine.impl.*
</Private-Package>
<Import-Package>
javax.portlet;resolution:=optional,
Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java (from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/CoreConstants.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/CoreConstants.java&r1=656189&r2=656196&rev=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/CoreConstants.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/CoreConstants.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core;
+package org.apache.sling.engine;
/**
* The <code>CoreConstants</code> interface provides some symbolic constants
@@ -86,7 +86,7 @@
/**
* The name of the request attribute set by the
- * {@link org.apache.sling.core.impl.auth.SlingAuthenticator}
+ * {@link org.apache.sling.engine.impl.auth.SlingAuthenticator}
* when authenticating the request user (value is "javax.jcr.Session").
* Existence of this attribute in the request, provided it is a JCR Session,
* signals that authentication has already taken place. This may be used
Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestLog.java (from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestLog.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestLog.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestLog.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestLog.java&r1=656189&r2=656196&rev=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestLog.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestLog.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core;
+package org.apache.sling.engine;
/**
* The <code>RequestLog</code> interface defines the API to be implemented by
Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestUtil.java (from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestUtil.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestUtil.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestUtil.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestUtil.java&r1=656189&r2=656196&rev=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/RequestUtil.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/RequestUtil.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core;
+package org.apache.sling.engine;
import java.util.Collections;
import java.util.HashMap;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationHandler.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.auth;
+package org.apache.sling.engine.auth;
import java.io.IOException;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/auth/AuthenticationInfo.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.auth;
+package org.apache.sling.engine.auth;
import javax.jcr.Credentials;
Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java (from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java&r1=656189&r2=656196&rev=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl;
+package org.apache.sling.engine.impl;
import java.io.BufferedReader;
import java.io.IOException;
@@ -43,10 +43,10 @@
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.core.impl.helper.NullResourceBundle;
-import org.apache.sling.core.impl.parameters.ParameterSupport;
-import org.apache.sling.core.impl.request.RequestData;
-import org.apache.sling.core.impl.request.SlingRequestDispatcher;
+import org.apache.sling.engine.impl.helper.NullResourceBundle;
+import org.apache.sling.engine.impl.parameters.ParameterSupport;
+import org.apache.sling.engine.impl.request.RequestData;
+import org.apache.sling.engine.impl.request.SlingRequestDispatcher;
/**
* The <code>SlingHttpServletRequestImpl</code> TODO
Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java (from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java&r1=656189&r2=656196&rev=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingHttpServletResponseImpl.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl;
+package org.apache.sling.engine.impl;
import java.io.IOException;
import java.io.PrintWriter;
@@ -35,8 +35,8 @@
import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.core.impl.request.RequestData;
-import org.apache.sling.core.servlets.ErrorHandler;
+import org.apache.sling.engine.impl.request.RequestData;
+import org.apache.sling.engine.servlets.ErrorHandler;
/**
* The <code>SlingHttpServletResponseImpl</code> TODO
Copied: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java (from r656189, incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?p2=incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java&p1=incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java&r1=656189&r2=656196&rev=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java Wed May 14 02:48:34 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl;
+package org.apache.sling.engine.impl;
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.core.CoreConstants.SESSION;
+import static org.apache.sling.engine.CoreConstants.SESSION;
import java.io.IOException;
import java.io.PrintWriter;
@@ -55,18 +55,18 @@
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.ServletResolver;
import org.apache.sling.commons.mime.MimeTypeService;
-import org.apache.sling.core.impl.auth.MissingRepositoryException;
-import org.apache.sling.core.impl.auth.SlingAuthenticator;
-import org.apache.sling.core.impl.filter.RequestSlingFilterChain;
-import org.apache.sling.core.impl.filter.SlingComponentFilterChain;
-import org.apache.sling.core.impl.filter.SlingFilterChainHelper;
-import org.apache.sling.core.impl.helper.SlingFilterConfig;
-import org.apache.sling.core.impl.helper.SlingServletContext;
-import org.apache.sling.core.impl.log.RequestLogger;
-import org.apache.sling.core.impl.request.ContentData;
-import org.apache.sling.core.impl.request.RequestData;
-import org.apache.sling.core.servlets.AbstractServiceReferenceConfig;
-import org.apache.sling.core.servlets.ErrorHandler;
+import org.apache.sling.engine.impl.auth.MissingRepositoryException;
+import org.apache.sling.engine.impl.auth.SlingAuthenticator;
+import org.apache.sling.engine.impl.filter.RequestSlingFilterChain;
+import org.apache.sling.engine.impl.filter.SlingComponentFilterChain;
+import org.apache.sling.engine.impl.filter.SlingFilterChainHelper;
+import org.apache.sling.engine.impl.helper.SlingFilterConfig;
+import org.apache.sling.engine.impl.helper.SlingServletContext;
+import org.apache.sling.engine.impl.log.RequestLogger;
+import org.apache.sling.engine.impl.request.ContentData;
+import org.apache.sling.engine.impl.request.RequestData;
+import org.apache.sling.engine.servlets.AbstractServiceReferenceConfig;
+import org.apache.sling.engine.servlets.ErrorHandler;
import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.adapter;
+package org.apache.sling.engine.impl.adapter;
import java.io.BufferedReader;
import java.io.IOException;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.adapter;
+package org.apache.sling.engine.impl.adapter;
import java.io.IOException;
import java.io.PrintWriter;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/MissingRepositoryException.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/MissingRepositoryException.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/MissingRepositoryException.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/auth/MissingRepositoryException.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.auth;
+package org.apache.sling.engine.impl.auth;
import org.apache.sling.api.SlingException;
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=656196&r1=656189&r2=656196&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 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.auth;
+package org.apache.sling.engine.impl.auth;
import java.io.IOException;
import java.util.Dictionary;
@@ -32,9 +32,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.sling.core.CoreConstants;
-import org.apache.sling.core.auth.AuthenticationHandler;
-import org.apache.sling.core.auth.AuthenticationInfo;
+import org.apache.sling.engine.CoreConstants;
+import org.apache.sling.engine.auth.AuthenticationHandler;
+import org.apache.sling.engine.auth.AuthenticationInfo;
import org.apache.sling.jcr.api.TooManySessionsException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.debug;
+package org.apache.sling.engine.impl.debug;
import java.io.IOException;
import java.util.Iterator;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.filter;
+package org.apache.sling.engine.impl.filter;
import java.io.IOException;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.filter;
+package org.apache.sling.engine.impl.filter;
import java.io.IOException;
@@ -25,7 +25,7 @@
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.core.impl.SlingMainServlet;
+import org.apache.sling.engine.impl.SlingMainServlet;
/**
* The <code>RequestSlingFilterChain</code> implements the filter chain for
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.filter;
+package org.apache.sling.engine.impl.filter;
import java.io.IOException;
@@ -25,12 +25,12 @@
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.core.impl.request.RequestData;
+import org.apache.sling.engine.impl.request.RequestData;
/**
* The <code>SlingComponentFilterChain</code> implements the filter chain for
* component scoped filters. It is used by the
- * {@link org.apache.sling.core.impl.SlingMainServlet#processRequest(SlingHttpServletRequest, SlingHttpServletResponse)}
+ * {@link org.apache.sling.engine.impl.SlingMainServlet#processRequest(SlingHttpServletRequest, SlingHttpServletResponse)}
* method to dispatch component processing.
*/
public class SlingComponentFilterChain extends AbstractSlingFilterChain {
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.filter;
+package org.apache.sling.engine.impl.filter;
import java.util.Iterator;
import java.util.SortedSet;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/NullResourceBundle.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/NullResourceBundle.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/NullResourceBundle.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/NullResourceBundle.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.helper;
+package org.apache.sling.engine.impl.helper;
import java.util.Collections;
import java.util.Enumeration;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java Wed May 14 02:48:34 2008
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.helper;
+package org.apache.sling.engine.impl.helper;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
-import org.apache.sling.core.servlets.AbstractServiceReferenceConfig;
+import org.apache.sling.engine.servlets.AbstractServiceReferenceConfig;
import org.osgi.framework.ServiceReference;
public class SlingFilterConfig extends AbstractServiceReferenceConfig implements
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.helper;
+package org.apache.sling.engine.impl.helper;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -31,8 +31,8 @@
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
-import org.apache.sling.core.impl.SlingMainServlet;
-import org.apache.sling.core.impl.request.SlingRequestDispatcher;
+import org.apache.sling.engine.impl.SlingMainServlet;
+import org.apache.sling.engine.impl.request.SlingRequestDispatcher;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.log;
+package org.apache.sling.engine.impl.log;
import java.text.CharacterIterator;
import java.text.DecimalFormat;
@@ -33,7 +33,7 @@
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.core.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
/**
* The <code>CustomLogFormat</code> class implements the support for log format
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/FileRequestLog.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/FileRequestLog.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/FileRequestLog.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/FileRequestLog.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.log;
+package org.apache.sling.engine.impl.log;
import java.io.File;
import java.io.FileWriter;
@@ -26,7 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.core.RequestLog;
+import org.apache.sling.engine.RequestLog;
/**
* The <code>FileRequestLog</code> class is an implementation of the
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/LoggerRequestLog.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/LoggerRequestLog.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/LoggerRequestLog.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/LoggerRequestLog.java Wed May 14 02:48:34 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.log;
+package org.apache.sling.engine.impl.log;
-import org.apache.sling.core.RequestLog;
+import org.apache.sling.engine.RequestLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogServiceFacade.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogServiceFacade.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogServiceFacade.java Wed May 14 02:48:34 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.log;
+package org.apache.sling.engine.impl.log;
-import org.apache.sling.core.RequestLog;
+import org.apache.sling.engine.RequestLog;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.util.tracker.ServiceTracker;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLogger.java Wed May 14 02:48:34 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.log;
+package org.apache.sling.engine.impl.log;
import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.core.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
import org.osgi.framework.BundleContext;
/**
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java Wed May 14 02:48:34 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.log;
+package org.apache.sling.engine.impl.log;
import java.io.IOException;
import java.util.Dictionary;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.core.RequestLog;
-import org.apache.sling.core.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.RequestLog;
+import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/Buffer.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/Buffer.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/Buffer.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/Buffer.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.output;
+package org.apache.sling.engine.impl.output;
import java.io.IOException;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferProvider.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferProvider.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferProvider.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.output;
+package org.apache.sling.engine.impl.output;
import java.io.IOException;
import java.io.PrintWriter;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedPrintWriter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedPrintWriter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedPrintWriter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedPrintWriter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.output;
+package org.apache.sling.engine.impl.output;
import java.io.IOException;
import java.io.PrintWriter;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedServletOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedServletOutputStream.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedServletOutputStream.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/output/BufferedServletOutputStream.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.output;
+package org.apache.sling.engine.impl.output;
import java.io.IOException;
import java.io.OutputStream;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/AbstractRequestParameter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/AbstractRequestParameter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/AbstractRequestParameter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/AbstractRequestParameter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.parameters;
+package org.apache.sling.engine.impl.parameters;
import org.apache.sling.api.request.RequestParameter;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.parameters;
+package org.apache.sling.engine.impl.parameters;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartPostParameter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartPostParameter.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartPostParameter.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/MultipartPostParameter.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.parameters;
+package org.apache.sling.engine.impl.parameters;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.parameters;
+package org.apache.sling.engine.impl.parameters;
import java.util.Collections;
import java.util.HashMap;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.parameters;
+package org.apache.sling.engine.impl.parameters;
import java.util.Enumeration;
import java.util.Iterator;
@@ -34,7 +34,7 @@
import org.apache.commons.fileupload.servlet.ServletRequestContext;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
-import org.apache.sling.core.impl.request.RequestData;
+import org.apache.sling.engine.impl.request.RequestData;
public class ParameterSupport {
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/parameters/Util.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.parameters;
+package org.apache.sling.engine.impl.parameters;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/ContentData.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/ContentData.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/ContentData.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/ContentData.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.request;
+package org.apache.sling.engine.impl.request;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,10 +27,10 @@
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.core.impl.output.Buffer;
-import org.apache.sling.core.impl.output.BufferProvider;
-import org.apache.sling.core.impl.output.BufferedPrintWriter;
-import org.apache.sling.core.impl.output.BufferedServletOutputStream;
+import org.apache.sling.engine.impl.output.Buffer;
+import org.apache.sling.engine.impl.output.BufferProvider;
+import org.apache.sling.engine.impl.output.BufferedPrintWriter;
+import org.apache.sling.engine.impl.output.BufferedServletOutputStream;
/**
* The <code>ContentData</code> class provides objects which are relevant for
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=656196&r1=656189&r2=656196&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 02:48:34 2008
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.request;
+package org.apache.sling.engine.impl.request;
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.core.CoreConstants.SLING_CURRENT_SERVLET_NAME;
+import static org.apache.sling.engine.CoreConstants.SLING_CURRENT_SERVLET_NAME;
import java.io.BufferedReader;
import java.io.IOException;
@@ -49,13 +49,13 @@
import org.apache.sling.api.servlets.ServletResolver;
import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
-import org.apache.sling.core.RequestUtil;
-import org.apache.sling.core.impl.SlingHttpServletRequestImpl;
-import org.apache.sling.core.impl.SlingHttpServletResponseImpl;
-import org.apache.sling.core.impl.SlingMainServlet;
-import org.apache.sling.core.impl.adapter.SlingServletRequestAdapter;
-import org.apache.sling.core.impl.output.BufferProvider;
-import org.apache.sling.core.impl.parameters.ParameterSupport;
+import org.apache.sling.engine.RequestUtil;
+import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.impl.SlingMainServlet;
+import org.apache.sling.engine.impl.adapter.SlingServletRequestAdapter;
+import org.apache.sling.engine.impl.output.BufferProvider;
+import org.apache.sling.engine.impl.parameters.ParameterSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -419,7 +419,7 @@
* sent and the method terminates.
* <p>
* If the the servlet exists, the
- * {@link org.apache.sling.core.CoreConstants#SLING_CURRENT_SERVLET_NAME} request attribute is set
+ * {@link org.apache.sling.engine.CoreConstants#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/impl/request/SlingRequestDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.request;
+package org.apache.sling.engine.impl.request;
import java.io.IOException;
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestPathInfo.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestPathInfo.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestPathInfo.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestPathInfo.java Wed May 14 02:48:34 2008
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.core.impl.request;
+package org.apache.sling.engine.impl.request;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.core.impl.request.SlingRequestPathInfoTest;
/**
* microsling request URI parser that provides SlingRequestPathInfo for the
Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.impl.request;
+package org.apache.sling.engine.impl.request;
import java.io.PrintWriter;
import java.text.MessageFormat;
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=656196&r1=656189&r2=656196&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 02:48:34 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.servlets;
+package org.apache.sling.engine.servlets;
-import static org.apache.sling.core.CoreConstants.SLING_SERLVET_NAME;
+import static org.apache.sling.engine.CoreConstants.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/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java?rev=656196&r1=656189&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java (original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/servlets/ErrorHandler.java Wed May 14 02:48:34 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.core.servlets;
+package org.apache.sling.engine.servlets;
import java.io.IOException;
Modified: incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/log/CustomLogFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/log/CustomLogFormatTest.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/log/CustomLogFormatTest.java (original)
+++ incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/log/CustomLogFormatTest.java Wed May 14 02:48:34 2008
@@ -16,6 +16,8 @@
*/
package org.apache.sling.core.impl.log;
+import org.apache.sling.engine.impl.log.CustomLogFormat;
+
import junit.framework.TestCase;
/**
Modified: incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/request/SlingRequestPathInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/request/SlingRequestPathInfoTest.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/request/SlingRequestPathInfoTest.java (original)
+++ incubator/sling/trunk/engine/src/test/java/org/apache/sling/core/impl/request/SlingRequestPathInfoTest.java Wed May 14 02:48:34 2008
@@ -22,6 +22,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.engine.impl.request.SlingRequestPathInfo;
/** Test the SlingRequestPathInfo class */
public class SlingRequestPathInfoTest extends TestCase {
Modified: incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java (original)
+++ incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Wed May 14 02:48:34 2008
@@ -395,14 +395,14 @@
}
/**
- * @see org.apache.sling.core.event.impl.JobPersistenceHandler#getContainerNodeType()
+ * @see org.apache.sling.engine.event.impl.JobPersistenceHandler#getContainerNodeType()
*/
protected String getContainerNodeType() {
return EventHelper.JOBS_NODE_TYPE;
}
/**
- * @see org.apache.sling.core.event.impl.JobPersistenceHandler#getEventNodeType()
+ * @see org.apache.sling.engine.event.impl.JobPersistenceHandler#getEventNodeType()
*/
protected String getEventNodeType() {
return EventHelper.JOB_NODE_TYPE;
@@ -571,7 +571,7 @@
}
/**
- * @see org.apache.sling.core.event.impl.JobPersistenceHandler#addNodeProperties(javax.jcr.Node, org.osgi.service.event.Event)
+ * @see org.apache.sling.engine.event.impl.JobPersistenceHandler#addNodeProperties(javax.jcr.Node, org.osgi.service.event.Event)
*/
protected void addNodeProperties(Node eventNode, Event event)
throws RepositoryException {
Modified: incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java (original)
+++ incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java Wed May 14 02:48:34 2008
@@ -527,7 +527,7 @@
}
/**
- * @see org.apache.sling.core.event.impl.JobPersistenceHandler#addNodeProperties(javax.jcr.Node, org.osgi.service.event.Event)
+ * @see org.apache.sling.engine.event.impl.JobPersistenceHandler#addNodeProperties(javax.jcr.Node, org.osgi.service.event.Event)
*/
protected void addNodeProperties(Node eventNode, Event event)
throws RepositoryException {
Modified: incubator/sling/trunk/extensions/httpauth/src/main/java/org/apache/sling/httpauth/impl/AuthorizationHeaderAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/httpauth/src/main/java/org/apache/sling/httpauth/impl/AuthorizationHeaderAuthenticationHandler.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/httpauth/src/main/java/org/apache/sling/httpauth/impl/AuthorizationHeaderAuthenticationHandler.java (original)
+++ incubator/sling/trunk/extensions/httpauth/src/main/java/org/apache/sling/httpauth/impl/AuthorizationHeaderAuthenticationHandler.java Wed May 14 02:48:34 2008
@@ -27,8 +27,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Base64;
-import org.apache.sling.core.auth.AuthenticationHandler;
-import org.apache.sling.core.auth.AuthenticationInfo;
+import org.apache.sling.engine.auth.AuthenticationHandler;
+import org.apache.sling.engine.auth.AuthenticationInfo;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/pom.xml (original)
+++ incubator/sling/trunk/pom.xml Wed May 14 02:48:34 2008
@@ -77,7 +77,10 @@
<module>commons/scheduler</module>
<module>commons/testing</module>
<module>commons/threads</module>
-
+
+ <!-- The Sling Engine -->
+ <module>engine</module>
+
<!-- The JCR sub project -->
<module>jcr/api</module>
<module>jcr/base</module>
@@ -95,7 +98,6 @@
<module>osgi/obr</module>
<!-- Sling -->
- <module>sling/core</module>
<module>sling/servlet-resolver</module>
<module>sling/servlets-get</module>
<module>sling/servlets-post</module>
Modified: incubator/sling/trunk/samples/simple-demo/src/main/java/org/apache/sling/sample/filter/ZipFilter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/samples/simple-demo/src/main/java/org/apache/sling/sample/filter/ZipFilter.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/samples/simple-demo/src/main/java/org/apache/sling/sample/filter/ZipFilter.java (original)
+++ incubator/sling/trunk/samples/simple-demo/src/main/java/org/apache/sling/sample/filter/ZipFilter.java Wed May 14 02:48:34 2008
@@ -41,7 +41,7 @@
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
-import org.apache.sling.core.RequestUtil;
+import org.apache.sling.engine.RequestUtil;
/**
* The <code>ZipFilter</code> is an optionally installable global filter,
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=656196&r1=656195&r2=656196&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 02:48:34 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.core.CoreConstants.SLING_CURRENT_SERVLET_NAME;
+import static org.apache.sling.engine.CoreConstants.SLING_CURRENT_SERVLET_NAME;
import java.io.IOException;
import java.util.ArrayList;
@@ -53,9 +53,9 @@
import org.apache.sling.api.servlets.OptingServlet;
import org.apache.sling.api.servlets.ServletResolver;
import org.apache.sling.commons.osgi.OsgiUtil;
-import org.apache.sling.core.RequestUtil;
-import org.apache.sling.core.servlets.AbstractServiceReferenceConfig;
-import org.apache.sling.core.servlets.ErrorHandler;
+import org.apache.sling.engine.RequestUtil;
+import org.apache.sling.engine.servlets.AbstractServiceReferenceConfig;
+import org.apache.sling.engine.servlets.ErrorHandler;
import org.apache.sling.servlet.resolver.defaults.DefaultErrorHandlerServlet;
import org.apache.sling.servlet.resolver.defaults.DefaultServlet;
import org.apache.sling.servlet.resolver.helper.ResourceCollector;
@@ -221,7 +221,7 @@
// ---------- ErrorHandler interface --------------------------------------
/**
- * @see org.apache.sling.core.servlets.ErrorHandler#handleError(int, String,
+ * @see org.apache.sling.engine.servlets.ErrorHandler#handleError(int, String,
* SlingHttpServletRequest, SlingHttpServletResponse)
*/
public void handleError(int status, String message,
Modified: incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingServletConfig.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingServletConfig.java?rev=656196&r1=656195&r2=656196&view=diff
==============================================================================
--- incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingServletConfig.java (original)
+++ incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingServletConfig.java Wed May 14 02:48:34 2008
@@ -21,7 +21,7 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import org.apache.sling.core.servlets.AbstractServiceReferenceConfig;
+import org.apache.sling.engine.servlets.AbstractServiceReferenceConfig;
import org.osgi.framework.ServiceReference;
public class SlingServletConfig extends AbstractServiceReferenceConfig implements ServletConfig {