Use deploy instaed of bundles

[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 c1ba1a27a1edd4ec8260e46729ed81ef44a41fd0..e31674babeb93187710b23529c7856804c5908da 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -13,20 +13,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>
-                                                       <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>
@@ -54,21 +83,19 @@
                <!--  Server -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>bundles</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>deploy</artifactId>
                        <type>pom</type>
                </dependency>
-
-               <!-- TEST -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <classifier>tests</classifier>
-                       <scope>test</scope>
                </dependency>
+
+
+               <!-- TEST -->
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.test</artifactId>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.server</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -76,6 +103,5 @@
                        <artifactId>org.argeo.slc.osgiboot</artifactId>
                        <scope>test</scope>
                </dependency>
-
        </dependencies>
 </project>
\ No newline at end of file