X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=integration-tests%2Forg.argeo.slc.it.webapp%2Fpom.xml;h=4a34d3a5be816af2e1a82488e47b2c91dd6c75ea;hb=a1b71d4abc3b36d052d827e9356a3f9ba4c5cf6d;hp=c1ba1a27a1edd4ec8260e46729ed81ef44a41fd0;hpb=7274972217cf5bb6772e8833c5723a5f9544ddb5;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 c1ba1a27a..4a34d3a5b 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -2,10 +2,10 @@
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.it
- argeo-slc-it
+ org.argeo.slc.server
+ deploy
0.11.3-SNAPSHOT
- ..
+ ../../server/org.argeo.slc.siteserver
org.argeo.slc.it.webapp
jar
@@ -13,20 +13,49 @@
- 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
- true
- true
+ false
+
+ -clean
+
+
+
+ ${basedir}/../../demo/site;in=*;ex=target,
+ ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
+
+
+ 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
+
+
@@ -53,22 +82,14 @@
- org.argeo.slc.server
- bundles
- ${project.version}
- pom
+ org.argeo.slc.runtime
+ org.argeo.slc.support.equinox
org.argeo.slc.runtime
- org.argeo.slc.support.equinox
- tests
- test
-
-
- org.springframework.osgi
- org.springframework.osgi.test
+ org.argeo.slc.server
test
@@ -76,6 +97,5 @@
org.argeo.slc.osgiboot
test
-
\ No newline at end of file