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/07/18 11:51:39 UTC
svn commit: r1863271 - in /jackrabbit/branches/2.18: ./
jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Author: reschke
Date: Thu Jul 18 11:51:39 2019
New Revision: 1863271
URL: http://svn.apache.org/viewvc?rev=1863271&view=rev
Log:
JCR-4460: allow to run remoted conformance tests with a custom servlet context path (merged r1863222 into 2.18)
Modified:
jackrabbit/branches/2.18/ (props changed)
jackrabbit/branches/2.18/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 18 11:51:39 2019
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1858564,1858566,1859534,1859563,1859633,1860118,1860123,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1863196
+/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1858564,1858566,1859534,1859563,1859633,1860118,1860123,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1863196,1863222
Modified: jackrabbit/branches/2.18/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java?rev=1863271&r1=1863270&r2=1863271&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java (original)
+++ jackrabbit/branches/2.18/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java Thu Jul 18 11:51:39 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);