Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiStringProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiStringProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiStringProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiStringProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,19 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "strings", + "value": [ + "one", + "two" + ] + } + } + } +] \ No newline at end of file
Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiUriProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiUriProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiUriProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiUriProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,19 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "uris", + "value": [ + "http://www.acme.com", + "http://www.acme.org" + ] + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiWeakReferenceProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiWeakReferenceProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiWeakReferenceProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeMultiWeakReferenceProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,19 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "weakReferences", + "value": [ + "one", + "two" + ] + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeNameProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeNameProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeNameProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeNameProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,16 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "name", + "value": "one" + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodePathProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodePathProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodePathProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodePathProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,16 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "path", + "value": "/one" + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeReferenceProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeReferenceProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeReferenceProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeReferenceProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,16 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "reference", + "value": "one" + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeStringProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeStringProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeStringProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeStringProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,16 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "string", + "value": "one" + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeUriProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeUriProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeUriProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeUriProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,16 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "uri", + "value": "http://www.acme.com" + } + } + } +] \ No newline at end of file Added: jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeWeakReferenceProperty.json URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeWeakReferenceProperty.json?rev=1684861&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeWeakReferenceProperty.json (added) +++ jackrabbit/oak/trunk/oak-remote/src/test/resources/org/apache/jackrabbit/oak/remote/http/handler/addNodeWeakReferenceProperty.json Thu Jun 11 12:09:15 2015 @@ -0,0 +1,16 @@ +[ + { + "op": "add", + "path": "/test", + "properties": { + "jcr:primaryType": { + "type": "name", + "value": "nt:unstructured" + }, + "property": { + "type": "weakReference", + "value": "one" + } + } + } +] \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-run/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1684861&r1=1684860&r2=1684861&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/pom.xml (original) +++ jackrabbit/oak/trunk/oak-run/pom.xml Thu Jun 11 12:09:15 2015 @@ -240,6 +240,11 @@ <artifactId>oak-http</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>oak-remote</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-upgrade</artifactId> Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1684861&r1=1684860&r2=1684861&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Thu Jun 11 12:09:15 2015 @@ -99,6 +99,8 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient; import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer; +import org.apache.jackrabbit.oak.remote.content.ContentRemoteRepository; +import org.apache.jackrabbit.oak.remote.http.RemoteServlet; import org.apache.jackrabbit.oak.scalability.ScalabilityRunner; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; @@ -1129,6 +1131,9 @@ public final class Main { ServletHolder holder = new ServletHolder(new OakServlet(repository)); context.addServlet(holder, path + "/*"); + ServletHolder remoteServlet = new ServletHolder(new RemoteServlet(new ContentRemoteRepository(repository))); + context.addServlet(remoteServlet, path + "/api/*"); + // 2 - Webdav Server on JCR repository final Repository jcrRepository = jcr.createRepository(); @SuppressWarnings("serial") Modified: jackrabbit/oak/trunk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1684861&r1=1684860&r2=1684861&view=diff ============================================================================== --- jackrabbit/oak/trunk/pom.xml (original) +++ jackrabbit/oak/trunk/pom.xml Thu Jun 11 12:09:15 2015 @@ -54,6 +54,7 @@ <module>oak-it</module> <module>oak-pojosr</module> <module>oak-authorization-cug</module> + <module>oak-remote</module> </modules> <scm>
