X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=4da8d4fc0c31d4fb96d6b27a2afdc81f601f4566;hb=52e74032562bbc1a017ccb5bcf2fd47652e31b47;hp=1fd0f28cd7e813d2ba5a1a12d510caf6fa27b06b;hpb=32265c1185c19ae86783c039a6c04d50db30bb8e;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 1fd0f28cd..4da8d4fc0 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,9 +1,10 @@
-<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</groupId>
 		<artifactId>integration-tests</artifactId>
-		<version>0.11.4</version>
+		<version>0.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.it</groupId>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
@@ -16,23 +17,45 @@
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
+					<useDependencies>false</useDependencies>
 					<argsToAppend>
 						<arg>-clean</arg>
 					</argsToAppend>
 					<systemProperties>
-						<slc.osgi.bundles>
-							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml,
-							${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml,
-							${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml
-						</slc.osgi.bundles>
-						<slc.osgi.start>
+						<argeo.osgi.bundles>
+							${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+							${project.build.directory}/lib;in=*.jar,
+						</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.h2,
+							org.argeo.slc.server.hibernate,
 							org.argeo.slc.ria,
-							org.argeo.slc.agent,								
-							org.argeo.slc.agent.jms							
-						</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>
+						<argeo.server.port.http>7080</argeo.server.port.http>
+						<!--
+							<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,
+							org.argeo.slc.demo.minimal, org.argeo.slc.demo.basic,
+							org.argeo.slc.demo.ant </argeo.osgi.start>
+						-->
 					</systemProperties>
 				</configuration>
 				<executions>
@@ -74,25 +97,31 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeTypes>jar</includeTypes>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<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>
-
 		<!-- Unit Tests -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>