Introduce org.argeo.node.repofactory.jackrabbit

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

diff --git a/demo/argeo-node-web.properties b/demo/argeo-node-web.properties
index 7cbe55435482ee5013b2ff2f0240ede42550a55c..cdc985398d9a760fd690c70cb908d88f9a3198d9 100644 (file)
--- a/demo/argeo-node-web.properties
+++ b/demo/argeo-node-web.properties
@@ -1,6 +1,7 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
 org.argeo.server.ads.server,\
+org.argeo.node.repofactory.jackrabbit,\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.ldap,\
 org.argeo.security.services,\

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 2b8d18a54ad60e7c1c2351b87c5eb5327bb78060..755daaafb373e3b1563426abbdcb06ae21b47be0 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
@@ -10,16 +10,9 @@
        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
        <reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />\r
 \r
        <!-- SERVICES -->\r
-       <service ref="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
-\r
        <service ref="nodeJcrRepository" interface="javax.jcr.Repository">\r
                <service-properties>\r
                        <beans:entry value="node">\r

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 f228d9da75849b2c5dd567e6d94c8213ee53ab79..7f10c14c9af4f4ce58a8dbd2d2acbe85d38a5b2d 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
@@ -18,7 +18,7 @@
                <property name="variables" value="osgibundle:/noderepo.properties" />
                <property name="namespaces">
                        <map>
-                               <entry key="argeo" value="http://www.argeo.org/argeo" />
+                               <entry key="argeo" value="http://www.argeo.org/ns/argeo" />
                        </map>
                </property>
                <property name="cndFiles">
@@ -33,7 +33,4 @@
                <property name="repository" ref="nodeJcrRepository" />
                <property name="workspace" value="${argeo.node.repo.workspace}" />
        </bean>
-
-       <bean id="repositoryFactory" class="org.argeo.jackrabbit.JackrabbitRepositoryFactory"/>
-
 </beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/.project b/server/modules/org.argeo.node.repofactory.jackrabbit/.project
new file mode 100644 (file)
index 0000000..cff24eb
--- /dev/null
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.node.repofactory.jackrabbit</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..24b5d7f
--- /dev/null
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jackrabbit Node Repository Factory
+Bundle-SymbolicName: org.argeo.node.repofactory.jackrabbit
+Bundle-Version: 0.2.3.SNAPSHOT
+Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
+ org.argeo.jackrabbit,
+ org.argeo.jcr

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
new file mode 100644 (file)
index 0000000..b54f422
--- /dev/null
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory-osgi.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+       xmlns:util="http://www.springframework.org/schema/util"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+       http://www.springframework.org/schema/beans   \r
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       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="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
+</beans:beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory.xml b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory.xml
new file mode 100644 (file)
index 0000000..73c9a9f
--- /dev/null
+++ b/server/modules/org.argeo.node.repofactory.jackrabbit/META-INF/spring/repofactory.xml
@@ -0,0 +1,8 @@
+<?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 id="repositoryFactory" class="org.argeo.jackrabbit.JackrabbitRepositoryFactory" />
+
+</beans>
\ No newline at end of file