X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=42aacc2f878c9c71175fef15b5ada4ae657644a4;hb=3e1feafae6dee22c13272e992fc967cc42776f15;hp=738b29e7723cbf82fc48a108d76282d710147cb3;hpb=8d1e596bfe9a7d037d3cea59fe6fb4a6b7f955af;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 738b29e77..42aacc2f8 100644
--- 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">
4.0.0
- org.argeo.slc
- argeo-slc
- 0.11.2-SNAPSHOT
- ../../org.argeo.slc
+ org.argeo.slc.it
+ argeo-slc-it
+ 0.11.3-SNAPSHOT
+ ..
org.argeo.slc.it.webapp
jar
Argeo SLC Web Application Integration Tests
+
- org.apache.maven.plugins
- maven-dependency-plugin
+ org.argeo.slc.maven
+ maven-argeo-osgi-plugin
+ ${version.maven-argeo-osgi}
- copy-dependencies
+ equinox-start
pre-integration-test
- copy-dependencies
+ equinox
- org.argeo.slc.webapp
- true
- true
- true
+ false
+
+
+ -clean
+
+
+ ${basedir}/../../demo/site;in=*;ex=target
+
+ 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
+
+
+
+ equinox-shutdown
+ post-integration-test
+
+ equinox-shutdown
+
+
@@ -50,71 +85,32 @@
-
- org.mortbay.jetty
- maven-jetty-plugin
-
-
- start-jetty
- pre-integration-test
-
- run-war
-
-
- true
-
-
-
- stop-jetty
- post-integration-test
-
- stop
-
-
-
-
- ${project.build.directory}/dependency/org.argeo.slc.webapp.war
- 0
- ../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml
- ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
-
-
+
- org.argeo.slc
- org.argeo.slc.webapp
- ${project.version}
- war
-
-
- org.argeo.slc.runtime
- org.argeo.slc.launcher
+ org.argeo.slc.server
+ bundles
${project.version}
- test
+ pom
org.argeo.slc.runtime
- org.argeo.slc.support.ant
- ${project.version}
- test
+ org.argeo.slc.support.equinox
+
+
+
org.argeo.slc.runtime
- org.argeo.slc.support.ant
- ${project.version}
+ org.argeo.slc.server
+ tests
test
org.argeo.slc.runtime
- org.argeo.slc.support.ws.client
- ${project.version}
- test
-
-
- javax.activation
- com.springsource.javax.activation
+ org.argeo.slc.osgiboot
test