X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=9a9ab43676eff427c685e301aff653939120fe62;hb=db57a9673765b879019aa176448c1a118fe37f06;hp=7ebc060161745bcc37626288743f048e4982da36;hpb=1ae3a446a15cfaffffe8a476212bd33596e99cdf;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 7ebc06016..9a9ab4367 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,34 +1,80 @@
-<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>argeo-slc</artifactId>
-		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<artifactId>integration-tests</artifactId>
+		<version>0.13.0</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>
+					<useDependencies>false</useDependencies>
+					<argsToAppend>
+						<arg>-clean</arg>
+					</argsToAppend>
+					<systemProperties>
+						<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.h2,
+							org.argeo.slc.server.hibernate,
+							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>
+						<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>
 					<execution>
-						<id>copy-dependencies</id>
+						<id>equinox-start</id>
 						<phase>pre-integration-test</phase>
 						<goals>
-							<goal>copy-dependencies</goal>
+							<goal>equinox</goal>
 						</goals>
 						<configuration>
-							<includeArtifactIds>org.argeo.slc.webapp</includeArtifactIds>
-							<stripVersion>true</stripVersion>
-							<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,60 +97,34 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
+						<id>copy-dependencies</id>
+						<phase>process-resources</phase>
 						<goals>
-							<goal>run-war</goal>
+							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<daemon>true</daemon>
+							<includeTypes>jar</includeTypes>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
 						</configuration>
 					</execution>
-					<execution>
-						<id>stop-jetty</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
 				</executions>
-				<configuration>
-					<webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
-					<scanIntervalSeconds>0</scanIntervalSeconds>
-					<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-					<jettyConfig>../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml</jettyConfig>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.webapp</artifactId>
-			<type>war</type>
+			<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.launcher</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ws.client</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
+			<artifactId>org.argeo.slc.unit</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>