X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=e031eb95d9b6feed637392b97a3005f65380a556;hb=558c8a34e6d66a3cadfddedfa23b8f06e2cac041;hp=c1ba1a27a1edd4ec8260e46729ed81ef44a41fd0;hpb=7274972217cf5bb6772e8833c5723a5f9544ddb5;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 c1ba1a27a..e031eb95d 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,31 +2,70 @@
 	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</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.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
+				<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.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>copy-dependencies</id>
+						<id>equinox-start</id>
 						<phase>pre-integration-test</phase>
 						<goals>
-							<goal>copy-dependencies</goal>
+							<goal>equinox</goal>
 						</goals>
 						<configuration>
-							<overWriteReleases>true</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
+							<wait>false</wait>
 						</configuration>
 					</execution>
+					<execution>
+						<id>equinox-shutdown</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>equinox-shutdown</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -51,31 +90,16 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!--  Server -->
 		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>bundles</artifactId>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.sdk</artifactId>
 			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- TEST -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<classifier>tests</classifier>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.test</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>
 </project>
\ No newline at end of file