From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 8 Dec 2021 08:05:58 +0000 (+0100)
Subject: Adapt to changes in Argeo Commons
X-Git-Tag: argeo-slc-2.3.1~38
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=68cb92496805e0649c3f8a540bf6a87fbc3b3812;hp=4316ea22964732db743118a1d319ab5ed2ac6a79;p=gpl%2Fargeo-slc.git

Adapt to changes in Argeo Commons
---

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 0e8b1f165..f8c936595 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -6,7 +6,8 @@ org.eclipse.equinox.ds,\
 org.eclipse.rap.rwt.osgi
 
 argeo.osgi.start.3.node=\
-org.argeo.cms
+org.argeo.cms,\
+org.argeo.cms.jcr
 
 argeo.osgi.start.4.apps=\
 org.eclipse.gemini.blueprint.extender
diff --git a/legacy/org.argeo.slc.agent/META-INF/spring/osgi.xml b/legacy/org.argeo.slc.agent/META-INF/spring/osgi.xml
index 79d933cd0..a3bbecf7e 100644
--- a/legacy/org.argeo.slc.agent/META-INF/spring/osgi.xml
+++ b/legacy/org.argeo.slc.agent/META-INF/spring/osgi.xml
@@ -32,7 +32,7 @@
 		cardinality="0..N">
 		<listener ref="modulesManager" />
 	</list>
-	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
+	<reference id="userTransaction" interface="org.argeo.osgi.transaction.WorkTransaction" />
 	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
 
 	<!-- SERVICES -->
diff --git a/legacy/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/legacy/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index 830303cce..d62a00b39 100644
--- a/legacy/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/legacy/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -10,10 +10,10 @@
 
 	<!-- REFERENCES -->
 	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
-	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
+	<reference id="userTransaction" interface="org.argeo.osgi.transaction.WorkTransaction" />
 
-	<set id="defaultRpmRepositories" cardinality="0..N"
-		interface="org.argeo.slc.rpmfactory.RpmRepository" />
+<!-- 	<set id="defaultRpmRepositories" cardinality="0..N" -->
+<!-- 		interface="org.argeo.slc.rpmfactory.RpmRepository" /> -->
 
 	<reference id="javaRepository" interface="javax.jcr.Repository"
 		filter="(cn=java)" />
diff --git a/legacy/org.argeo.slc.server.repo/META-INF/spring/services.xml b/legacy/org.argeo.slc.server.repo/META-INF/spring/services.xml
index 454009e9d..f94524989 100644
--- a/legacy/org.argeo.slc.server.repo/META-INF/spring/services.xml
+++ b/legacy/org.argeo.slc.server.repo/META-INF/spring/services.xml
@@ -44,15 +44,15 @@
 	<!-- </bean> -->
 
 	<!-- RPM -->
-	<bean id="rpmRepoManager" class="org.argeo.slc.repo.core.RpmRepoManagerImpl"
-		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC">
-		<property name="nodeIndexers">
-			<list>
-				<bean class="org.argeo.slc.repo.RpmIndexer" />
-			</list>
-		</property>
-		<property name="jcrRepository" ref="rpmRepository" />
-	</bean>
+<!-- 	<bean id="rpmRepoManager" class="org.argeo.slc.repo.core.RpmRepoManagerImpl" -->
+<!-- 		init-method="init" destroy-method="destroy" depends-on="ROLE_SLC"> -->
+<!-- 		<property name="nodeIndexers"> -->
+<!-- 			<list> -->
+<!-- 				<bean class="org.argeo.slc.rpmfactory.core.RpmIndexer" /> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 		<property name="jcrRepository" ref="rpmRepository" /> -->
+<!-- 	</bean> -->
 
 	<!-- <bean id="rpmProxyService" class="org.argeo.slc.rpmfactory.core.RpmProxyServiceImpl" -->
 	<!-- init-method="init" destroy-method="destroy" depends-on="ROLE_SLC"> -->