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 2020/07/24 12:13:01 UTC
svn commit: r1880266 - in /jackrabbit/branches/2.20: ./
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/
jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/
Author: reschke
Date: Fri Jul 24 12:13:00 2020
New Revision: 1880266
URL: http://svn.apache.org/viewvc?rev=1880266&view=rev
Log:
JCR-4615: jcr-server: add minimal test coverage for remoting WebDAV servlet (merged r1879939 and r1879947 into 2.20)
Added:
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java
- copied, changed from r1879939, jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1879939,1879947
Modified: jackrabbit/branches/2.20/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java?rev=1880266&r1=1880265&r2=1880266&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/JcrRemotingConstants.java Fri Jul 24 12:13:00 2020
@@ -98,7 +98,7 @@ public interface JcrRemotingConstants {
*/
public static final String XML_RELPATH = "relpath";
- // oroperty local name of the workspace for which the repository session has been created.
+ // property local name of the workspace for which the repository session has been created.
public static final String JCR_WORKSPACE_NAME_LN = "workspaceName";
// general property local names
Copied: jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java (from r1879939, jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java?p2=jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java&p1=jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java&r1=1879939&r2=1880266&rev=1880266&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java Fri Jul 24 12:13:00 2020
@@ -37,7 +37,7 @@ public class RemotingTest extends WebDAV
// simple test the verifies that we are indeed talking to the remoting
// servlet
public void testRoot() throws IOException, DavException {
- String testuri = this.remotingUri.toASCIIString() + "jcr:root";
+ String testuri = this.remotingUri.toASCIIString() + "default/jcr:root";
DavPropertyName pntn = DavPropertyName.create("primarynodetype", ObservationConstants.NAMESPACE);
DavPropertyNameSet names = new DavPropertyNameSet();
names.add(pntn);
Modified: jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java?rev=1880266&r1=1880265&r2=1880266&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java Fri Jul 24 12:13:00 2020
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.webdav.server;
-import static org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet.INIT_PARAM_RESOURCE_CONFIG;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -44,6 +42,7 @@ import org.apache.http.impl.client.HttpC
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.jackrabbit.core.RepositoryContext;
import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet;
import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.jackrabbit.test.RepositoryStubException;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
@@ -65,7 +64,9 @@ import junit.framework.TestResult;
*/
public class WebDAVTestBase extends AbstractJCRTest {
- private static final String WEBDAV_SERVLET_PATH_MAPPING = "/*";
+ private static final String SIMPLE_WEBDAV_SERVLET_PATH_MAPPING = "/*";
+ private static final String REMOTING_PREFIX = "/remoting";
+ private static final String REMOTING_WEBDAV_SERVLET_PATH_MAPPING = REMOTING_PREFIX + "/*";
private static ServerConnector httpConnector;
private static ServerConnector httpsConnector;
@@ -76,6 +77,9 @@ public class WebDAVTestBase extends Abst
public URI httpsUri;
public String root;
+ // URI for remoting servlet, does not include workspace name
+ public URI remotingUri;
+
public HttpClient client;
public HttpClientContext context;
@@ -107,15 +111,27 @@ public class WebDAVTestBase extends Abst
if (server == null) {
server = new Server();
- ServletHolder holder = new ServletHolder(new SimpleWebdavServlet() {
+ ServletHolder simple = new ServletHolder(new SimpleWebdavServlet() {
+ private static final long serialVersionUID = 8638589328461138178L;
+
+ public Repository getRepository() {
+ return repoContext.getRepository();
+ }
+ });
+ simple.setInitParameter(SimpleWebdavServlet.INIT_PARAM_RESOURCE_CONFIG, "/config.xml");
+
+ ServletHolder remoting = new ServletHolder(new JcrRemotingServlet() {
+ private static final long serialVersionUID = -2969534124090379387L;
+
public Repository getRepository() {
return repoContext.getRepository();
}
});
- holder.setInitParameter(INIT_PARAM_RESOURCE_CONFIG, "/config.xml");
+ remoting.setInitParameter(JcrRemotingServlet.INIT_PARAM_RESOURCE_PATH_PREFIX, "/remoting");
ServletContextHandler schandler = new ServletContextHandler(server, "/");
- schandler.addServlet(holder, WEBDAV_SERVLET_PATH_MAPPING);
+ schandler.addServlet(simple, SIMPLE_WEBDAV_SERVLET_PATH_MAPPING);
+ schandler.addServlet(remoting, REMOTING_WEBDAV_SERVLET_PATH_MAPPING);
schandler.setBaseResource(Resource.newClassPathResource("/"));
server.setHandler(schandler);
@@ -151,6 +167,7 @@ public class WebDAVTestBase extends Abst
}
this.uri = new URI("http", null, "localhost", httpConnector.getLocalPort(), "/default/", null, null);
+ this.remotingUri = new URI("http", null, "localhost", httpConnector.getLocalPort(), REMOTING_PREFIX + "/", null, null);
this.httpsUri = new URI("https", null, "localhost", httpsConnector.getLocalPort(), "/default/", null, null);
this.root = this.uri.toASCIIString();