From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 29 Apr 2010 14:32:06 +0000 (+0000)
Subject: Introduce a separate bundle for Jackrabbit repository definition
X-Git-Tag: argeo-slc-2.1.7~1320
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=877b768d5ede3bf216575db3551b1b9abfcf18df;p=gpl%2Fargeo-slc.git

Introduce a separate bundle for Jackrabbit repository definition

git-svn-id: https://svn.argeo.org/slc/trunk@3534 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/server_jcr.properties b/demo/server_jcr.properties
index 800ab8ed4..0fd3bd94e 100644
--- a/demo/server_jcr.properties
+++ b/demo/server_jcr.properties
@@ -1,6 +1,7 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
 org.argeo.server.ads.server,\
+org.argeo.slc.server.jackrabbit.derby,\
 org.argeo.slc.server.jcr,\
 org.argeo.slc.server.main,\
 org.argeo.slc.ria
diff --git a/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/MANIFEST.MF
index 809862a0a..e6139580e 100644
--- a/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/MANIFEST.MF
@@ -4,3 +4,5 @@ Bundle-Name: Jackrabbit JCR Repository Derby
 Bundle-SymbolicName: org.argeo.slc.server.jackrabbit.derby
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Argeo
+Import-Package: javax.jcr;version="1.0.0",
+ org.argeo.server.jackrabbit;version="0.1.3.SNAPSHOT-r3516"
diff --git a/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/spring/jcrrepository-osgi.xml b/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/spring/jcrrepository-osgi.xml
index 84164f160..5144d37ee 100644
--- a/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/spring/jcrrepository-osgi.xml
+++ b/modules/server/org.argeo.slc.server.jackrabbit.derby/META-INF/spring/jcrrepository-osgi.xml
@@ -6,5 +6,5 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<service interface="javax.jcr.repository" ref="jcrRepository" />
+	<service interface="javax.jcr.Repository" ref="jcrRepository" />
 </beans:beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
index 4202e84ad..d50efa288 100644
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-SymbolicName: org.argeo.slc.server.jcr
 Bundle-Name: Server JCR
 Import-Package: javax.jcr,
  org.argeo.jcr,
- org.argeo.server.jackrabbit,
  org.argeo.server.jcr;specification-version="0.1.3.SNAPSHOT-r3478",
  org.argeo.server.jcr.mvc;specification-version="0.1.3.SNAPSHOT-r3478",
  org.argeo.slc.core.attachment,
diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml
index 7327e466f..ccb910c93 100644
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml
@@ -6,6 +6,8 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+	<reference id="jcrRepository" interface="javax.jcr.Repository" />
+
 	<service interface="org.argeo.slc.dao.process.SlcExecutionDao"
 		ref="slcExecutionDao" />
 	<service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
index 4960138de..3286d73ca 100644
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
@@ -78,10 +78,4 @@
 		class="org.argeo.jcr.ThreadBoundJcrSessionFactory">
 		<property name="repository" ref="jcrRepository" />
 	</bean>
-
-	<bean id="jcrRepository" class="org.argeo.server.jackrabbit.JackrabbitContainer">
-		<property name="homeDirectory" value="${argeo.osgi.data.dir}/jackrabbit" />
-		<property name="configuration" value="osgibundle:/repository.xml" />
-	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/modules/server/org.argeo.slc.server.jcr/repository.xml b/modules/server/org.argeo.slc.server.jcr/repository.xml
deleted file mode 100644
index fad0835b0..000000000
--- a/modules/server/org.argeo.slc.server.jcr/repository.xml
+++ /dev/null
@@ -1,150 +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.springframework.security.providers.jaas.SecurityContextLoginModule">
-			<!--
-				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:memory:db;create=true" />
-			-->
-			<param name="url" value="jdbc:derby:${wsp.home}/db;create=true" />
-			<param name="driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-			<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:memory:version;create=true" />
-			-->
-			<param name="url" value="jdbc:derby:${rep.home}/version/db;create=true" />
-			<param name="driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-			<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>