From 84437a05db3a30078f43a049fffcf9626f891c9f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 20 May 2016 10:37:15 +0000
Subject: [PATCH] Adapt to changes in Argeo Commons

git-svn-id: https://svn.argeo.org/slc/trunk@8930 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/slc_demo_rap.properties                  |  3 +-
 org.argeo.slc.core/bnd.bnd                    |  2 +
 org.argeo.slc.repo/bnd.bnd                    |  6 ++
 .../META-INF/spring/jcr.xml                   | 60 +++++++++----------
 .../META-INF/spring/repo-osgi.xml             | 49 ++++++++-------
 pom.xml                                       |  2 +-
 6 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 326201f72..6906d81d6 100644
--- 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 3c198f97f..aedf2e57d 100644
--- 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 8bc8df012..226849a1e 100644
--- 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 0d4836168..bf901dacb 100644
--- 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">
 
 	<!-- JCR repositories -->
-	<bean id="javaRepository" parent="template.jcrRepository">
-		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/java" />
-		<property name="configuration" value="${slc.repo.jcr.configuration.java}" />
-	</bean>
-	<bean id="distRepository" parent="template.jcrRepository">
-		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/dist" />
-		<property name="configuration" value="${slc.repo.jcr.configuration.dist}" />
-	</bean>
-	<bean id="rpmRepository" parent="template.jcrRepository">
-		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/rpm" />
-		<property name="configuration" value="${slc.repo.jcr.configuration.rpm}" />
-	</bean>
-	<bean id="docsRepository" parent="template.jcrRepository">
-		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/docs" />
-		<property name="configuration" value="${slc.repo.jcr.configuration.docs}" />
-	</bean>
+<!-- 	<bean id="javaRepository" parent="template.jcrRepository"> -->
+<!-- 		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/java" /> -->
+<!-- 		<property name="configuration" value="${slc.repo.jcr.configuration.java}" /> -->
+<!-- 	</bean> -->
+<!-- 	<bean id="distRepository" parent="template.jcrRepository"> -->
+<!-- 		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/dist" /> -->
+<!-- 		<property name="configuration" value="${slc.repo.jcr.configuration.dist}" /> -->
+<!-- 	</bean> -->
+<!-- 	<bean id="rpmRepository" parent="template.jcrRepository"> -->
+<!-- 		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/rpm" /> -->
+<!-- 		<property name="configuration" value="${slc.repo.jcr.configuration.rpm}" /> -->
+<!-- 	</bean> -->
+<!-- 	<bean id="docsRepository" parent="template.jcrRepository"> -->
+<!-- 		<property name="homeDirectory" value="${slc.repo.jcr.reposBase}/docs" /> -->
+<!-- 		<property name="configuration" value="${slc.repo.jcr.configuration.docs}" /> -->
+<!-- 	</bean> -->
 
 	<!-- JCR authorizations -->
 	<bean parent="template.jcrAuthorizations">
@@ -36,20 +36,20 @@
 	</bean>
 
 	<!-- Templates -->
-	<bean id="template.jcrRepository" abstract="true"
-		class="org.argeo.jackrabbit.JackrabbitContainer" init-method="init"
-		destroy-method="destroy">
-		<property name="variables" value="osgibundle:/repo.properties" />
-		<property name="cndFiles">
-			<list>
-				<value>/org/argeo/jcr/argeo.cnd</value>
-				<value>/org/argeo/slc/jcr/slc.cnd</value>
-				<value>/org/argeo/slc/repo/repo.cnd</value>
-			</list>
-		</property>
-		<property name="bundleContext" ref="bundleContext" />
-		<property name="forceCndImport" value="${slc.repo.jcr.forceCndImport}" />
-	</bean>
+<!-- 	<bean id="template.jcrRepository" abstract="true" -->
+<!-- 		class="org.argeo.jackrabbit.JackrabbitContainer" init-method="init" -->
+<!-- 		destroy-method="destroy"> -->
+<!-- 		<property name="variables" value="osgibundle:/repo.properties" /> -->
+<!-- 		<property name="cndFiles"> -->
+<!-- 			<list> -->
+<!-- 				<value>/org/argeo/jcr/argeo.cnd</value> -->
+<!-- 				<value>/org/argeo/slc/jcr/slc.cnd</value> -->
+<!-- 				<value>/org/argeo/slc/repo/repo.cnd</value> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 		<property name="bundleContext" ref="bundleContext" /> -->
+<!-- 		<property name="forceCndImport" value="${slc.repo.jcr.forceCndImport}" /> -->
+<!-- 	</bean> -->
 
 	<bean id="template.jcrAuthorizations" abstract="true"
 		class="org.argeo.jackrabbit.JackrabbitAuthorizations" init-method="run">
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 c821088da..1da4dba75 100644
--- 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"
 		interface="org.argeo.slc.rpmfactory.RpmRepository" />
 
+	<reference id="javaRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=java)" />
+	<reference id="distRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=dist)" />
+	<reference id="rpmRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=rpm)" />
+	<reference id="docsRepository" interface="javax.jcr.Repository"
+		filter="(argeo.jcr.repository.alias=docs)" />
+
 	<!-- SERVICES -->
-	<service ref="javaRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="java" />
-		</service-properties>
-	</service>
-	<service ref="distRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="dist" />
-		</service-properties>
-	</service>
-	<service ref="rpmRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="rpm" />
-		</service-properties>
-	</service>
-	<service ref="docsRepository" interface="javax.jcr.Repository">
-		<service-properties>
-			<beans:entry key="argeo.jcr.repository.alias" value="docs" />
-		</service-properties>
-	</service>
+<!-- 	<service ref="javaRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="java" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="distRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="dist" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="rpmRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="rpm" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
+<!-- 	<service ref="docsRepository" interface="javax.jcr.Repository"> -->
+<!-- 		<service-properties> -->
+<!-- 			<beans:entry key="argeo.jcr.repository.alias" value="docs" /> -->
+<!-- 		</service-properties> -->
+<!-- 	</service> -->
 
 	<service ref="slcRepoManager" interface="org.argeo.slc.repo.SlcRepoManager" />
 
diff --git a/pom.xml b/pom.xml
index 5b5a6f1b9..ca239d327 100644
--- 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>
-- 
2.39.2