Adapt to changes in Argeo Commons

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

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 326201f727add2e8c88f6393aa22836ce995c9f9..6906d81d6714ed302572c8abea56144645cb5963 100644 (file)
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -1,6 +1,7 @@
 argeo.osgi.start.2.http=\
 org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.http.jetty,\
+org.eclipse.equinox.cm,\
 org.eclipse.rap.rwt.osgi
 
 argeo.osgi.start.3.node=\
@@ -18,7 +19,7 @@ org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
 org.argeo.slc.server.repo,\
 
-#argeo.node.repo.type=localfs
+argeo.node.repo.type=localfs
 
 org.osgi.framework.security=osgi
 java.security.policy=file:../../all.policy

diff --git a/org.argeo.slc.core/bnd.bnd b/org.argeo.slc.core/bnd.bnd
index 3c198f97f2dd65bca021e2f20e64474dce0c786f..aedf2e57d69d0b612b5c4388066fd59f1762edc3 100644 (file)
--- a/org.argeo.slc.core/bnd.bnd
+++ b/org.argeo.slc.core/bnd.bnd
@@ -2,3 +2,5 @@ Import-Package: javax.jcr.nodetype,\
 org.apache.tools.ant.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
 *
+
+Provide-Capability: cms.datamodel;name=slc;cnd=/org/argeo/slc/jcr/slc.cnd

diff --git a/org.argeo.slc.repo/bnd.bnd b/org.argeo.slc.repo/bnd.bnd
index 8bc8df01251f09705d7ee76c3828ef77e2ce2062..226849a1ec4e750ce8153424e9f0672b50f2c787 100644 (file)
--- a/org.argeo.slc.repo/bnd.bnd
+++ b/org.argeo.slc.repo/bnd.bnd
@@ -4,3 +4,9 @@ javax.xml.transform.*,\
 javax.xml.parsers.*,\
 javax.jcr.nodetype,\
 *
+
+Require-Capability: cms.datamodel; filter:=(name=slc)
+Provide-Capability: cms.datamodel; name=java; cnd=/org/argeo/slc/repo/repo.cnd,\
+ cms.datamodel; name=dist; cnd=/org/argeo/slc/repo/repo.cnd,\
+ cms.datamodel; name=docs; cnd=/org/argeo/slc/repo/repo.cnd,\
+ cms.datamodel; name=rpm; cnd=/org/argeo/slc/repo/repo.cnd

diff --git a/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
index 0d48361681f4a7c96be4c2e14829323f0a63bf21..bf901dacb9641f68e1fd7e2d5682446434c7521c 100644 (file)
--- a/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
@@ -4,22 +4,22 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <!-- JCR repositories -->\r
-       <bean id="javaRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/java" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.java}" />\r
-       </bean>\r
-       <bean id="distRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/dist" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.dist}" />\r
-       </bean>\r
-       <bean id="rpmRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/rpm" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.rpm}" />\r
-       </bean>\r
-       <bean id="docsRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/docs" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.docs}" />\r
-       </bean>\r
+<!--   <bean id="javaRepository" parent="template.jcrRepository"> -->\r
+<!--           <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/java" /> -->\r
+<!--           <property name="configuration" value="${slc.repo.jcr.configuration.java}" /> -->\r
+<!--   </bean> -->\r
+<!--   <bean id="distRepository" parent="template.jcrRepository"> -->\r
+<!--           <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/dist" /> -->\r
+<!--           <property name="configuration" value="${slc.repo.jcr.configuration.dist}" /> -->\r
+<!--   </bean> -->\r
+<!--   <bean id="rpmRepository" parent="template.jcrRepository"> -->\r
+<!--           <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/rpm" /> -->\r
+<!--           <property name="configuration" value="${slc.repo.jcr.configuration.rpm}" /> -->\r
+<!--   </bean> -->\r
+<!--   <bean id="docsRepository" parent="template.jcrRepository"> -->\r
+<!--           <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/docs" /> -->\r
+<!--           <property name="configuration" value="${slc.repo.jcr.configuration.docs}" /> -->\r
+<!--   </bean> -->\r
 \r
        <!-- JCR authorizations -->\r
        <bean parent="template.jcrAuthorizations">\r
@@ -36,20 +36,20 @@
        </bean>\r
 \r
        <!-- Templates -->\r
-       <bean id="template.jcrRepository" abstract="true"\r
-               class="org.argeo.jackrabbit.JackrabbitContainer" init-method="init"\r
-               destroy-method="destroy">\r
-               <property name="variables" value="osgibundle:/repo.properties" />\r
-               <property name="cndFiles">\r
-                       <list>\r
-                               <value>/org/argeo/jcr/argeo.cnd</value>\r
-                               <value>/org/argeo/slc/jcr/slc.cnd</value>\r
-                               <value>/org/argeo/slc/repo/repo.cnd</value>\r
-                       </list>\r
-               </property>\r
-               <property name="bundleContext" ref="bundleContext" />\r
-               <property name="forceCndImport" value="${slc.repo.jcr.forceCndImport}" />\r
-       </bean>\r
+<!--   <bean id="template.jcrRepository" abstract="true" -->\r
+<!--           class="org.argeo.jackrabbit.JackrabbitContainer" init-method="init" -->\r
+<!--           destroy-method="destroy"> -->\r
+<!--           <property name="variables" value="osgibundle:/repo.properties" /> -->\r
+<!--           <property name="cndFiles"> -->\r
+<!--                   <list> -->\r
+<!--                           <value>/org/argeo/jcr/argeo.cnd</value> -->\r
+<!--                           <value>/org/argeo/slc/jcr/slc.cnd</value> -->\r
+<!--                           <value>/org/argeo/slc/repo/repo.cnd</value> -->\r
+<!--                   </list> -->\r
+<!--           </property> -->\r
+<!--           <property name="bundleContext" ref="bundleContext" /> -->\r
+<!--           <property name="forceCndImport" value="${slc.repo.jcr.forceCndImport}" /> -->\r
+<!--   </bean> -->\r
 \r
        <bean id="template.jcrAuthorizations" abstract="true"\r
                class="org.argeo.jackrabbit.JackrabbitAuthorizations" init-method="run">\r

diff --git a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index c821088da62341e4f74cfbac8715ad36b76fbbf3..1da4dba75e4c189ef0ce265fb43f4a770c4f1576 100644 (file)
--- a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -15,27 +15,36 @@
        <set id="defaultRpmRepositories" cardinality="0..N"\r
                interface="org.argeo.slc.rpmfactory.RpmRepository" />\r
 \r
+       <reference id="javaRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=java)" />\r
+       <reference id="distRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=dist)" />\r
+       <reference id="rpmRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=rpm)" />\r
+       <reference id="docsRepository" interface="javax.jcr.Repository"\r
+               filter="(argeo.jcr.repository.alias=docs)" />\r
+\r
        <!-- SERVICES -->\r
-       <service ref="javaRepository" interface="javax.jcr.Repository">\r
-               <service-properties>\r
-                       <beans:entry key="argeo.jcr.repository.alias" value="java" />\r
-               </service-properties>\r
-       </service>\r
-       <service ref="distRepository" interface="javax.jcr.Repository">\r
-               <service-properties>\r
-                       <beans:entry key="argeo.jcr.repository.alias" value="dist" />\r
-               </service-properties>\r
-       </service>\r
-       <service ref="rpmRepository" interface="javax.jcr.Repository">\r
-               <service-properties>\r
-                       <beans:entry key="argeo.jcr.repository.alias" value="rpm" />\r
-               </service-properties>\r
-       </service>\r
-       <service ref="docsRepository" interface="javax.jcr.Repository">\r
-               <service-properties>\r
-                       <beans:entry key="argeo.jcr.repository.alias" value="docs" />\r
-               </service-properties>\r
-       </service>\r
+<!--   <service ref="javaRepository" interface="javax.jcr.Repository"> -->\r
+<!--           <service-properties> -->\r
+<!--                   <beans:entry key="argeo.jcr.repository.alias" value="java" /> -->\r
+<!--           </service-properties> -->\r
+<!--   </service> -->\r
+<!--   <service ref="distRepository" interface="javax.jcr.Repository"> -->\r
+<!--           <service-properties> -->\r
+<!--                   <beans:entry key="argeo.jcr.repository.alias" value="dist" /> -->\r
+<!--           </service-properties> -->\r
+<!--   </service> -->\r
+<!--   <service ref="rpmRepository" interface="javax.jcr.Repository"> -->\r
+<!--           <service-properties> -->\r
+<!--                   <beans:entry key="argeo.jcr.repository.alias" value="rpm" /> -->\r
+<!--           </service-properties> -->\r
+<!--   </service> -->\r
+<!--   <service ref="docsRepository" interface="javax.jcr.Repository"> -->\r
+<!--           <service-properties> -->\r
+<!--                   <beans:entry key="argeo.jcr.repository.alias" value="docs" /> -->\r
+<!--           </service-properties> -->\r
+<!--   </service> -->\r
 \r
        <service ref="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />\r
 \r

diff --git a/pom.xml b/pom.xml
index 5b5a6f1b98bda721a905c6de28ac50472821724f..ca239d327407260d75b8972d80f9e4d6544cfd32 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.33-SNAPSHOT</version>
+               <version>2.1.39-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>