commit 3106211fafcb35ac609364c764f6bc361af44ffd
author Julian Reschke <reschke@apache.org> Wed Jul 17 14:23:50 2019 +0000
committer Julian Reschke <reschke@apache.org> Wed Jul 17 14:23:50 2019 +0000
tree 246062884a61b1943749fe4697742ed0eb0a337b
parent 3b2fae841179ee92bfe77a8c7d027fe104c97623

JCR-4460: allow to run remoted conformance tests with a custom servlet context path

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1863222 13f79535-47bb-0310-9956-ffa450edef68

jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java

diff --git a/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java b/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
index 9bc4419..0f07c23 100644
--- a/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
+++ b/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
@@ -54,6 +54,8 @@
 
     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 @@
             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 @@
             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);