Use deploy instaed of bundles

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

diff --git a/demo/pom.xml b/demo/pom.xml
index 6feb43f5027b5358b2259a9b8c412343cd11eb68..4f4a8088cdff954ed43823b2cc0f229b4f6df953 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -80,7 +80,7 @@
                <!--  Server -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>bundles</artifactId>
+                       <artifactId>deploy</artifactId>
                        <type>pom</type>
                </dependency>
 

diff --git a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
index 78dc8ac5d590912a6f98faf46bd7bf62c29ecbff..ed41d7d98403ebcc017419a7381fd38a7be7f38d 100644 (file)
--- a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
+++ b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
@@ -20,6 +20,8 @@ public class StartStopDemoTest extends AbstractOsgiRuntimeTestCase {
                                                .getProperty("java.class.path")));
                osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
                                "site;in=*"));
+               osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL,
+                               "../server/org.argeo.slc.siteserver/bundles;in=*"));
        }
 
        protected List<String> getBundlesToStart() {

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 80846dba34bce096985c70813908eb1308501cee..e31674babeb93187710b23529c7856804c5908da 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -29,7 +29,10 @@
                                                                <arg>-clean</arg>
                                                        </argsToAppend>
                                                        <systemProperties>
-                                                               <slc.osgi.bundles>${basedir}/../../demo/site;in=*;ex=target</slc.osgi.bundles>
+                                                               <slc.osgi.bundles>
+                                                                       ${basedir}/../../demo/site;in=*;ex=target,
+                                                                       ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
+                                                               </slc.osgi.bundles>
                                                                <slc.osgi.start>
                                                                        org.argeo.dep.osgi.catalina.start,
                                                                        org.springframework.osgi.extender,
@@ -80,7 +83,7 @@
                <!--  Server -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>bundles</artifactId>
+                       <artifactId>deploy</artifactId>
                        <type>pom</type>
                </dependency>
                <dependency>

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 05b3172308381e61c78cc8fe958bbc77e354e17f..88e7c8912d31648f3376c2817f18f4305589bb61 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -272,12 +272,20 @@ limitations under the License.
                                <artifactId>org.argeo.slc.ria</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <!-- 
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>bundles</artifactId>
                                <version>0.11.3-SNAPSHOT</version>
                                <type>pom</type>
                        </dependency>
+                        -->
+                       <dependency>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>deploy</artifactId>
+                               <version>${project.version}</version>
+                               <type>pom</type>
+                       </dependency>
 
                        <!-- SLC dubious -->
                        <dependency>