From 70f329fac0fd2170ecf455d77eb7ad2f0c6d0350 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 10 Feb 2012 18:44:36 +0000
Subject: [PATCH] Separate repo repos_java

git-svn-id: https://svn.argeo.org/slc/trunk@5042 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/jcr.xml                   |  2 +-
 .../META-INF/spring/osgi.xml                  |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +
 .../META-INF/spring/jcr.xml                   | 16 ++++
 .../META-INF/spring/repo-osgi.xml             |  9 ++-
 .../META-INF/spring/services.xml              | 11 ++-
 .../build.properties                          |  4 +-
 .../org.argeo.slc.server.repo/repo.properties |  0
 .../repository-h2.xml                         | 78 +++++++++++++++++++
 .../org/argeo/slc/repo/RepoConstants.java     |  6 +-
 .../java/org/argeo/slc/repo/RepoImpl.java     |  7 ++
 11 files changed, 130 insertions(+), 9 deletions(-)
 create mode 100644 modules/server/org.argeo.slc.server.repo/repo.properties
 create mode 100644 modules/server/org.argeo.slc.server.repo/repository-h2.xml

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
index e92d2fd85..7c316cd8e 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/jcr.xml
@@ -6,6 +6,6 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<bean id="slcSession" class="org.argeo.jcr.spring.ThreadBoundSession">
-		<property name="repository" ref="slcRepository" />
+		<property name="repository" ref="javaRepository" />
 	</bean>
 </beans>
diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
index 0b82c900f..1a6b47471 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml
@@ -8,6 +8,6 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	osgi:default-timeout="30000">
 
-	<reference id="slcRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=slc)" />
+	<reference id="javaRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=repos_java)" />
 </beans:beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
index e20ff6597..bbcba69bb 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
@@ -10,9 +10,11 @@ Import-Package: javax.jcr;version="2.0.0",
  org.argeo.security.jcr,
  org.argeo.slc.aether,
  org.argeo.slc.aether.spring,
+ org.argeo.slc.jcr,
  org.argeo.slc.repo,
  org.argeo.slc.repo.maven,
  org.argeo.slc.repo.maven.proxy,
  org.h2;resolution:=optional,
  org.sonatype.aether;version="1.9.0",
+ org.springframework.beans.factory.config;version="2.5.6.SEC01",
  org.springframework.security;version="2.0.6.RELEASE"
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
index 27566c82a..25ad02fa6 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
@@ -6,4 +6,20 @@
 	<bean id="jcrSession" class="org.argeo.security.jcr.SecureThreadBoundSession">
 		<property name="repository" ref="jcrRepository" />
 	</bean>
+
+	<bean id="jcrRepository" class="org.argeo.jackrabbit.JackrabbitContainer"
+		init-method="init" destroy-method="destroy">
+		<property name="homeDirectory" value="${osgi.instance.area}/repos/java" />
+		<property name="configuration" value="osgibundle:repository-h2.xml" />
+		<property name="variables" value="osgibundle:/repo.properties" />
+		<property name="cndFiles">
+			<list>
+				<value>/org/argeo/jcr/argeo.cnd</value>
+				<value>/org/argeo/slc/jcr/slc.cnd</value>
+				<value>/org/argeo/slc/repo/repo.cnd</value>
+			</list>
+		</property>
+		<property name="bundleContext" ref="bundleContext" />
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index bd143cfde..5e3d4ce9f 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -12,8 +12,13 @@
 	<!-- Security -->
 	<reference id="authenticationManager"
 		interface="org.springframework.security.AuthenticationManager" />
-	<reference id="jcrRepository" interface="javax.jcr.Repository"
-		filter="(argeo.jcr.repository.alias=slc)" />
+<!-- 	<reference id="jcrRepository" interface="javax.jcr.Repository" -->
+<!-- 		filter="(argeo.jcr.repository.alias=slc)" /> -->
+	<service ref="jcrRepository" interface="javax.jcr.Repository">
+		<service-properties>
+			<beans:entry key="argeo.jcr.repository.alias" value="repos_java" />
+		</service-properties>
+	</service>
 
 	<!-- Maven -->
 <!-- 	<reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem" -->
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/services.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/services.xml
index 173414f8e..206b6d41e 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/services.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/services.xml
@@ -7,7 +7,16 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	">
 
-	<bean id="repo" class="org.argeo.slc.repo.RepoImpl" init-method="init" destroy-method="destroy">
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="locations">
+			<value>osgibundle:repo.properties</value>
+		</property>
+	</bean>
+
+	<bean id="repo" class="org.argeo.slc.repo.RepoImpl" init-method="init"
+		destroy-method="destroy">
 		<property name="jcrRepository" ref="jcrRepository" />
 		<property name="nodeIndexers">
 			<list>
diff --git a/modules/server/org.argeo.slc.server.repo/build.properties b/modules/server/org.argeo.slc.server.repo/build.properties
index 5f22cdd44..ba1e43a1f 100644
--- a/modules/server/org.argeo.slc.server.repo/build.properties
+++ b/modules/server/org.argeo.slc.server.repo/build.properties
@@ -1 +1,3 @@
-bin.includes = META-INF/
+bin.includes = META-INF/,\
+               repo.properties,\
+               repository-h2.xml
diff --git a/modules/server/org.argeo.slc.server.repo/repo.properties b/modules/server/org.argeo.slc.server.repo/repo.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/server/org.argeo.slc.server.repo/repository-h2.xml b/modules/server/org.argeo.slc.server.repo/repository-h2.xml
new file mode 100644
index 000000000..2f5c774d5
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.repo/repository-h2.xml
@@ -0,0 +1,78 @@
+<?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.h2.Driver" />
+			<param name="url" value="jdbc:h2:${rep.home}/h2/repository" />
+			<param name="user" value="sa" />
+			<param name="password" value="" />
+			<param name="databaseType" value="h2" />
+			<param name="maxPoolSize" value="30" />
+		</DataSource>
+	</DataSources>
+
+	<!-- File system and datastore -->
+	<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+		<param name="dataSourceName" value="dataSource" />
+		<param name="schema" value="default" />
+		<param name="schemaObjectPrefix" value="fs_" />
+	</FileSystem>
+	<DataStore class="org.apache.jackrabbit.core.data.FileDataStore" />
+	<!-- <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="main" />
+	<Workspace name="${wsp.name}">
+		<FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+			<param name="dataSourceName" value="dataSource" />
+			<param name="schema" value="default" />
+			<param name="schemaObjectPrefix" value="${wsp.name}_fs_" />
+		</FileSystem>
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+			<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="default" />
+			<param name="schemaObjectPrefix" value="fs_ver_" />
+		</FileSystem>
+		<PersistenceManager
+			class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+			<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.argeo.security.jackrabbit.ArgeoSecurityManager"
+			workspaceName="security">
+		</SecurityManager>
+		<AccessManager class="org.argeo.security.jackrabbit.ArgeoAccessManager">
+		</AccessManager>
+		<LoginModule class="org.argeo.security.jackrabbit.ArgeoLoginModule">
+		</LoginModule>
+	</Security>
+</Repository>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java
index 6a0282828..e304907e2 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java
@@ -2,6 +2,8 @@ package org.argeo.slc.repo;
 
 /** SLC repository constants */
 public interface RepoConstants {
-	public final static String ARTIFACTS_BASE_PATH = "/repo";
-	public final static String PROXIED_REPOSITORIES = "/slc/repo/sources";
+	public final static String ARTIFACTS_BASE_PATH = "/";
+	public final static String REPO_BASEPATH = "/slc:repo";
+	public final static String PROXIED_REPOSITORIES = REPO_BASEPATH
+			+ "/slc:sources";
 }
diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java
index 9951b33ba..b2c8fc011 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java
@@ -1,6 +1,7 @@
 package org.argeo.slc.repo;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.jcr.Node;
@@ -35,6 +36,12 @@ public class RepoImpl {
 					.addEventListener(artifactListener, Event.NODE_ADDED,
 							RepoConstants.ARTIFACTS_BASE_PATH, true, null,
 							null, true);
+			// localrepo
+			String localrepoWorkspace = "localrepo";
+			if (!Arrays.asList(
+					adminSession.getWorkspace().getAccessibleWorkspaceNames())
+					.contains(localrepoWorkspace))
+				adminSession.getWorkspace().createWorkspace(localrepoWorkspace);
 		} catch (RepositoryException e) {
 			throw new SlcException("Cannot initialize repository backend", e);
 		}
-- 
2.39.2