X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=db113ebf1f3ab0b6211993f446837263ad24adfe;hb=1e4f2fca5f2542d38b577b8b48e3eb0354749c09;hp=449acadb31e5aadffdb0c19e66e0b3169685aa00;hpb=ddf608d7eaf27926d747a9e92f3527a6982db37f;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 449acadb3..db113ebf1 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,20 +1,54 @@
-<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.12.2-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>
+					<argsToAppend>
+						<arg>-clean</arg>
+					</argsToAppend>
+					<systemProperties>
+						<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.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,
+							org.argeo.slc.agent.jms							
+						</argeo.osgi.start>
+					</systemProperties>
+				</configuration>
 				<executions>
 					<execution>
 						<id>equinox-start</id>
@@ -24,28 +58,6 @@
 						</goals>
 						<configuration>
 							<wait>false</wait>
-							<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								
-								</slc.osgi.start>
-							</systemProperties>
 						</configuration>
 					</execution>
 					<execution>
@@ -79,21 +91,15 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!--  Server -->
 		<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.server</artifactId>
-			<scope>test</scope>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.sdk</artifactId>
+			<version>${project.version}</version>
 		</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>