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 800ab8ed48b39930f7c0e8ecc2ba8238c222c71d..0fd3bd94ed3732502bc224da6efa358a6fc52a1b 100644 (file)
--- 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 809862a0a3248fa25f84256522d2bd143df47835..e6139580e2db48a9c156010cc5a92c2c0d18eba2 100644 (file)
--- 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 84164f160baae4aa8d7e0963b02c8cbe8edfb4ee..5144d37eea4ae5b67fcc53ea37ca7c6dcea3d491 100644 (file)
--- 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   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <service interface="javax.jcr.repository" ref="jcrRepository" />\r
+       <service interface="javax.jcr.Repository" ref="jcrRepository" />\r
 </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 4202e84adf8c0025ad640de2ce8474caf5338cb7..d50efa2887c7d63070fa845dd2297d3fdecb2723 100644 (file)
--- 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 7327e466fde6189e7ddc3a2051461ca8d08fd1a0..ccb910c93e77163699ed5b8761ca9cb2fc4495aa 100644 (file)
--- 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   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
+       <reference id="jcrRepository" interface="javax.jcr.Repository" />\r
+\r
        <service interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
                ref="slcExecutionDao" />\r
        <service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r

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 4960138de7df1edf66e47e65131c29db3e61ae62..3286d73ca063c120d8be7dba8c1b552caf90bdbb 100644 (file)
--- 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">\r
                <property name="repository" ref="jcrRepository" />\r
        </bean>\r
-\r
-       <bean id="jcrRepository" class="org.argeo.server.jackrabbit.JackrabbitContainer">\r
-               <property name="homeDirectory" value="${argeo.osgi.data.dir}/jackrabbit" />\r
-               <property name="configuration" value="osgibundle:/repository.xml" />\r
-       </bean>\r
-\r
 </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 (file)
index fad0835..0000000
--- 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>