You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/05/29 16:36:07 UTC
svn commit: r661339 - in /incubator/sling/trunk/servlets/resolver/src:
main/java/org/apache/sling/servlets/resolver/
main/java/org/apache/sling/servlets/resolver/helper/
main/java/org/apache/sling/servlets/resolver/resource/
test/java/org/apache/sling/...
Author: fmeschbe
Date: Thu May 29 07:36:07 2008
New Revision: 661339
URL: http://svn.apache.org/viewvc?rev=661339&view=rev
Log:
SLING-489 Not ignoring servlet registration properties if sling.servlet.paths is set
Added:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.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/resource/ServletResource.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/resource/ServletResourceProviderCreateTest.java
Modified: incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java?rev=661339&r1=661338&r2=661339&view=diff
==============================================================================
--- incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java (original)
+++ incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/SlingServletResolver.java Thu May 29 07:36:07 2008
@@ -61,6 +61,7 @@
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.apache.sling.servlets.resolver.resource.ServletResourceProviderFactory;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -73,8 +74,8 @@
*
* @scr.component label="%servletresolver.name"
* description="%servletresolver.description"
- * @scr.property name="service.description"
- * value="Sling Servlet Resolver and Error Handler"
+ * @scr.property name="service.description" value="Sling Servlet Resolver and
+ * Error Handler"
* @scr.property name="service.vendor" value="The Apache Software Foundation"
* @scr.service
* @scr.reference name="Servlet" interface="javax.servlet.Servlet"
@@ -104,7 +105,7 @@
private ComponentContext context;
- private String servletRoot;
+ private ServletResourceProviderFactory servletResourceProviderFactory;
// the default servlet if no other servlet applies for a request. This
// field is set on demand by getDefaultServlet()
@@ -468,15 +469,8 @@
// from configuration if available
Dictionary<?, ?> properties = context.getProperties();
- String tmpRoot = OsgiUtil.toString(properties.get(PROP_SERVLET_ROOT),
- DEFAULT_SERVLET_ROOT);
- if (!tmpRoot.startsWith("/")) {
- tmpRoot = "/" + tmpRoot;
- }
- if (!tmpRoot.endsWith("/")) {
- tmpRoot += "/";
- }
- servletRoot = tmpRoot;
+ String servletRoot = OsgiUtil.toString(
+ properties.get(PROP_SERVLET_ROOT), DEFAULT_SERVLET_ROOT);
Collection<ServiceReference> refs;
synchronized (this) {
@@ -484,6 +478,9 @@
refs = pendingServlets;
pendingServlets = new ArrayList<ServiceReference>();
+ servletResourceProviderFactory = new ServletResourceProviderFactory(
+ servletRoot);
+
// register servlets immediately from now on
this.context = context;
@@ -501,6 +498,7 @@
// destroy all servlets
destroyAllServlets(refs);
this.context = null;
+ this.servletResourceProviderFactory = null;
}
}
@@ -545,8 +543,8 @@
return false;
}
- ServletResourceProvider provider = ServletResourceProvider.create(
- reference, servlet, servletRoot);
+ ServletResourceProvider provider = servletResourceProviderFactory.create(
+ reference, servlet);
if (provider == null) {
log.error(
"createServlet: Cannot register servlet {} without path or resource type configuration",
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=661339&r1=661338&r2=661339&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 Thu May 29 07:36:07 2008
@@ -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.servlets.resolver.resource.ServletResourceProvider;
+import org.apache.sling.servlets.resolver.resource.ServletResourceProviderFactory;
/**
* The <code>ResourceCollector</code> class provides a single public method -
@@ -139,7 +139,7 @@
// special treatment for servlets registered with neither a method
// name nor extensions and selectors
String path = location.getPath()
- + ServletResourceProvider.SERVLET_PATH_EXTENSION;
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION;
location = location.getResourceResolver().getResource(path);
if (location != null) {
addWeightedResource(resources, location, 0,
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=661339&r1=661338&r2=661339&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 Thu May 29 07:36:07 2008
@@ -32,7 +32,7 @@
private final Servlet servlet;
private final String path;
-
+
private final String resourceType;
private final ResourceMetadata metadata;
@@ -42,8 +42,8 @@
this.resourceResolver = resourceResolver;
this.servlet = servlet;
this.path = path;
- this.resourceType = ServletResourceProvider.ensureServletNameExtension(path);
-
+ this.resourceType = ServletResourceProviderFactory.ensureServletNameExtension(path);
+
this.metadata = new ResourceMetadata();
metadata.setResolutionPath(path);
}
@@ -64,7 +64,7 @@
public String getResourceSuperType() {
return null;
}
-
+
public String getPath() {
return path;
}
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=661339&r1=661338&r2=661339&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 Thu May 29 07:36:07 2008
@@ -18,13 +18,6 @@
*/
package org.apache.sling.servlets.resolver.resource;
-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;
import java.util.Set;
@@ -35,136 +28,14 @@
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.HttpConstants;
-import org.apache.sling.commons.osgi.OsgiUtil;
-import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.osgi.framework.ServiceReference;
public class ServletResourceProvider implements ResourceProvider {
- /**
- * The extension appended to servlets to register into the resource tree
- * to simplify handling in the resolution process (value is ".servlet").
- */
- public static final String SERVLET_PATH_EXTENSION = ".servlet";
-
- private static final String[] DEFAULT_SERVLET_METHODS = {
- HttpConstants.METHOD_GET, HttpConstants.METHOD_HEAD };
-
- private static final String ALL_METHODS = "*";
-
private final Servlet servlet;
private Set<String> resourcePaths;
- public static ServletResourceProvider create(ServiceReference ref,
- Servlet servlet, String servletRoot) {
-
- // check whether explicit paths are set
- String[] paths = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_PATHS));
- if (paths != null && paths.length > 0) {
- Set<String> pathSet = new HashSet<String>();
- for (String path : paths) {
- if (!path.startsWith("/")) {
- path = servletRoot.concat(path);
- }
-
- // add the unmodified path
- pathSet.add(path);
-
- // ensure we have another entry which has the .servlet ext.
- pathSet.add(ensureServletNameExtension(path));
- }
- return new ServletResourceProvider(pathSet, servlet);
- }
-
- // now, we fall back to resource types, extensions and methods
- String[] types = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_RESOURCE_TYPES));
- if (types == null || types.length == 0) {
- // TODO: should log, why we ignore this servlet
- return null;
- }
-
- // check for selectors
- String[] selectors = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_SELECTORS));
- if (selectors == null) {
- selectors = new String[] { null };
- }
-
- // we have types and expect extensions and/or methods
- String[] extensions = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_EXTENSIONS));
-
- // handle the methods property specially (SLING-430)
- String[] methods = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_METHODS));
- if (methods == null || methods.length == 0) {
- // TODO: should log
- methods = DEFAULT_SERVLET_METHODS;
- } else if (methods.length == 1 && ALL_METHODS.equals(methods[0])) {
- // TODO: should log
- methods = null;
- }
-
- Set<String> pathSet = new HashSet<String>();
- for (String type : types) {
-
- // ensure namespace prefixes are converted to slashes
- type = JcrResourceUtil.resourceTypeToPath(type);
-
- // make absolute if relative
- if (!type.startsWith("/")) {
- type = servletRoot + type;
- }
-
- // ensure trailing slash for full path building
- if (!type.endsWith("/")) {
- type += "/";
- }
-
- // add entries for each selector combined with each ext and method
- for (String selector : selectors) {
-
- String selPath = type;
- if (selector != null && selector.length() > 0) {
- selPath += selector.replace('.', '/') + ".";
- }
-
- boolean pathAdded = false;
-
- // create paths with extensions
- if (extensions != null) {
- for (String ext : extensions) {
- pathSet.add(selPath + ext + SERVLET_PATH_EXTENSION);
- pathAdded = true;
- }
- }
-
- // create paths with method names
- if (methods != null) {
- for (String method : methods) {
- pathSet.add(selPath + method + SERVLET_PATH_EXTENSION);
- pathAdded = true;
- }
- }
-
- // if neither methods nore extensions were added
- if (!pathAdded) {
- pathSet.add(selPath.substring(0, selPath.length() - 1)
- + SERVLET_PATH_EXTENSION);
- }
- }
- }
-
- return new ServletResourceProvider(pathSet, servlet);
- }
-
- static String ensureServletNameExtension(String servletPath) {
- if (servletPath.endsWith(SERVLET_PATH_EXTENSION)) {
- return servletPath;
- }
-
- return servletPath.concat(SERVLET_PATH_EXTENSION);
- }
-
- private ServletResourceProvider(Set<String> resourcePaths, Servlet servlet) {
+ ServletResourceProvider(Set<String> resourcePaths, Servlet servlet) {
this.servlet = servlet;
this.resourcePaths = resourcePaths;
}
Added: incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java?rev=661339&view=auto
==============================================================================
--- incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java (added)
+++ incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java Thu May 29 07:36:07 2008
@@ -0,0 +1,227 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.servlets.resolver.resource;
+
+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.Set;
+
+import javax.servlet.Servlet;
+
+import org.apache.sling.api.servlets.HttpConstants;
+import org.apache.sling.commons.osgi.OsgiUtil;
+import org.apache.sling.jcr.resource.JcrResourceUtil;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ServletResourceProviderFactory {
+
+ /**
+ * The extension appended to servlets to register into the resource tree to
+ * simplify handling in the resolution process (value is ".servlet").
+ */
+ public static final String SERVLET_PATH_EXTENSION = ".servlet";
+
+ private static final String[] DEFAULT_SERVLET_METHODS = {
+ HttpConstants.METHOD_GET, HttpConstants.METHOD_HEAD };
+
+ private static final String ALL_METHODS = "*";
+
+ /** default log */
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ /**
+ * The root path to use for servlets registered with relative paths.
+ */
+ private final String servletRoot;
+
+ static String ensureServletNameExtension(String servletPath) {
+ if (servletPath.endsWith(SERVLET_PATH_EXTENSION)) {
+ return servletPath;
+ }
+
+ return servletPath.concat(SERVLET_PATH_EXTENSION);
+ }
+
+ public ServletResourceProviderFactory(String servletRoot) {
+
+ // ensure the root starts and ends with a slash
+ if (!servletRoot.startsWith("/")) {
+ servletRoot = "/" + servletRoot;
+ }
+ if (!servletRoot.endsWith("/")) {
+ servletRoot += "/";
+ }
+
+ this.servletRoot = servletRoot;
+ }
+
+ public ServletResourceProvider create(ServiceReference ref, Servlet servlet) {
+
+ Set<String> pathSet = new HashSet<String>();
+
+ // check whether explicit paths are set
+ addByPath(pathSet, ref);
+
+ // now, we handle resource types, extensions and methods
+ addByType(pathSet, ref);
+
+ if (pathSet.isEmpty()) {
+ if (log.isInfoEnabled()) {
+ log.info(
+ "create({}): ServiceReference has no registration settings, ignoring",
+ getServiceIdentifier(ref));
+ }
+ return null;
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug("create({}): Registering servlet for paths {}",
+ getServiceIdentifier(ref), pathSet);
+ }
+
+ return new ServletResourceProvider(pathSet, servlet);
+ }
+
+ private void addByPath(Set<String> pathSet, ServiceReference ref) {
+ String[] paths = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_PATHS));
+ if (paths != null && paths.length > 0) {
+ for (String path : paths) {
+ if (!path.startsWith("/")) {
+ path = servletRoot.concat(path);
+ }
+
+ // add the unmodified path
+ pathSet.add(path);
+
+ // ensure we have another entry which has the .servlet ext.
+ pathSet.add(ensureServletNameExtension(path));
+ }
+ }
+ }
+
+ private void addByType(Set<String> pathSet, ServiceReference ref) {
+ String[] types = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_RESOURCE_TYPES));
+ if (types == null || types.length == 0) {
+ if (log.isDebugEnabled()) {
+ log.debug("addByType({}): no resource types declared",
+ getServiceIdentifier(ref));
+ }
+ return;
+ }
+
+ // check for selectors
+ String[] selectors = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_SELECTORS));
+ if (selectors == null) {
+ selectors = new String[] { null };
+ }
+
+ // we have types and expect extensions and/or methods
+ String[] extensions = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_EXTENSIONS));
+
+ // handle the methods property specially (SLING-430)
+ String[] methods = OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_METHODS));
+ if (methods == null || methods.length == 0) {
+ if (log.isInfoEnabled()) {
+ log.info(
+ "addByType({}): No methos declared, assuming GET/HEAD",
+ getServiceIdentifier(ref));
+ }
+ methods = DEFAULT_SERVLET_METHODS;
+ } else if (methods.length == 1 && ALL_METHODS.equals(methods[0])) {
+ if (log.isInfoEnabled()) {
+ log.info("addByType({}): Assuming all methods for '*'",
+ getServiceIdentifier(ref));
+ }
+ methods = null;
+ }
+
+ for (String type : types) {
+
+ // ensure namespace prefixes are converted to slashes
+ type = JcrResourceUtil.resourceTypeToPath(type);
+
+ // make absolute if relative
+ if (!type.startsWith("/")) {
+ type = servletRoot + type;
+ }
+
+ // ensure trailing slash for full path building
+ if (!type.endsWith("/")) {
+ type += "/";
+ }
+
+ // add entries for each selector combined with each ext and method
+ for (String selector : selectors) {
+
+ String selPath = type;
+ if (selector != null && selector.length() > 0) {
+ selPath += selector.replace('.', '/') + ".";
+ }
+
+ boolean pathAdded = false;
+
+ // create paths with extensions
+ if (extensions != null) {
+ for (String ext : extensions) {
+ pathSet.add(selPath + ext + SERVLET_PATH_EXTENSION);
+ pathAdded = true;
+ }
+ }
+
+ // create paths with method names
+ if (methods != null) {
+ for (String method : methods) {
+ pathSet.add(selPath + method + SERVLET_PATH_EXTENSION);
+ pathAdded = true;
+ }
+ }
+
+ // if neither methods nore extensions were added
+ if (!pathAdded) {
+ pathSet.add(selPath.substring(0, selPath.length() - 1)
+ + SERVLET_PATH_EXTENSION);
+ }
+ }
+ }
+ }
+
+ private String getServiceIdentifier(ServiceReference ref) {
+ Object id = ref.getProperty(ComponentConstants.COMPONENT_NAME);
+ if (id != null) {
+ return id.toString();
+ }
+
+ id = ref.getProperty(Constants.SERVICE_PID);
+ if (id != null) {
+ return id.toString();
+ }
+
+ // service.id is guaranteed to be set by the framework
+ return ref.getProperty(Constants.SERVICE_ID).toString();
+ }
+}
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=661339&r1=661338&r2=661339&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 Thu May 29 07:36:07 2008
@@ -32,7 +32,6 @@
import org.apache.sling.commons.testing.osgi.MockServiceReference;
import org.apache.sling.jcr.resource.JcrResourceUtil;
import org.apache.sling.servlets.resolver.ServletResolverConstants;
-import org.apache.sling.servlets.resolver.resource.ServletResourceProvider;
public class ServletResourceProviderCreateTest extends TestCase {
@@ -48,6 +47,9 @@
private static final String RES_TYPE_PATH = JcrResourceUtil.resourceTypeToPath(RES_TYPE);
+ private ServletResourceProviderFactory factory = new ServletResourceProviderFactory(
+ ROOT);
+
public void testCreateMethodsDefault() {
MockServiceReference msr = new MockServiceReference(null);
@@ -55,8 +57,7 @@
RES_TYPE);
// msr.setProperty(ServletResolverConstants.SLING_SERVLET_METHODS, "*");
- ServletResourceProvider srp = ServletResourceProvider.create(msr,
- TEST_SERVLET, ROOT);
+ ServletResourceProvider srp = factory.create(msr, TEST_SERVLET);
assertNotNull(srp);
String[] paths = srp.getSerlvetPaths();
@@ -65,9 +66,9 @@
Set<String> checkerSet = new HashSet<String>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_GET
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_HEAD
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
for (String path : paths) {
assertTrue(path + " not expected", checkerSet.remove(path));
@@ -83,8 +84,7 @@
RES_TYPE);
msr.setProperty(ServletResolverConstants.SLING_SERVLET_METHODS, "GET");
- ServletResourceProvider srp = ServletResourceProvider.create(msr,
- TEST_SERVLET, ROOT);
+ ServletResourceProvider srp = factory.create(msr, TEST_SERVLET);
assertNotNull(srp);
String[] paths = srp.getSerlvetPaths();
@@ -93,7 +93,7 @@
Set<String> checkerSet = new HashSet<String>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_GET
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
for (String path : paths) {
assertTrue(path + " not expected", checkerSet.remove(path));
@@ -110,8 +110,7 @@
msr.setProperty(ServletResolverConstants.SLING_SERVLET_METHODS,
new String[] { "GET", "POST", "PUT" });
- ServletResourceProvider srp = ServletResourceProvider.create(msr,
- TEST_SERVLET, ROOT);
+ ServletResourceProvider srp = factory.create(msr, TEST_SERVLET);
assertNotNull(srp);
String[] paths = srp.getSerlvetPaths();
@@ -120,11 +119,11 @@
Set<String> checkerSet = new HashSet<String>();
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_GET
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_POST
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
checkerSet.add(ROOT + RES_TYPE_PATH + "/" + HttpConstants.METHOD_PUT
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
for (String path : paths) {
assertTrue(path + " not expected", checkerSet.remove(path));
@@ -140,8 +139,7 @@
RES_TYPE);
msr.setProperty(ServletResolverConstants.SLING_SERVLET_METHODS, "*");
- ServletResourceProvider srp = ServletResourceProvider.create(msr,
- TEST_SERVLET, ROOT);
+ ServletResourceProvider srp = factory.create(msr, TEST_SERVLET);
assertNotNull(srp);
String[] paths = srp.getSerlvetPaths();
@@ -150,7 +148,7 @@
Set<String> checkerSet = new HashSet<String>();
checkerSet.add(ROOT + RES_TYPE_PATH
- + ServletResourceProvider.SERVLET_PATH_EXTENSION);
+ + ServletResourceProviderFactory.SERVLET_PATH_EXTENSION);
for (String path : paths) {
assertTrue(path + " not expected", checkerSet.remove(path));