X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=2b69a79e69bbf979baa946971ff677065cdcc585;hb=c42f45fc5b90bab0fdb7ca083231ed754d774def;hp=f42937f779819f47401cf673ca45fc675430c9b7;hpb=32e4428af4e23892b6000408f8794c4b3c949d2e;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 f42937f77..2b69a79e6 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,11 +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>argeo-slc</artifactId>
-		<version>0.11.2-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<groupId>org.argeo.slc.server</groupId>
+		<artifactId>deploy</artifactId>
+		<version>0.11.3</version>
+		<relativePath>../../server/org.argeo.slc.siteserver</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.it.webapp</artifactId>
 	<packaging>jar</packaging>
@@ -13,22 +12,49 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
+				<groupId>org.argeo.slc.maven</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
 				<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>
+							<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>
+						<id>equinox-shutdown</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>equinox-shutdown</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -50,66 +76,24 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>run-war</goal>
-						</goals>
-						<configuration>
-							<daemon>true</daemon>
-						</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>
-			<version>${project.version}</version>
-			<type>war</type>
-		</dependency>
+		<!--  Server -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
 		</dependency>
+
+		<!-- TEST -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${project.version}</version>
+			<artifactId>org.argeo.slc.server</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ws.client</artifactId>
-			<version>${project.version}</version>
+			<artifactId>org.argeo.slc.osgiboot</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>