X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=9d3bfae5d667d6445957cc7ce210259f63dbe85c;hb=67c8f355b94108517434de5b3f9fe2ac005b803c;hp=f5933836f554d01a264a04583a34ae727116c708;hpb=bf343dd62ca1c1610b8b2cc5a1af2879e57e6ff3;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 f5933836f..9d3bfae5d 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -4,12 +4,12 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>0.11.4-SNAPSHOT</version>
+		<version>0.12.2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.it</groupId>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
 	<packaging>jar</packaging>
-	<name>Argeo SLC Integration Tests Web Application</name>
+	<name>SLC Integration Tests Web Application</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -21,17 +21,32 @@
 						<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>
+						<argeo.osgi.bundles>
+							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+						</argeo.osgi.bundles><!--						
+						<argeo.osgi.bundles>
+							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+							${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*,
+							${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.*
+						</argeo.osgi.bundles>
+						--><!--
+						<argeo.osgi.start>
 							org.springframework.osgi.extender,
 							org.argeo.slc.server.main,
 							org.argeo.slc.server.hsqldb,
+							org.argeo.slc.server.hibernate,
 							org.argeo.slc.ria,
-							org.argeo.slc.agent								
-						</slc.osgi.start>
+							org.argeo.slc.agent,
+							org.argeo.slc.agent.jms							
+						</argeo.osgi.start>
+						--><argeo.osgi.start>
+							org.springframework.osgi.extender,
+							org.argeo.slc.server.jcr,
+							org.argeo.slc.server.main,
+							org.argeo.slc.ria,
+							org.argeo.slc.agent,
+							org.argeo.slc.agent.jms							
+						</argeo.osgi.start>
 					</systemProperties>
 				</configuration>
 				<executions>
@@ -78,24 +93,13 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.agent</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<!-- RIA -->
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
-		</dependency>
-
-		<!-- Test -->
+		<!-- Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
+			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>