Adapt to changes in Argeo Commons

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 0e8b1f16593c418c87d1bfbb6bb31ad485da9e94..f8c936595b540c1b3394da7e9e464e4b6eebc495 100644 (file)
--- 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 79d933cd019b9b2b97826e073da66d8b7e5c9870..a3bbecf7e78a62560abbf98070bb7254905359dd 100644 (file)
--- 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">\r
                <listener ref="modulesManager" />\r
        </list>\r
-       <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
+       <reference id="userTransaction" interface="org.argeo.osgi.transaction.WorkTransaction" />\r
        <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
 \r
        <!-- SERVICES -->\r

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 830303ccec94d50f1944c1769d05eb98e1f7698b..d62a00b39ecaefdc01214a07e846681d5bac409c 100644 (file)
--- 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 @@
 \r
        <!-- REFERENCES -->\r
        <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
-       <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
+       <reference id="userTransaction" interface="org.argeo.osgi.transaction.WorkTransaction" />\r
 \r
-       <set id="defaultRpmRepositories" cardinality="0..N"\r
-               interface="org.argeo.slc.rpmfactory.RpmRepository" />\r
+<!--   <set id="defaultRpmRepositories" cardinality="0..N" -->\r
+<!--           interface="org.argeo.slc.rpmfactory.RpmRepository" /> -->\r
 \r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
                filter="(cn=java)" />\r

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 454009e9d7bc833c8c5145f07f9d83b31548803a..f94524989805077defd9e6280f96a6a80ef08d2d 100644 (file)
--- 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"> -->