Move repository factory to node bundle

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

diff --git a/demo/argeo_node_rcp.properties b/demo/argeo_node_rcp.properties
index c7979d926ee6c954054e8e91843280d0e133e887..e240a99134e322bcc152df5a16c47dbab03111c9 100644 (file)
--- 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 46e90839b8f863e196208b8f886c9ca9bdc6486c..537803d1977abd600a7999896c4282c825bac272 100644 (file)
--- 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 73a3147c69fd289e1dff189ddc861427e51b887f..10e2bc2559716af1e35f1627ae986192d7875ac7 100644 (file)
--- 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 5b0715dd0a27769144687f7f058e28b3513ac7b5..94e27db19b8883ae501f0477b467935e89941c18 100644 (file)
--- 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\r
        http://www.springframework.org/schema/util/spring-util-2.5.xsd">\r
 \r
+       <!-- REFERENCE -->\r
+       <list id="repositories" interface="javax.jcr.Repository"\r
+               cardinality="0..N">\r
+               <listener ref="repositoryFactory" bind-method="register"\r
+                       unbind-method="unregister" />\r
+       </list>\r
+\r
        <!-- SERVICES -->\r
        <service ref="nodeJcrRepository" interface="javax.jcr.Repository">\r
                <service-properties>\r
@@ -16,4 +23,5 @@
                        <beans:entry key="argeo.jcr.repository.home" value="${argeo.node.repo.home}" />\r
                </service-properties>\r
        </service>\r
+       <service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
 </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 f21293ded240bf6ecd1fc529b2f2297fedd36e68..b21d705ca916db10ef5d7817dba265f0659a00fe 100644 (file)
--- 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 b54f422c9f383e07f33df7e6d224b1dd6154f1c0..b7c82c130bd6171506566e1d2241cd89e550e88d 100644 (file)
--- 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">\r
 \r
        <!-- REFERENCE -->\r
-       <list id="repositories" interface="javax.jcr.Repository"\r
-               cardinality="0..N">\r
-               <listener ref="repositoryFactory" bind-method="register"\r
-                       unbind-method="unregister" />\r
-       </list>\r
+<!--   <list id="repositories" interface="javax.jcr.Repository" -->\r
+<!--           cardinality="0..N"> -->\r
+<!--           <listener ref="repositoryFactory" bind-method="register" -->\r
+<!--                   unbind-method="unregister" /> -->\r
+<!--   </list> -->\r
 \r
        <!-- SERVICES -->\r
-       <service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
+<!--   <service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" /> -->\r
 </beans:beans>
\ No newline at end of file

diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index 472b932606958835fb773238deaee15bfeb81bda..95f729c68b1338cdd826b5beba891150b8e20209 100644 (file)
--- 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>