Split server Jackrabbit into JCR

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

diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
index cdc8b640fddb31aa3bb73c18b3bf542760cbafe1..bd795529fc32a6063267d869ce2f788d30ffc3b6 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/MapperTest.java
@@ -33,7 +33,7 @@ public class MapperTest extends AbstractJcrTestCase {
 
        protected File getRepositoryFile() throws Exception {
                Resource res = new ClassPathResource(
-                               "org/argeo/server/jcr/repository-inMemory.xml");
+                               "org/argeo/server/jcr/repository.xml");
                return res.getFile();
        }
 

diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
index 65063e040faa29a0df7e18331a71eb4c13229752..5810443ef6f709cef96b363fe7ea15c69cc15df2 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/server/jcr/JcrResourceAdapterTest.java
@@ -6,8 +6,6 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
 
-import javax.jcr.SimpleCredentials;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -77,13 +75,12 @@ public class JcrResourceAdapterTest extends AbstractJcrTestCase {
        protected void setUp() throws Exception {
                super.setUp();
                jra = new JcrResourceAdapter();
-               jra.setSession(getRepository().login(
-                               new SimpleCredentials("demo", "demo".toCharArray())));
+               jra.setSession(session());
        }
 
        protected File getRepositoryFile() throws Exception {
                Resource res = new ClassPathResource(
-                               "org/argeo/server/jcr/repository-inMemory.xml");
+                               "org/argeo/server/jcr/repository.xml");
                return res.getFile();
        }
 

diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/applicationContext.xml b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/applicationContext.xml
deleted file mode 100644 (file)
index d40c465..0000000
--- a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/applicationContext.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />\r
-               <property name="ignoreUnresolvablePlaceholders" value="true" />\r
-       </bean>\r
-\r
-       <bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider"\r
-               init-method="init">\r
-               <property name="defaultNodeMapper" ref="nodeMapper" />\r
-               <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" />\r
-       </bean>\r
-\r
-       <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper">\r
-       </bean>\r
-\r
-       <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">\r
-       </bean>\r
-\r
-       <bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"\r
-               factory-method="login" destroy-method="logout">\r
-               <constructor-arg>\r
-                       <bean class="javax.jcr.SimpleCredentials">\r
-                               <constructor-arg value="demo" />\r
-                               <constructor-arg value="demo" />\r
-                       </bean>\r
-               </constructor-arg>\r
-       </bean>\r
-\r
-       <bean id="argeo.jcr.repository.inMemory" class="org.argeo.server.jackrabbit.JackrabbitContainer">\r
-               <property name="homeDirectory" value="${java.io.tmpdir}/jackrabbit-slc-unit" />\r
-               <property name="configuration"\r
-                       value="classpath:/org/argeo/server/jcr/repository-inMemory.xml" />\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml b/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml
deleted file mode 100644 (file)
index d980f8b..0000000
--- a/server/runtime/org.argeo.server.jcr/src/test/resources/org/argeo/server/jcr/repository-inMemory.xml
+++ /dev/null
@@ -1,152 +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: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>