Use new version of Osgi plugin

[gpl/argeo-slc.git] / integration-tests / org.argeo.slc.it.webapp / pom.xml

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 621d20eea9544cdf06e341e920f2816ff8532bf3..4ee9f57315b35e57ab2e68ff7e7f7ca47499334f 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,33 +2,68 @@
        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>
+               <groupId>org.argeo.slc.it</groupId>
+               <artifactId>argeo-slc-it</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Web Application Integration Tests</name>
        <build>
                <plugins>
+                       <!--
+                               <plugin> <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId> <executions>
+                               <execution> <id>copy-dependencies</id>
+                               <phase>pre-integration-test</phase> <goals>
+                               <goal>copy-dependencies</goal> </goals> <configuration>
+                               <overWriteReleases>true</overWriteReleases>
+                               <overWriteSnapshots>true</overWriteSnapshots> </configuration>
+                               </execution> </executions> </plugin>
+                       -->
                        <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>
+                                                       <pause>5000</pause>
+                                                       <argsToAppend>
+                                                               <arg>-clean</arg>
+                                                       </argsToAppend>
+                                                       <systemProperties>
+                                                               <slc.osgi.bundles>${basedir}/../../demo/site;in=*;ex=target</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,72 +85,39 @@
                                        </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>
+               <!--  Server -->
                <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.webapp</artifactId>
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>bundles</artifactId>
                        <version>${project.version}</version>
-                       <type>war</type>
+                       <type>pom</type>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.launcher</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.support.equinox</artifactId>
+                       <classifier>tests</classifier>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <version>${project.version}</version>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.test</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ws.client</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
+                       <artifactId>org.argeo.slc.osgiboot</artifactId>
                        <scope>test</scope>
                </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file