From 020fae4e85909a6288b73bf9b4dd5ada44965fec Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 8 Nov 2012 13:30:57 +0000
Subject: [PATCH] Move repository factory to node bundle

git-svn-id: https://svn.argeo.org/commons/trunk@5744 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/argeo_node_rcp.properties                       | 10 +---------
 demo/log4j.properties                                |  3 ++-
 security/dep/org.argeo.security.dep.node/pom.xml     |  5 -----
 .../META-INF/spring/noderepo-osgi.xml                |  8 ++++++++
 .../META-INF/spring/noderepo.xml                     |  5 +++++
 .../META-INF/spring/repofactory-osgi.xml             | 12 ++++++------
 server/modules/pom.xml                               |  1 -
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/demo/argeo_node_rcp.properties b/demo/argeo_node_rcp.properties
index c7979d926..e240a9913 100644
--- a/demo/argeo_node_rcp.properties
+++ b/demo/argeo_node_rcp.properties
@@ -1,19 +1,11 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
-org.argeo.node.repofactory.jackrabbit,\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.os,\
-org.argeo.security.equinox,\
 org.argeo.dep.osgi.catalina.start,\
 org.springframework.osgi.web.extender,\
 org.argeo.jackrabbit.webapp,\
 
-#org.argeo.security.ui.initialPerspective=org.argeo.osgi.ui.explorer.perspective
-#org.argeo.security.ui.initialPerspective==org.argeo.security.ui.userHomePerspective
-org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective
-
-#argeo.node.repo.uri=http://localhost:7070/org.argeo.jcr.webapp/remoting/node
-
 log4j.configuration=file:../../log4j.properties
-
+org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective
 eclipse.application=org.argeo.security.ui.rcp.secureUi
diff --git a/demo/log4j.properties b/demo/log4j.properties
index 46e90839b..537803d19 100644
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -5,8 +5,9 @@ log4j.logger.org.argeo=DEBUG
 log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=WARN
 log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN
 
-#log4j.logger.org.springframework.security=DEBUG
+log4j.logger.org.springframework.security=DEBUG
 log4j.logger.org.apache.commons.exec=DEBUG
+log4j.logger.org.apache.jackrabbit.server.jcr=DEBUG
 
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 73a3147c6..10e2bc255 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -33,11 +33,6 @@
 			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
 			<version>1.1.5-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>1.1.5-SNAPSHOT</version>
-		</dependency>
 
 		<!-- OSGi Boot (and Equinox) -->
 		<dependency>
diff --git a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml b/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml
index 5b0715dd0..94e27db19 100644
--- a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml
+++ b/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo-osgi.xml
@@ -9,6 +9,13 @@
        http://www.springframework.org/schema/util
        http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
+	<!-- REFERENCE -->
+	<list id="repositories" interface="javax.jcr.Repository"
+		cardinality="0..N">
+		<listener ref="repositoryFactory" bind-method="register"
+			unbind-method="unregister" />
+	</list>
+
 	<!-- SERVICES -->
 	<service ref="nodeJcrRepository" interface="javax.jcr.Repository">
 		<service-properties>
@@ -16,4 +23,5 @@
 			<beans:entry key="argeo.jcr.repository.home" value="${argeo.node.repo.home}" />
 		</service-properties>
 	</service>
+	<service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
 </beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml b/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml
index f21293ded..b21d705ca 100644
--- a/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml
+++ b/server/modules/org.argeo.node.repo.jackrabbit/META-INF/spring/noderepo.xml
@@ -17,4 +17,9 @@
 		<property name="configuration" value="${argeo.node.repo.configuration}" />
 		<property name="variables" value="osgibundle:/noderepo.properties" />
 	</bean>
+
+	<bean id="repositoryFactory" class="org.argeo.jackrabbit.OsgiJackrabbitRepositoryFactory">
+		<property name="bundleContext" ref="bundleContext" />
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
index b54f422c9..b7c82c130 100644
--- a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
@@ -10,12 +10,12 @@
        http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<!-- REFERENCE -->
-	<list id="repositories" interface="javax.jcr.Repository"
-		cardinality="0..N">
-		<listener ref="repositoryFactory" bind-method="register"
-			unbind-method="unregister" />
-	</list>
+<!-- 	<list id="repositories" interface="javax.jcr.Repository" -->
+<!-- 		cardinality="0..N"> -->
+<!-- 		<listener ref="repositoryFactory" bind-method="register" -->
+<!-- 			unbind-method="unregister" /> -->
+<!-- 	</list> -->
 
 	<!-- SERVICES -->
-	<service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />
+<!-- 	<service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" /> -->
 </beans:beans>
\ No newline at end of file
diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index 472b93260..95f729c68 100644
--- a/server/modules/pom.xml
+++ b/server/modules/pom.xml
@@ -16,7 +16,6 @@
 		<module>org.argeo.ext.bsf</module>
 		<module>org.argeo.jackrabbit.webapp</module>
 		<module>org.argeo.node.repo.jackrabbit</module>
-		<module>org.argeo.node.repofactory.jackrabbit</module>
 		<module>org.argeo.server.activemq.broker</module>
 		<module>org.argeo.server.ads.server</module>
 		<module>org.argeo.server.catalina</module>
-- 
2.30.2