svn commit: r1863222 - /jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java

[re...@apache.org]

Author: reschke
Date: Wed Jul 17 14:23:50 2019
New Revision: 1863222

URL: http://svn.apache.org/viewvc?rev=1863222&view=rev
Log:
JCR-4460: allow to run remoted conformance tests with a custom servlet context path

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=1863222&r1=1863221&r2=1863222&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 Wed Jul 17 14:23:50 2019
@@ -54,6 +54,8 @@ public class RepositoryStubImpl extends
 
     private final String protectedRemoveImplClass;
 
+    private static final String WEBDAV_SERVLET_CONTEXT = System.getProperty("WebDAVServletContext", "/");
+
     public RepositoryStubImpl(Properties env) {
         super(env);
         acProviderImplClass = env.getProperty(PROP_ACCESSCONTROL_PROVIDER_CLASS);
@@ -78,7 +80,7 @@ public class RepositoryStubImpl extends
             holder.setInitParameter(JCRWebdavServerServlet.INIT_PARAM_MISSING_AUTH_MAPPING, "");
             holder.setInitParameter(JcrRemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG, protectedRemoveImplClass);
 
-            ServletContextHandler schandler = new ServletContextHandler(server, "/");
+            ServletContextHandler schandler = new ServletContextHandler(server, WEBDAV_SERVLET_CONTEXT);
             schandler.addServlet(holder, "/*");
         }
 
@@ -101,7 +103,7 @@ public class RepositoryStubImpl extends
             try {
                 Map<String, String> parameters = new HashMap<String, String>();
 
-                String uri = "http://localhost:" + connector.getLocalPort() + "/";
+                String uri = "http://localhost:" + connector.getLocalPort() + WEBDAV_SERVLET_CONTEXT;
 
                 String parmName = System.getProperty(this.getClass().getName() + ".REPURIPARM", JcrUtils.REPOSITORY_URI);
                 parameters.put(parmName, uri);