Adap to changes in Commons

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

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index eaf4b536b86660585c7ae3a4c99f9d6bfc231dad..912d04ff6dc3701d03d722919f34568365a090f9 100644 (file)
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -23,7 +23,7 @@ org.argeo.security.dao.ldap,\
 argeo.osgi.start.3.node=\
 org.argeo.jackrabbit.webapp,\
 org.argeo.server.rap.webapp,\
-org.argeo.dep.osgi.catalina.start,\
+org.argeo.server.catalina.start,\
 org.eclipse.equinox.http.registry,\
 org.springframework.osgi.web.extender,\
 

diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties
index 06936a709df08fa166b96ed0994fc55788195f3c..9ce3531661015cc8d4d7cbb0f59bce8017c6bd15 100644 (file)
--- a/demo/slc_demo_rcp.properties
+++ b/demo/slc_demo_rcp.properties
@@ -8,12 +8,12 @@ org.argeo.slc.agent.jcr,\
 org.argeo.slc.support.maven,\
 org.argeo.slc.server.repo,\
 
-argeo.osgi.start.5=org.argeo.dep.osgi.catalina.start,\
+argeo.osgi.start.5=org.argeo.server.catalina.start,\
 org.springframework.osgi.web.extender,\
 org.argeo.jackrabbit.webapp,\
 
 # Start internal web server
-#org.argeo.dep.osgi.catalina.start,\
+#org.argeo.server.catalina.start,\
 #org.springframework.osgi.web.extender,\
 #org.argeo.jackrabbit.webapp,\
 

diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 33b5e8da2bb02f28b7b7feccbaa5df67433b5c8c..e6897b5d1e0de8b3895ee2b127fc4f2da93061c1 100644 (file)
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -23,7 +23,7 @@ org.argeo.security.dao.ldap,\
 argeo.osgi.start.3.node=\
 org.argeo.jackrabbit.webapp,\
 org.argeo.server.rap.webapp,\
-org.argeo.dep.osgi.catalina.start,\
+org.argeo.server.catalina.start,\
 org.eclipse.equinox.http.registry,\
 org.springframework.osgi.web.extender,\
 

diff --git a/pom.xml b/pom.xml
index dd5abd91a2b81d6cdb1270e6b8dc30d2e0ee8092..34d1fddd393ecca1829f2584f72d2a82293a47ff 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>1.1.8</version>
+               <version>1.1.9-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>