X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=ef22873797e2a08bab81fdea3e7934521509cf64;hb=4f2c9778c7f5559bec3d9480de011181962ad105;hp=4ee9f57315b35e57ab2e68ff7e7f7ca47499334f;hpb=434838d201764c72889b2cd524fefe4dd76da3f8;p=gpl%2Fargeo-slc.git

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 4ee9f5731..ef2287379 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,30 +2,50 @@
 	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>
-		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<!--
+			<groupId>org.argeo.slc.server</groupId>
+			<artifactId>deploy</artifactId> <version>0.11.4-SNAPSHOT</version>
+			<relativePath>../../server/org.argeo.slc.siteserver</relativePath>
+		-->
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>integration-tests</artifactId>
+		<version>0.11.4-SNAPSHOT</version>
 	</parent>
+	<groupId>org.argeo.slc.it</groupId>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
 	<packaging>jar</packaging>
 	<name>Argeo SLC Web Application Integration Tests</name>
 	<build>
 		<plugins>
-			<!--
-				<plugin> <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId> <executions>
-				<execution> <id>copy-dependencies</id>
-				<phase>pre-integration-test</phase> <goals>
-				<goal>copy-dependencies</goal> </goals> <configuration>
-				<overWriteReleases>true</overWriteReleases>
-				<overWriteSnapshots>true</overWriteSnapshots> </configuration>
-				</execution> </executions> </plugin>
-			-->
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<version>${version.maven-argeo-osgi}</version>
+				<configuration>
+					<argsToAppend>
+						<arg>-clean</arg>
+					</argsToAppend>
+					<systemProperties>
+						<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,
+							org.springframework.osgi.web.extender,
+							org.springframework.osgi.samples.simplewebapp,
+							org.argeo.slc.server.activemq,
+							org.argeo.slc.server.hsqldb,
+							org.argeo.slc.server.hibernate,
+							org.argeo.slc.server.services,
+							org.argeo.slc.server.jms,
+							org.argeo.slc.webapp,
+							org.argeo.slc.ria,
+							org.argeo.slc.agent								
+								</slc.osgi.start>
+					</systemProperties>
+				</configuration>
 				<executions>
 					<execution>
 						<id>equinox-start</id>
@@ -35,26 +55,6 @@
 						</goals>
 						<configuration>
 							<wait>false</wait>
-							<pause>5000</pause>
-							<argsToAppend>
-								<arg>-clean</arg>
-							</argsToAppend>
-							<systemProperties>
-								<slc.osgi.bundles>${basedir}/../../demo/site;in=*;ex=target</slc.osgi.bundles>
-								<slc.osgi.start>
-									org.argeo.dep.osgi.catalina.start,
-									org.springframework.osgi.extender,
-									org.springframework.osgi.web.extender,
-									org.springframework.osgi.samples.simplewebapp,
-									org.argeo.slc.server.activemq,
-									org.argeo.slc.server.hsqldb,
-									org.argeo.slc.server.hibernate,
-									org.argeo.slc.server.services,
-									org.argeo.slc.server.jms,
-									org.argeo.slc.webapp,
-									org.argeo.slc.ria
-								</slc.osgi.start>
-							</systemProperties>
 						</configuration>
 					</execution>
 					<execution>
@@ -89,28 +89,19 @@
 	</build>
 	<dependencies>
 		<!--  Server -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>bundles</artifactId>
-			<version>${project.version}</version>
-			<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>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<classifier>tests</classifier>
-			<scope>test</scope>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<version>${project.version}</version>
 		</dependency>
+		<!-- TEST -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.test</artifactId>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -118,6 +109,5 @@
 			<artifactId>org.argeo.slc.osgiboot</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file