Index: pom.xml
===================================================================
--- pom.xml	(revision 545)
+++ pom.xml	(working copy)
@@ -59,6 +59,9 @@
   <properties>
 
     <import-tool.version>1.04.04-SNAPSHOT</import-tool.version>
+    <forge.hipporepojcrdav.version>0.01.01</forge.hipporepojcrdav.version>
+    <jackrabbit.version>2.2.12-h2</jackrabbit.version>
+
     <jstl.version>1.1.2</jstl.version>
     <taglibs.version>1.1.2</taglibs.version>
 
@@ -85,8 +88,33 @@
   </repositories>
 
   <dependencyManagement>
+
     <dependencies>
-    
+
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-jcr-server</artifactId>
+        <version>${jackrabbit.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.onehippo.forge.hipporepojcrdav</groupId>
+        <artifactId>hipporepojcrdav-servlet</artifactId>
+        <version>${forge.hipporepojcrdav.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-jcr2dav</artifactId>
+        <version>${jackrabbit.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.onehippo.forge.hipporepojcrdav</groupId>
+        <artifactId>hipporepojcrdav-connector</artifactId>
+        <version>${forge.hipporepojcrdav.version}</version>
+      </dependency>
+
       <!-- other predefined runtime scope versioned dependencies -->
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -129,6 +157,7 @@
       </dependency>
 
     </dependencies>
+
   </dependencyManagement>
 
   <build>
Index: cms/pom.xml
===================================================================
--- cms/pom.xml	(revision 545)
+++ cms/pom.xml	(working copy)
@@ -14,6 +14,7 @@
   <packaging>war</packaging>
 
   <dependencies>
+
     <dependency>
       <groupId>org.onehippo.cms7</groupId>
       <artifactId>hippo-package-cms-dependencies</artifactId>
@@ -63,7 +64,17 @@
         </exclusion>
       </exclusions>
     </dependency>
-   
+
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-server</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.onehippo.forge.hipporepojcrdav</groupId>
+      <artifactId>hipporepojcrdav-servlet</artifactId>
+    </dependency>
+
   </dependencies>
 
   <build>
Index: cms/src/main/webapp/WEB-INF/web.xml
===================================================================
--- cms/src/main/webapp/WEB-INF/web.xml	(revision 545)
+++ cms/src/main/webapp/WEB-INF/web.xml	(working copy)
@@ -135,6 +135,33 @@
     </init-param>
   </servlet> 
 
+  <!--
+    JCR over WebDAV Server Servlet:
+    WARNING: This servlet gives accesses to repository through WebDAV with Basic Authentication by default.
+             So, you may want to put more secured access controls on the communication channel where needed.
+  -->
+  <servlet>
+    <servlet-name>JCRWebdavServer</servlet-name>
+    <servlet-class>org.onehippo.forge.repository.server.remoting.davex.JcrRemotingServlet</servlet-class>
+    <init-param>
+      <param-name>repository-address</param-name>
+      <param-value>vm://</param-value>
+    </init-param>
+    <init-param>
+      <param-name>missing-auth-mapping</param-name>
+      <param-value></param-value>
+    </init-param>
+    <init-param>
+      <param-name>authenticate-header</param-name>
+      <param-value>Basic realm="Hippo Repository Webdav Server"</param-value>
+    </init-param>
+    <init-param>
+      <param-name>resource-path-prefix</param-name>
+      <param-value>/server</param-value>
+    </init-param>
+    <load-on-startup>6</load-on-startup>
+  </servlet>
+ 
   <servlet-mapping>
     <servlet-name>StatusServlet</servlet-name>
     <url-pattern>/status/*</url-pattern>
@@ -155,6 +182,14 @@
     <url-pattern>/ping/</url-pattern> 
   </servlet-mapping> 
 
+  <!--
+    JCR over WebDAV Server Servlet Mapping:
+  -->
+  <servlet-mapping>
+    <servlet-name>JCRWebdavServer</servlet-name>
+    <url-pattern>/server/*</url-pattern>
+  </servlet-mapping>
+
   <!-- Timeout in minutes -->
   <session-config>
     <session-timeout>60</session-timeout>
Index: import-admin/pom.xml
===================================================================
--- import-admin/pom.xml	(revision 545)
+++ import-admin/pom.xml	(working copy)
@@ -14,11 +14,23 @@
   <packaging>war</packaging>
 
   <dependencies>
+
     <dependency>
       <groupId>org.onehippo.forge.import-tool</groupId>
       <artifactId>import-tool-import-components</artifactId>
       <version>${import-tool.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr2dav</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.onehippo.forge.hipporepojcrdav</groupId>
+      <artifactId>hipporepojcrdav-connector</artifactId>
+    </dependency>
+
   </dependencies>
 
   <build>
Index: import-admin/src/main/webapp/META-INF/context.xml
===================================================================
--- import-admin/src/main/webapp/META-INF/context.xml	(revision 0)
+++ import-admin/src/main/webapp/META-INF/context.xml	(revision 0)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2012 Hippo B.V.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<Context>
+
+  <Resource name="jcr/davexRepository" auth="Container"
+            type="org.onehippo.forge.repository.connector.remoting.davex.HippoJcrRepository"
+            factory="org.onehippo.forge.repository.connector.remoting.davex.DavExHippoRepositoryBasedHippoJcrRepositoryFactory"
+            repositoryAddress="http://localhost:8080/cms/server" />
+
+</Context>
Index: import-admin/src/main/webapp/WEB-INF/web.xml
===================================================================
--- import-admin/src/main/webapp/WEB-INF/web.xml	(revision 545)
+++ import-admin/src/main/webapp/WEB-INF/web.xml	(working copy)
@@ -40,4 +40,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
+  <resource-ref>
+    <description>JCR Repository</description>
+    <res-ref-name>jcr/davexRepository</res-ref-name>
+    <res-type>org.onehippo.forge.repository.connector.remoting.davex.HippoJcrRepository</res-type>
+    <res-auth>Container</res-auth>
+  </resource-ref>
+
 </web-app>
Index: import-admin/src/main/webapp/WEB-INF/import-applications/example1.properties
===================================================================
--- import-admin/src/main/webapp/WEB-INF/import-applications/example1.properties	(revision 545)
+++ import-admin/src/main/webapp/WEB-INF/import-applications/example1.properties	(working copy)
@@ -13,7 +13,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import.repository.address = vm://
+
+# Hippo Repository Connection can be 
+# either VM local connection (vm://...)
+# or RMI remote connection (rmi://...)
+# or HTTP/WebDAV remote connection (http://...) through JNDI (see context.xml)
+#import.repository.address = vm://
+#import.repository.address = rmi://localhost:1099/hipporepository
+import.repository.address = java:comp/env/jcr/davexRepository
+
 import.repository.username = admin
 import.repository.password = admin
 import.signal.inbox = ${catalina.base}/webapps/import-admin/WEB-INF/import-inbox
Index: import-admin/src/main/webapp/WEB-INF/import-applications/example2.properties
===================================================================
--- import-admin/src/main/webapp/WEB-INF/import-applications/example2.properties	(revision 545)
+++ import-admin/src/main/webapp/WEB-INF/import-applications/example2.properties	(working copy)
@@ -13,7 +13,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import.repository.address = vm://
+
+# Hippo Repository Connection can be 
+# either VM local connection (vm://...)
+# or RMI remote connection (rmi://...)
+# or HTTP/WebDAV remote connection (http://...) through JNDI (see context.xml)
+#import.repository.address = vm://
+#import.repository.address = rmi://localhost:1099/hipporepository
+import.repository.address = java:comp/env/jcr/davexRepository
+
 import.repository.username = admin
 import.repository.password = admin
 import.signal.inbox = ${catalina.base}/webapps/import-admin/WEB-INF/import-inbox