X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=fbe7005ad15e59d9033da7388b478109d39eb05d;hb=94f7f66d8aa4f9c3510c215045964bad85208cc8;hp=ef22873797e2a08bab81fdea3e7934521509cf64;hpb=4f2c9778c7f5559bec3d9480de011181962ad105;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 ef2287379..fbe7005ad 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,24 +1,18 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.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>
+		<version>0.13.0-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>
+	<name>SLC Integration Tests Web Application</name>
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.argeo.slc.maven</groupId>
+				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
@@ -26,24 +20,35 @@
 						<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,
+						<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, org.argeo.slc.agent.jms </argeo.osgi.start>
+						-->
+						<argeo.osgi.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.server.ads.server,
+							org.argeo.slc.server.jackrabbit.derby,
+							org.argeo.slc.server.jcr,
+							org.argeo.slc.server.main,
 							org.argeo.slc.ria,
-							org.argeo.slc.agent								
-								</slc.osgi.start>
+							org.argeo.slc.agent,
+							org.argeo.slc.agent.jms,
+							org.argeo.slc.demo.minimal,
+							org.argeo.slc.demo.basic,
+							org.argeo.slc.demo.ant						
+						</argeo.osgi.start>
 					</systemProperties>
 				</configuration>
 				<executions>
@@ -88,25 +93,15 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!--  Server -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-		</dependency>
 		<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>
-		<!-- TEST -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<scope>test</scope>
-		</dependency>
+		<!-- Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
+			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>