X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=ef22873797e2a08bab81fdea3e7934521509cf64;hb=4f2c9778c7f5559bec3d9480de011181962ad105;hp=6b15ce4a7b46b02987d7ba5c70a464cdbd647a43;hpb=c667f947c81e99f6d72f8b14b4d99401f896c48b;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 6b15ce4a7..ef2287379 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,16 +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.server</groupId>
+			<artifactId>deploy</artifactId> <version>0.11.4-SNAPSHOT</version>
+			<relativePath>../../server/org.argeo.slc.siteserver</relativePath>
+		-->
 		<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.11.4-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>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.argeo.slc.maven</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>${version.maven-argeo-osgi}</version>
+				<configuration>
+					<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,
+							org.argeo.slc.agent								
+								</slc.osgi.start>
+					</systemProperties>
+				</configuration>
+				<executions>
+					<execution>
+						<id>equinox-start</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>equinox</goal>
+						</goals>
+						<configuration>
+							<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>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -34,5 +88,26 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<!--  Server -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<!-- TEST -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.osgiboot</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file