You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2019/09/01 10:29:33 UTC
svn commit: r1866234 -
/jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Author: reschke
Date: Sun Sep 1 10:29:32 2019
New Revision: 1866234
URL: http://svn.apache.org/viewvc?rev=1866234&view=rev
Log:
JCR-4475: Improve o.a.j.jcr2dav.RepositoryStubImpl to test with custom servlet path mapping (patch by woon_san)
Modified:
jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Modified: jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java?rev=1866234&r1=1866233&r2=1866234&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java Sun Sep 1 10:29:32 2019
@@ -54,7 +54,11 @@ public class RepositoryStubImpl extends
private final String protectedRemoveImplClass;
- private static final String WEBDAV_SERVLET_CONTEXT = System.getProperty("WebDAVServletContext", "/");
+ private static final String WEBDAV_SERVLET_CONTEXT_PATH = System.getProperty("WebDAVServletContext", "");
+
+ private static final String WEBDAV_SERVLET_PATH_PREFIX = System.getProperty("WebDAVServletPrefix", "");
+
+ private static final String WEBDAV_SERVLET_PATH_MAPPING = WEBDAV_SERVLET_PATH_PREFIX + "/*";
public RepositoryStubImpl(Properties env) {
super(env);
@@ -76,16 +80,16 @@ public class RepositoryStubImpl extends
return repository;
}
});
- String pathPrefix = WEBDAV_SERVLET_CONTEXT;
+ String pathPrefix = WEBDAV_SERVLET_PATH_PREFIX;
if (pathPrefix.endsWith("/")) {
- pathPrefix = pathPrefix.substring(0, pathPrefix.length() - 1);
+ pathPrefix = pathPrefix.substring(0, pathPrefix.length() - 1);
}
holder.setInitParameter(JCRWebdavServerServlet.INIT_PARAM_RESOURCE_PATH_PREFIX, pathPrefix);
holder.setInitParameter(JCRWebdavServerServlet.INIT_PARAM_MISSING_AUTH_MAPPING, "");
holder.setInitParameter(JcrRemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG, protectedRemoveImplClass);
- ServletContextHandler schandler = new ServletContextHandler(server, WEBDAV_SERVLET_CONTEXT);
- schandler.addServlet(holder, "/*");
+ ServletContextHandler schandler = new ServletContextHandler(server, WEBDAV_SERVLET_CONTEXT_PATH);
+ schandler.addServlet(holder, WEBDAV_SERVLET_PATH_MAPPING);
}
if (connector == null) {
@@ -107,7 +111,7 @@ public class RepositoryStubImpl extends
try {
Map<String, String> parameters = new HashMap<String, String>();
- String uri = "http://localhost:" + connector.getLocalPort() + WEBDAV_SERVLET_CONTEXT;
+ String uri = "http://localhost:" + connector.getLocalPort() + WEBDAV_SERVLET_CONTEXT_PATH + WEBDAV_SERVLET_PATH_PREFIX;
String parmName = System.getProperty(this.getClass().getName() + ".REPURIPARM", JcrUtils.REPOSITORY_URI);
parameters.put(parmName, uri);