From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 30 Apr 2010 08:48:27 +0000 (+0000)
Subject: Split server Jackrabbit into JCR
X-Git-Tag: argeo-commons-2.1.30~1614
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=abbefc44ecea7b7a659569116deb7520dd365b03;p=lgpl%2Fargeo-commons.git

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 cdc8b640f..bd795529f 100644
--- 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 65063e040..5810443ef 100644
--- 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
index d40c4650a..000000000
--- 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"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
-
-	<bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider"
-		init-method="init">
-		<property name="defaultNodeMapper" ref="nodeMapper" />
-		<property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" />
-	</bean>
-
-	<bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper">
-	</bean>
-
-	<bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">
-	</bean>
-
-	<bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"
-		factory-method="login" destroy-method="logout">
-		<constructor-arg>
-			<bean class="javax.jcr.SimpleCredentials">
-				<constructor-arg value="demo" />
-				<constructor-arg value="demo" />
-			</bean>
-		</constructor-arg>
-	</bean>
-
-	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.server.jackrabbit.JackrabbitContainer">
-		<property name="homeDirectory" value="${java.io.tmpdir}/jackrabbit-slc-unit" />
-		<property name="configuration"
-			value="classpath:/org/argeo/server/jcr/repository-inMemory.xml" />
-	</bean>
-
-</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
index d980f8bd1..000000000
--- 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>