From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 4 Jun 2009 20:06:34 +0000 (+0000)
Subject: Remove dependency to deploy
X-Git-Tag: argeo-slc-2.1.7~1849
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=a1b71d4abc3b36d052d827e9356a3f9ba4c5cf6d;p=gpl%2Fargeo-slc.git

Remove dependency to deploy

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

diff --git a/demo/pom.xml b/demo/pom.xml
index 4f4a8088c..475b720c5 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -77,12 +77,6 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.osgiboot</artifactId>
 		</dependency>
-		<!--  Server -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>deploy</artifactId>
-			<type>pom</type>
-		</dependency>
 
 		<!--  TESTS -->
 		<dependency>
@@ -129,6 +123,14 @@
 					</plugin>
 				</plugins>
 			</build>
+			<dependencies>
+				<!--  Server -->
+				<dependency>
+					<groupId>org.argeo.slc.server</groupId>
+					<artifactId>deploy</artifactId>
+					<type>pom</type>
+				</dependency>
+			</dependencies>
 		</profile>
 		<profile>
 			<id>agent</id>
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 ed41d7d98..6115c7792 100644
--- a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
+++ b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
@@ -20,8 +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=*"));
+//		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 e31674bab..4a34d3a5b 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,10 +2,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.argeo.slc.it</groupId>
-		<artifactId>argeo-slc-it</artifactId>
+		<groupId>org.argeo.slc.server</groupId>
+		<artifactId>deploy</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<relativePath>../../server/org.argeo.slc.siteserver</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
 	<packaging>jar</packaging>
@@ -81,17 +81,11 @@
 	</build>
 	<dependencies>
 		<!--  Server -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>deploy</artifactId>
-			<type>pom</type>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
 		</dependency>
 
-
 		<!-- TEST -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>