From ac955220781e2d2ab38dc45626a5b4fd3bdb05c7 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 4 Jun 2009 19:37:30 +0000
Subject: [PATCH] Use deploy instaed of bundles

git-svn-id: https://svn.argeo.org/slc/trunk@2476 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/pom.xml                                              | 2 +-
 .../test/java/org/argeo/slc/demo/StartStopDemoTest.java   | 2 ++
 integration-tests/org.argeo.slc.it.webapp/pom.xml         | 7 +++++--
 org.argeo.slc/pom.xml                                     | 8 ++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/demo/pom.xml b/demo/pom.xml
index 6feb43f50..4f4a8088c 100644
--- 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 78dc8ac5d..ed41d7d98 100644
--- 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 80846dba3..e31674bab 100644
--- 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 05b317230..88e7c8912 100644
--- 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>
-- 
2.39.2