Author: cziegeler
Date: Wed May 14 03:29:48 2008
New Revision: 656227
URL: http://svn.apache.org/viewvc?rev=656227&view=rev
Log:
SLING-451: Refactor to use servlets.resolver as package name.
Added:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java
- copied, changed from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
- copied, changed from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/
- copied from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/
- copied from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/helper/
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/
- copied from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/resource/
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java
- copied, changed from r656221,
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/
- copied from r656221,
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/resolver/helper/
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/
- copied from r656221,
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/resolver/resource/
Removed:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/
Modified:
incubator/sling/trunk/launchpad/app/pom.xml
incubator/sling/trunk/servlets/resolver/pom.xml
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultErrorHandlerServlet.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultServlet.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/LocationIterator.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollector.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGet.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/SlingServletConfig.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/WeightedResource.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResource.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceIterator.java
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProvider.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/HelperTestBase.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/LocationIteratorTest.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetCalculatePrefixWeightTest.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetServletsTest.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ScriptSelectionTest.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/WeightedResourceTest.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/MockServletResource.java
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderCreateTest.java
Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=656227&r1=656226&r2=656227&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Wed May 14 03:29:48 2008
@@ -275,7 +275,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.servlet.resolver</artifactId>
+ <artifactId>org.apache.sling.servlets.resolver</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
<optional>true</optional>
</dependency>
Modified: incubator/sling/trunk/servlets/resolver/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/pom.xml?rev=656227&r1=656226&r2=656227&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/resolver/pom.xml (original)
+++ incubator/sling/trunk/servlets/resolver/pom.xml Wed May 14 03:29:48 2008
@@ -51,19 +51,6 @@
<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>
@@ -74,7 +61,7 @@
<configuration>
<instructions>
<Private-Package>
- org.apache.sling.servlet.resolver.*
+ org.apache.sling.servlets.resolver.*
</Private-Package>
</instructions>
</configuration>
Copied:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java
(from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java?p2=incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java&p1=incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java&r1=656221&r2=656227&rev=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/ServletResolverConstants.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver;
+package org.apache.sling.servlets.resolver;
public class ServletResolverConstants {
@@ -84,7 +84,7 @@
* The resource type of a registered servlet used as the default servlet if
* no other servlet or script could be selected (value is
* "sling/servlet/default"). If no servlet is registered under this name,
- * the [EMAIL PROTECTED]
org.apache.sling.servlet.resolver.defaults.DefaultServlet} is
+ * the [EMAIL PROTECTED]
org.apache.sling.servlets.resolver.defaults.DefaultServlet} is
* used.
*/
public static final String DEFAULT_SERVLET_NAME = "sling/servlet/default";
Copied:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
(from r656221,
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java?p2=incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java&p1=incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java&r1=656221&r2=656227&rev=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver;
+package org.apache.sling.servlets.resolver;
import static org.apache.sling.api.SlingConstants.ERROR_MESSAGE;
import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
@@ -56,11 +56,11 @@
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;
-import org.apache.sling.servlet.resolver.helper.SlingServletConfig;
-import org.apache.sling.servlet.resolver.resource.ServletResourceProvider;
+import org.apache.sling.servlets.resolver.defaults.DefaultErrorHandlerServlet;
+import org.apache.sling.servlets.resolver.defaults.DefaultServlet;
+import org.apache.sling.servlets.resolver.helper.ResourceCollector;
+import org.apache.sling.servlets.resolver.helper.SlingServletConfig;
+import org.apache.sling.servlets.resolver.resource.ServletResourceProvider;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultErrorHandlerServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultErrorHandlerServlet.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultErrorHandlerServlet.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultErrorHandlerServlet.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.defaults;
+package org.apache.sling.servlets.resolver.defaults;
import java.io.IOException;
import java.io.PrintWriter;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultServlet.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultServlet.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/defaults/DefaultServlet.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.defaults;
+package org.apache.sling.servlets.resolver.defaults;
import java.io.IOException;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/LocationIterator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/LocationIterator.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/LocationIterator.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/LocationIterator.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -24,7 +24,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.servlet.resolver.ServletResolverConstants;
+import org.apache.sling.servlets.resolver.ServletResolverConstants;
/**
* The <code>LocationIterator</code> provides access to an ordered collection
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollector.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollector.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollector.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollector.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import java.util.Collection;
import java.util.Iterator;
@@ -30,7 +30,7 @@
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.SyntheticResource;
import org.apache.sling.api.servlets.HttpConstants;
-import org.apache.sling.servlet.resolver.resource.ServletResourceProvider;
+import org.apache.sling.servlets.resolver.resource.ServletResourceProvider;
/**
* The <code>ResourceCollector</code> class provides a single public method -
@@ -78,7 +78,7 @@
* @param baseResourceType The basic resource type to use as a final
* resource super type. If this is <code>null</code> the
* default value
- * [EMAIL PROTECTED]
org.apache.sling.servlet.resolver.ServletResolverConstants#DEFAULT_SERVLET_NAME}
+ * [EMAIL PROTECTED]
org.apache.sling.servlets.resolver.ServletResolverConstants#DEFAULT_SERVLET_NAME}
* is assumed.
*/
public ResourceCollector(String methodName, String baseResourceType) {
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGet.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGet.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGet.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import java.util.Iterator;
import java.util.Set;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/SlingServletConfig.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/SlingServletConfig.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/SlingServletConfig.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/SlingServletConfig.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/WeightedResource.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/WeightedResource.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/WeightedResource.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/helper/WeightedResource.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceWrapper;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResource.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResource.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResource.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResource.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.resource;
+package org.apache.sling.servlets.resolver.resource;
import javax.servlet.Servlet;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceIterator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceIterator.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceIterator.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceIterator.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.resource;
+package org.apache.sling.servlets.resolver.resource;
import java.util.HashSet;
import java.util.Iterator;
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProvider.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProvider.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProvider.java
Wed May 14 03:29:48 2008
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.resource;
+package org.apache.sling.servlets.resolver.resource;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.SLING_SERVLET_METHODS;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.SLING_SERVLET_PATHS;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.SLING_SERVLET_SELECTORS;
+import static
org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_EXTENSIONS;
+import static
org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_METHODS;
+import static
org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_PATHS;
+import static
org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES;
+import static
org.apache.sling.servlets.resolver.ServletResolverConstants.SLING_SERVLET_SELECTORS;
import java.util.HashSet;
import java.util.Iterator;
Copied:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java
(from r656221,
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java)
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java?p2=incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java&p1=incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java&r1=656221&r2=656227&rev=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlet/resolver/SlingServletResolverTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/SlingServletResolverTest.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver;
+package org.apache.sling.servlets.resolver;
import java.util.ArrayList;
import java.util.List;
@@ -37,7 +37,9 @@
import org.apache.sling.commons.testing.sling.MockResourceResolver;
import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
import org.apache.sling.engine.EngineConstants;
-import org.apache.sling.servlet.resolver.resource.MockServletResource;
+import org.apache.sling.servlets.resolver.ServletResolverConstants;
+import org.apache.sling.servlets.resolver.SlingServletResolver;
+import org.apache.sling.servlets.resolver.resource.MockServletResource;
import org.osgi.framework.Constants;
public class SlingServletResolverTest extends TestCase {
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/HelperTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/HelperTestBase.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/HelperTestBase.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/HelperTestBase.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import junit.framework.TestCase;
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/LocationIteratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/LocationIteratorTest.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/LocationIteratorTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/LocationIteratorTest.java
Wed May 14 03:29:48 2008
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.DEFAULT_SERVLET_NAME;
+import static
org.apache.sling.servlets.resolver.ServletResolverConstants.DEFAULT_SERVLET_NAME;
import org.apache.sling.jcr.resource.JcrResourceUtil;
+import org.apache.sling.servlets.resolver.helper.LocationIterator;
public class LocationIteratorTest extends HelperTestBase {
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetCalculatePrefixWeightTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetCalculatePrefixWeightTest.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetCalculatePrefixWeightTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetCalculatePrefixWeightTest.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import junit.framework.TestCase;
@@ -24,6 +24,8 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.commons.testing.sling.MockResource;
import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
+import org.apache.sling.servlets.resolver.helper.ResourceCollectorGet;
+import org.apache.sling.servlets.resolver.helper.WeightedResource;
public class ResourceCollectorGetCalculatePrefixWeightTest extends TestCase {
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetServletsTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetServletsTest.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetServletsTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ResourceCollectorGetServletsTest.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import java.util.Collection;
import java.util.HashMap;
@@ -26,6 +26,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.commons.testing.sling.MockResource;
+import org.apache.sling.servlets.resolver.helper.ResourceCollector;
public class ResourceCollectorGetServletsTest extends HelperTestBase {
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ScriptSelectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ScriptSelectionTest.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ScriptSelectionTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/ScriptSelectionTest.java
Wed May 14 03:29:48 2008
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
import java.util.Collection;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.commons.testing.sling.MockResource;
import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
+import org.apache.sling.servlets.resolver.helper.ResourceCollector;
/** Various tests that explain and demonstrate how scripts are
* selected
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/WeightedResourceTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/WeightedResourceTest.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/WeightedResourceTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/helper/WeightedResourceTest.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.helper;
+package org.apache.sling.servlets.resolver.helper;
+
+import org.apache.sling.servlets.resolver.helper.WeightedResource;
import junit.framework.TestCase;
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/MockServletResource.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/MockServletResource.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/MockServletResource.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/MockServletResource.java
Wed May 14 03:29:48 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.resource;
+package org.apache.sling.servlets.resolver.resource;
import javax.servlet.Servlet;
import org.apache.sling.api.resource.ResourceResolver;
public class MockServletResource extends
- org.apache.sling.servlet.resolver.resource.ServletResource {
+ org.apache.sling.servlets.resolver.resource.ServletResource {
public MockServletResource(ResourceResolver resourceResolver,
Servlet servlet, String path) {
super(resourceResolver, servlet, path);
Modified:
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderCreateTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderCreateTest.java?rev=656227&r1=656221&r2=656227&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderCreateTest.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderCreateTest.java
Wed May 14 03:29:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlet.resolver.resource;
+package org.apache.sling.servlets.resolver.resource;
import java.util.HashSet;
import java.util.Set;
@@ -31,7 +31,8 @@
import org.apache.sling.api.servlets.HttpConstants;
import org.apache.sling.commons.testing.osgi.MockServiceReference;
import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.servlet.resolver.ServletResolverConstants;
+import org.apache.sling.servlets.resolver.ServletResolverConstants;
+import org.apache.sling.servlets.resolver.resource.ServletResourceProvider;
public class ServletResourceProviderCreateTest extends TestCase {
