From 0df1bdb87bb301067f1d0d18a6e0b1782b0fe7f4 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Feb 2011 11:39:53 +0000
Subject: [PATCH] Update Jackrabbit container package name

git-svn-id: https://svn.argeo.org/commons/trunk@4183 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../org.argeo.jcr.ui.explorer/plugin.xml      |  23 +--
 .../jcr/explorer/JcrExplorerPerspective.java  |   8 +-
 ...rActivator.java => JcrExplorerPlugin.java} |  24 ++-
 .../eclipse/spring/SpringCommandHandler.java  |   9 +-
 .../spring/SpringExtensionFactory.java        |  14 +-
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../META-INF/spring/jackrabbit-osgi.xml       |   2 +-
 .../META-INF/spring/jackrabbit.xml            |  25 +--
 .../jackrabbit.properties                     |   1 -
 .../localrepo.properties                      |   1 +
 .../repository-h2.xml                         |  64 +++++++
 .../repository-postgresql.xml                 |  86 +++++++++
 .../repository.xml                            | 167 ------------------
 .../META-INF/MANIFEST.MF                      |   2 +-
 .../jackrabbit/JackrabbitContainer.java       |   7 +-
 .../webdav/CachingSessionProvider.java        |   2 +-
 .../webdav/ExtendedDispatcherServlet.java     |   2 +-
 .../jackrabbit/webdav/JcrRemotingServlet.java |   2 +-
 .../MultipleRepositoryHandlerMapping.java     |   2 +-
 .../jackrabbit/webdav/WebDavServlet.java      |   2 +-
 .../runtime/org.argeo.server.jcr/.classpath   |   1 +
 .../main/resources/org/argeo/jcr/argeo.cnd    |   9 +
 23 files changed, 231 insertions(+), 226 deletions(-)
 rename eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/{JcrExplorerActivator.java => JcrExplorerPlugin.java} (57%)
 delete mode 100644 server/modules/org.argeo.server.jackrabbit.repo/jackrabbit.properties
 create mode 100644 server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties
 create mode 100644 server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml
 create mode 100644 server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml
 delete mode 100644 server/modules/org.argeo.server.jackrabbit.repo/repository.xml
 rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/{server => }/jackrabbit/JackrabbitContainer.java (97%)
 rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/{server => }/jackrabbit/webdav/CachingSessionProvider.java (97%)
 rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/{server => }/jackrabbit/webdav/ExtendedDispatcherServlet.java (97%)
 rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/{server => }/jackrabbit/webdav/JcrRemotingServlet.java (93%)
 rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/{server => }/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java (99%)
 rename server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/{server => }/jackrabbit/webdav/WebDavServlet.java (98%)
 create mode 100644 server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd

diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF
index 9c645c921..3b162fa67 100644
--- a/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: JCR Explorer
 Bundle-SymbolicName: org.argeo.jcr.ui.explorer;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.argeo.eclipse.ui.jcr.explorer.JcrExplorerActivator
+Bundle-Activator: org.argeo.eclipse.ui.jcr.explorer.JcrExplorerPlugin
 Bundle-Vendor: Argeo
 Require-Bundle: org.eclipse.ui;resolution:=optional,
  org.eclipse.core.runtime
diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/plugin.xml b/eclipse/plugins/org.argeo.jcr.ui.explorer/plugin.xml
index 8b3957cf8..578166569 100644
--- a/eclipse/plugins/org.argeo.jcr.ui.explorer/plugin.xml
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/plugin.xml
@@ -1,23 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="jcrExplorerPerspective">
-         <view
-               relative="upperLeft"
-               relationship="stack"
-               id="browserView">
-         </view>
-      </perspectiveExtension>
-   </extension>
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
             class="org.argeo.eclipse.ui.jcr.explorer.JcrExplorerPerspective"
             icon="icons/nodes.gif"
-            id="jcrExplorerPerspective"
+            id="org.argeo.jcr.ui.explorer.perspective"
             name="JCR Explorer">
       </perspective>
    </extension>
@@ -25,15 +14,15 @@
          point="org.eclipse.ui.views">
 	   <view
 	         class="org.argeo.eclipse.spring.SpringExtensionFactory"
-	         id="browserView"
-	         name="Browser">
+	         id="org.argeo.jcr.ui.explorer.browserView"
+	         name="JCR Browser">
 	   </view>
    </extension>
    <extension
            point="org.eclipse.ui.editors">
 	     <editor
 	          class="org.argeo.eclipse.spring.SpringExtensionFactory"
-              id="genericJcrQueryEditor"
+              id="org.argeo.jcr.ui.explorer.genericJcrQueryEditor"
               name="JCR Query"
               icon="icons/nodes.gif"
               default="false">
@@ -43,7 +32,7 @@
          point="org.eclipse.ui.commands">
 		<command
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-            id="openGenericJcrQueryEditor"
+            id="org.argeo.jcr.ui.explorer.openGenericJcrQueryEditor"
             name="OpenGenericJcrQueryEditor ">
     	</command>
     </extension>
@@ -58,7 +47,7 @@
               mnemonic="Queries"
               id="queryMenu">
                 <command
-                      commandId="openGenericJcrQueryEditor"
+                      commandId="org.argeo.jcr.ui.explorer.openGenericJcrQueryEditor"
                       disabledIcon="icons/saveDisabled.gif"
                       icon="icons/results.gif"
                       label="JCR Query"
diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPerspective.java b/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPerspective.java
index cdce20e59..020bf06ae 100644
--- a/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPerspective.java
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPerspective.java
@@ -5,13 +5,15 @@ import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
 public class JcrExplorerPerspective implements IPerspectiveFactory {
+	public static String BROWSER_VIEW_ID = JcrExplorerPlugin.ID
+			+ ".browserView";
 
 	public void createInitialLayout(IPageLayout layout) {
 		layout.setEditorAreaVisible(true);
 
-		IFolderLayout main = layout.createFolder("upperLeft", IPageLayout.LEFT,
-				0.5f, layout.getEditorArea());
-
+		IFolderLayout upperLeft = layout.createFolder(JcrExplorerPlugin.ID
+				+ ".upperLeft", IPageLayout.LEFT, 0.4f, layout.getEditorArea());
+		upperLeft.addView(BROWSER_VIEW_ID);
 	}
 
 }
diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerActivator.java b/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPlugin.java
similarity index 57%
rename from eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerActivator.java
rename to eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPlugin.java
index 9a00a7024..5beb52a13 100644
--- a/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerActivator.java
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/eclipse/ui/jcr/explorer/JcrExplorerPlugin.java
@@ -6,23 +6,26 @@ import org.osgi.framework.BundleContext;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class JcrExplorerActivator extends AbstractUIPlugin {
+public class JcrExplorerPlugin extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.argeo.eclipse.ui.jcr.explorer"; //$NON-NLS-1$
+	public static final String ID = "org.argeo.jcr.ui.explorer"; //$NON-NLS-1$
 
 	// The shared instance
-	private static JcrExplorerActivator plugin;
-	
+	private static JcrExplorerPlugin plugin;
+
 	/**
 	 * The constructor
 	 */
-	public JcrExplorerActivator() {
+	public JcrExplorerPlugin() {
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 * 
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
+	 * )
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -31,7 +34,10 @@ public class JcrExplorerActivator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 * 
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+	 * )
 	 */
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
@@ -40,10 +46,10 @@ public class JcrExplorerActivator extends AbstractUIPlugin {
 
 	/**
 	 * Returns the shared instance
-	 *
+	 * 
 	 * @return the shared instance
 	 */
-	public static JcrExplorerActivator getDefault() {
+	public static JcrExplorerPlugin getDefault() {
 		return plugin;
 	}
 
diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java
index 0356f57d2..ce0521bda 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringCommandHandler.java
@@ -48,6 +48,13 @@ public class SpringCommandHandler implements IHandler {
 
 			// retrieve the command via its id
 			String beanName = event.getCommand().getId();
+
+			if (!applicationContext.containsBean(beanName)) {
+				if (beanName.startsWith(bundleSymbolicName))
+					beanName = beanName
+							.substring(bundleSymbolicName.length() + 1);
+			}
+
 			if (!applicationContext.containsBean(beanName))
 				throw new ExecutionException("No bean found with name "
 						+ beanName + " in bundle " + bundleSymbolicName);
@@ -62,7 +69,7 @@ public class SpringCommandHandler implements IHandler {
 			return handler.execute(event);
 		} catch (Exception e) {
 			// TODO: use eclipse error management
-//			log.error(e);
+			// log.error(e);
 			throw new ExecutionException("Cannot execute Spring command "
 					+ commandId + " in bundle " + bundleSymbolicName, e);
 		}
diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java
index f20e1d124..aa0295d56 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java
@@ -63,9 +63,9 @@ public class SpringExtensionFactory implements IExecutableExtensionFactory,
 	public void setInitializationData(IConfigurationElement config,
 			String propertyName, Object data) throws CoreException {
 		String bundleSymbolicName = config.getContributor().getName();
-		ApplicationContext appContext = ApplicationContextTracker
+		ApplicationContext applicationContext = ApplicationContextTracker
 				.getApplicationContext(bundleSymbolicName);
-		if (appContext == null)
+		if (applicationContext == null)
 			throw new ArgeoException(
 					"Cannot find application context for bundle "
 							+ bundleSymbolicName);
@@ -75,7 +75,15 @@ public class SpringExtensionFactory implements IExecutableExtensionFactory,
 			throw new ArgeoException("Cannot find bean name for extension "
 					+ config);
 
-		this.bean = appContext.getBean(beanName);
+		if (!applicationContext.containsBean(beanName)) {
+			if (beanName.startsWith(bundleSymbolicName))
+				beanName = beanName.substring(bundleSymbolicName.length() + 1);
+		}
+
+		if (!applicationContext.containsBean(beanName))
+			throw new ArgeoException("No bean with name '" + beanName + "'");
+
+		this.bean = applicationContext.getBean(beanName);
 		if (this.bean instanceof IExecutableExtension) {
 			((IExecutableExtension) this.bean).setInitializationData(config,
 					propertyName, data);
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
index 9a48e044c..a7181d1b7 100644
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Import-Package: javax.jcr,
  org.apache.jackrabbit.core.config,
  org.apache.lucene.util;version="2.4.1",
  org.apache.xalan.processor,
- org.argeo.server.jackrabbit,
+ org.argeo.jackrabbit,
  org.springframework.beans.factory.config
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml
index 8ad34c315..7a3c71ad5 100644
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml
+++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml
@@ -8,7 +8,7 @@
 
 	<service ref="remoteJcrRepository" interface="javax.jcr.Repository">
 		<service-properties>
-			<beans:entry key="argeo.jcr.repository.name" value="remote_repo" />
+			<beans:entry key="argeo.jcr.repository.name" value="local" />
 		</service-properties>
 	</service>
 
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
index d6ef7ec88..0ac070e02 100644
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
+++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
@@ -12,18 +12,21 @@
 		</property>
 	</bean>
 
-	<bean id="remoteJcrRepository" class="org.argeo.server.jackrabbit.JackrabbitContainer">
+	<bean id="localJcrRepository" class="org.argeo.jackrabbit.JackrabbitContainer">
 		<property name="uri"
 			value="http://localhost:7070/org.argeo.server.jcr.webapp/remoting/repo" />
-<!--		<property name="namespaces">-->
-<!--			<map>-->
-<!--				<entry key="slc" value="http://www.argeo.org/slc" />-->
-<!--			</map>-->
-<!--		</property>-->
-<!--		<property name="cndFiles">-->
-<!--			<list>-->
-<!--				<value>classpath:/org/argeo/slc/repo/repo.cnd</value>-->
-<!--			</list>-->
-<!--		</property>-->
+		<property name="homeDirectory" value="${slc.jackrabbit.home}" />
+		<property name="configuration" value="${slc.jackrabbit.configuration}" />
+		<property name="variables" value="osgibundle:/jackrabbit.properties" />
+		<property name="namespaces">
+			<map>
+				<entry key="argeo" value="http://www.argeo.org/argeo" />
+			</map>
+		</property>
+		<property name="cndFiles">
+			<list>
+				<value>classpath:/org/argeo/jcr/argeo.cnd</value>
+			</list>
+		</property>
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/jackrabbit.properties b/server/modules/org.argeo.server.jackrabbit.repo/jackrabbit.properties
deleted file mode 100644
index 41eab59bf..000000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/jackrabbit.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.jackrabbit.repo.configuration=osgibundle:repository.xml
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties b/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties
new file mode 100644
index 000000000..c046ca46d
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties
@@ -0,0 +1 @@
+argeo.localrepo.configuration=osgibundle:repository.xml
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml b/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml
new file mode 100644
index 000000000..7b1d3bf24
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<Repository>
+	<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+		<param name="path" value="${rep.home}/repository" />
+	</FileSystem>
+
+	<Security appName="Jackrabbit">
+		<SecurityManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+			workspaceName="security">
+		</SecurityManager>
+		<AccessManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+			<!-- <param name="config" value="${rep.home}/access.xml"/> -->
+		</AccessManager>
+
+		<LoginModule
+			class="org.springframework.security.providers.jaas.SecurityContextLoginModule">
+		</LoginModule>
+<!--		<LoginModule-->
+<!--			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">-->
+<!--			<param name="anonymousId" value="anonymous" />-->
+<!--			<param name="adminId" value="admin" />-->
+<!--		</LoginModule>-->
+	</Security>
+
+	<Workspaces rootPath="${rep.home}/workspaces"
+		defaultWorkspace="default" />
+
+	<Workspace name="${wsp.name}">
+		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+			<param name="path" value="${wsp.home}" />
+		</FileSystem>
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+			<param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_db" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_" />
+		</PersistenceManager>
+		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+			<param name="path" value="${wsp.home}/index" />
+			<param name="extractorPoolSize" value="2" />
+			<param name="supportHighlighting" value="true" />
+		</SearchIndex>
+	</Workspace>
+
+	<Versioning rootPath="${rep.home}/version">
+		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+			<param name="path" value="${rep.home}/version" />
+		</FileSystem>
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+			<param name="url" value="jdbc:h2:file:${rep.home}/h2/sebi_version" />
+			<param name="schemaObjectPrefix" value="version_" />
+		</PersistenceManager>
+	</Versioning>
+
+	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+		<param name="path" value="${rep.home}/repository/index" />
+		<param name="extractorPoolSize" value="2" />
+		<param name="supportHighlighting" value="true" />
+	</SearchIndex>
+</Repository>
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml b/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml
new file mode 100644
index 000000000..9f95adf5e
--- /dev/null
+++ b/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<Repository>
+	<!-- Shared datasource -->
+	<DataSources>
+		<DataSource name="dataSource">
+			<param name="driver" value="org.postgresql.Driver" />
+			<param name="url" value="${slc.jackrabbit.dburl}" />
+			<param name="user" value="${slc.jackrabbit.dbuser}" />
+			<param name="password" value="${slc.jackrabbit.dbpassword}" />
+			<param name="databaseType" value="postgresql" />
+			<param name="maxPoolSize" value="10" />
+		</DataSource>
+	</DataSources>
+
+	<!-- File system and datastore -->
+	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+		<param name="dataSourceName" value="dataSource" />
+		<param name="schema" value="postgresql" />
+		<param name="schemaObjectPrefix" value="fs_" />
+	</FileSystem>
+	<DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">
+		<param name="dataSourceName" value="dataSource" />
+		<param name="schemaObjectPrefix" value="ds_" />
+	</DataStore>
+
+	<!-- Workspace templates -->
+	<Workspaces rootPath="${rep.home}/workspaces"
+		defaultWorkspace="default" />
+	<Workspace name="${wsp.name}">
+		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+			<param name="dataSourceName" value="dataSource" />
+			<param name="schema" value="postgresql" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+		</FileSystem>
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
+			<param name="dataSourceName" value="dataSource" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_pm_" />
+		</PersistenceManager>
+		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+			<param name="path" value="${wsp.home}/index" />
+		</SearchIndex>
+	</Workspace>
+
+	<!-- Versioning -->
+	<Versioning rootPath="${rep.home}/version">
+		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+			<param name="dataSourceName" value="dataSource" />
+			<param name="schema" value="postgresql" />
+			<param name="schemaObjectPrefix" value="fs_ver_" />
+		</FileSystem>
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
+			<param name="dataSourceName" value="dataSource" />
+			<param name="schemaObjectPrefix" value="pm_ver_" />
+		</PersistenceManager>
+	</Versioning>
+
+	<!-- Indexing -->
+	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+		<param name="path" value="${rep.home}/repository/index" />
+		<param name="extractorPoolSize" value="2" />
+		<param name="supportHighlighting" value="true" />
+	</SearchIndex>
+
+	<!-- Security -->
+	<Security appName="Jackrabbit">
+		<SecurityManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+			workspaceName="security">
+		</SecurityManager>
+		<AccessManager
+			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+		</AccessManager>
+<!--		 <LoginModule -->
+<!--		 class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> -->
+<!--		 </LoginModule> -->
+		<LoginModule
+			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+			<param name="anonymousId" value="anonymous" />
+			<param name="adminId" value="admin" />
+		</LoginModule>
+	</Security>
+</Repository>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository.xml b/server/modules/org.argeo.server.jackrabbit.repo/repository.xml
deleted file mode 100644
index abc40bba2..000000000
--- a/server/modules/org.argeo.server.jackrabbit.repo/repository.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>
-	<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to You 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.
-	-->
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
-	<!--
-		Example Repository Configuration File Used by -
-		org.apache.jackrabbit.core.config.RepositoryConfigTest.java -
-	-->
-<Repository>
-	<!--
-		virtual file system where the repository stores global state (e.g.
-		registered namespaces, custom node types, etc.)
-	-->
-	<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-		<param name="path" value="${rep.home}/repository" />
-	</FileSystem>
-
-	<!--
-        security configuration
-    -->
-	<Security appName="Jackrabbit">
-		<!--
-			security manager: class: FQN of class implementing the
-			JackrabbitSecurityManager interface
-		-->
-		<SecurityManager
-			class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
-			workspaceName="security">
-			<!--
-				workspace access: class: FQN of class implementing the
-				WorkspaceAccessManager interface
-			-->
-			<!-- <WorkspaceAccessManager class="..."/> -->
-			<!-- <param name="config" value="${rep.home}/security.xml"/> -->
-		</SecurityManager>
-
-		<!--
-			access manager: class: FQN of class implementing the AccessManager
-			interface
-		-->
-		<AccessManager
-			class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
-			<!-- <param name="config" value="${rep.home}/access.xml"/> -->
-		</AccessManager>
-
-		<LoginModule
-			class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
-			<!--
-				anonymous user name ('anonymous' is the default value)
-			-->
-			<param name="anonymousId" value="anonymous" />
-			<!--
-				administrator user id (default value if param is missing is 'admin')
-			-->
-			<param name="adminId" value="admin" />
-		</LoginModule>
-	</Security>
-
-	<!--
-		location of workspaces root directory and name of default workspace
-	-->
-	<Workspaces rootPath="${rep.home}/workspaces"
-		defaultWorkspace="default" />
-	<!--
-		workspace configuration template: used to create the initial workspace
-		if there's no workspace yet
-	-->
-	<Workspace name="${wsp.name}">
-		<!--
-			virtual file system of the workspace: class: FQN of class
-			implementing the FileSystem interface
-		-->
-		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-			<param name="path" value="${wsp.home}" />
-		</FileSystem>
-		<!--
-			persistence manager of the workspace: class: FQN of class
-			implementing the PersistenceManager interface
-		-->
-		
-			<PersistenceManager
-			class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
-			<param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
-			<param name="schemaObjectPrefix" value="${wsp.name}_"/>
-			</PersistenceManager>
-		<!-- 
-		<PersistenceManager
-			class="org.apache.jackrabbit.core.persistence.bundle.BundleDbPersistenceManager">
-			<param name="url" value="jdbc:hsqldb:mem:db;create=true" />
-			<param name="driver" value="org.hsqldb.jdbcDriver" />
-			<param name="user" value="sa" />
-			<param name="password" value="password" />
-			<param name="schemaObjectPrefix" value="${wsp.name}_" />
-		</PersistenceManager>
-		 -->
-		<!--
-			Search index and the file system it uses. class: FQN of class
-			implementing the QueryHandler interface
-		-->
-		<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-			<param name="path" value="${wsp.home}/index" />
-			<param name="extractorPoolSize" value="2" />
-			<param name="supportHighlighting" value="true" />
-		</SearchIndex>
-	</Workspace>
-
-	<!--
-        Configures the versioning
-    -->
-	<Versioning rootPath="${rep.home}/version">
-		<!--
-			Configures the filesystem to use for versioning for the respective
-			persistence manager
-		-->
-		<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-			<param name="path" value="${rep.home}/version" />
-		</FileSystem>
-
-		<!--
-			Configures the persistence manager to be used for persisting version
-			state. Please note that the current versioning implementation is
-			based on a 'normal' persistence manager, but this could change in
-			future implementations.
-		-->
-		
-			<PersistenceManager
-			class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
-			<param name="url"
-			value="jdbc:derby:${rep.home}/version/db;create=true"/> <param
-			name="schemaObjectPrefix" value="version_"/> </PersistenceManager>
-		
-		<!-- 
-		<PersistenceManager
-			class="org.apache.jackrabbit.core.persistence.bundle.BundleDbPersistenceManager">
-			<param name="url" value="jdbc:hsqldb:mem:versions;create=true" />
-			<param name="driver" value="org.hsqldb.jdbcDriver" />
-			<param name="user" value="sa" />
-			<param name="password" value="password" />
-			<param name="schemaObjectPrefix" value="version_" />
-		</PersistenceManager>
-		 -->
-	</Versioning>
-
-	<!--
-		Search index for content that is shared repository wide (/jcr:system
-		tree, contains mainly versions)
-	-->
-	<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-		<param name="path" value="${rep.home}/repository/index" />
-		<param name="extractorPoolSize" value="2" />
-		<param name="supportHighlighting" value="true" />
-	</SearchIndex>
-</Repository>
diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF
index 828e95a14..f103c00f1 100644
--- a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Import-Package: javax.jcr,
  javax.servlet,
  javax.servlet.http,
  javax.servlet.resources,
+ org.argeo.jackrabbit.webdav,
  org.argeo.jcr,
- org.argeo.server.jackrabbit.webdav,
  org.springframework.osgi.web.context.support;version="1.2.1",
  org.springframework.security;version="2.0.6.RELEASE",
  org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
similarity index 97%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
index c828d703a..8b35d0b6f 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.argeo.server.jackrabbit;
+package org.argeo.jackrabbit;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -92,10 +92,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 			cnds.add(arr);
 		}
 
-		if (uri != null) {
-			// Thread.currentThread().setContextClassLoader(
-			// getClass().getClassLoader());
-			// repository = JcrUtils.getRepository(uri);
+		if (uri != null && !uri.trim().equals("")) {
 			Map<String, String> params = new HashMap<String, String>();
 			params.put(JcrUtils.REPOSITORY_URI, uri);
 			repository = new Jcr2davRepositoryFactory().getRepository(params);
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/CachingSessionProvider.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/CachingSessionProvider.java
similarity index 97%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/CachingSessionProvider.java
rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/CachingSessionProvider.java
index a8771ae68..05b5e86ef 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/CachingSessionProvider.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/CachingSessionProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.server.jackrabbit.webdav;
+package org.argeo.jackrabbit.webdav;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/ExtendedDispatcherServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/ExtendedDispatcherServlet.java
similarity index 97%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/ExtendedDispatcherServlet.java
rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/ExtendedDispatcherServlet.java
index 8c961c108..a40919e4f 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/ExtendedDispatcherServlet.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/ExtendedDispatcherServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.argeo.server.jackrabbit.webdav;
+package org.argeo.jackrabbit.webdav;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/JcrRemotingServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/JcrRemotingServlet.java
similarity index 93%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/JcrRemotingServlet.java
rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/JcrRemotingServlet.java
index add064b3f..0af669306 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/JcrRemotingServlet.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/JcrRemotingServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.server.jackrabbit.webdav;
+package org.argeo.jackrabbit.webdav;
 
 import javax.jcr.Repository;
 import javax.jcr.SimpleCredentials;
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java
similarity index 99%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java
rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java
index a8591dc5f..8e266a932 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/MultipleRepositoryHandlerMapping.java
@@ -1,4 +1,4 @@
-package org.argeo.server.jackrabbit.webdav;
+package org.argeo.jackrabbit.webdav;
 
 import java.util.Enumeration;
 import java.util.Properties;
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/WebDavServlet.java
similarity index 98%
rename from server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java
rename to server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/WebDavServlet.java
index 2ca729d5f..a9ed8ef7a 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/webdav/WebDavServlet.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/webdav/WebDavServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.argeo.server.jackrabbit.webdav;
+package org.argeo.jackrabbit.webdav;
 
 import java.io.IOException;
 
diff --git a/server/runtime/org.argeo.server.jcr/.classpath b/server/runtime/org.argeo.server.jcr/.classpath
index c9f26bd8e..762e65304 100644
--- a/server/runtime/org.argeo.server.jcr/.classpath
+++ b/server/runtime/org.argeo.server.jcr/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
diff --git a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
new file mode 100644
index 000000000..243951139
--- /dev/null
+++ b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
@@ -0,0 +1,9 @@
+<argeo = 'http://www.argeo.org/argeo'>
+
+// HOME DIRECTORIES
+[argeo:home] > nt:base, mix:created, mix:lastModified
++ * (argeo:userHome) *
+
+[argeo:userHome] > mix:created, mix:lastModified
+mixin
+- argeo:userId (STRING)
-- 
2.39.2