From 6bb0ea427ce071e24e3fded278d43d3201ba410d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 11 Dec 2012 10:56:44 +0000 Subject: [PATCH] Adap to changes in Commons git-svn-id: https://svn.argeo.org/slc/trunk@5952 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/slc_demo_rap.properties | 2 +- demo/slc_demo_rcp.properties | 4 ++-- dist/slc/src/main/rpm/etc/slc/config.ini | 2 +- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties index eaf4b536b..912d04ff6 100644 --- 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 06936a709..9ce353166 100644 --- 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 33b5e8da2..e6897b5d1 100644 --- 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 dd5abd91a..34d1fddd3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 1.1.8 + 1.1.9-SNAPSHOT org.argeo.slc argeo-slc -- 2.39.2