X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=demo%2Fpom.xml;h=67cee7228d3308c8582c8b074dcd7be45f314108;hb=30f4c6af6c20077e5e36b61faf5edb22c1aae6c6;hp=09984e50798555e00b3b97159c385542aad74ac1;hpb=d9c37ddf97e913b552b318d9a7eeb02d1d6fa3c4;p=gpl%2Fargeo-slc.git
diff --git a/demo/pom.xml b/demo/pom.xml
index 09984e507..67cee7228 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,7 +3,7 @@
org.argeo.slc
argeo-slc
- 0.12.1-SNAPSHOT
+ 0.13.1-SNAPSHOT
..
org.argeo.slc
@@ -25,61 +25,8 @@
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- copy-dependencies
- pre-integration-test
-
- copy-dependencies
-
-
- compile
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
- surefire-it
- integration-test
-
- test
-
-
- false
-
-
-
-
-
-
- org.argeo.slc.runtime
- org.argeo.slc.osgiboot
-
-
-
-
- org.argeo.slc.runtime
- org.argeo.slc.unit
- test
-
-
-
-
-
server
@@ -90,18 +37,12 @@
maven-argeo-osgi-plugin
target/exec/server
+ server.properties
-
- org.springframework.osgi.extender,
- org.argeo.slc.server.hsqldb,
- org.argeo.slc.server.main,
- org.argeo.slc.ria
-
-
- ${basedir}/site;in=*;ex=pom.xml;ex=target,
+ file:${basedir}/log4j.properties
+
${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
- ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-
+
@@ -111,12 +52,46 @@
org.argeo.slc.dep
org.argeo.slc.dep.server
- ${project.version}
+ ${version.slc}
org.argeo.slc.server
org.argeo.slc.ria
+
+
+
+
+ server_jcr
+
+
+
+ org.argeo.maven.plugins
+ maven-argeo-osgi-plugin
+
+ target/exec/server
+ server_jcr.properties
+
+ file:${basedir}/log4j.properties
+
+ ${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
+
+
+
+
+
+
+
+
+ org.argeo.slc.dep
+ org.argeo.slc.dep.server
+ ${version.slc}
+
+
+ org.argeo.slc.server
+ org.argeo.slc.ria
+
+
@@ -128,17 +103,12 @@
maven-argeo-osgi-plugin
target/exec/agent
+ agent.properties
-
- org.springframework.osgi.extender,
- org.argeo.slc.support.equinox,
- org.argeo.slc.agent,
- org.argeo.slc.agent.jms
-
-
+
${basedir}/site;in=*;ex=pom.xml;ex=target,
${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-
+
@@ -148,36 +118,29 @@
org.argeo.slc.dep
org.argeo.slc.dep.agent
- ${project.version}
+ ${version.slc}
- org.argeo.slc.runtime
- org.argeo.slc.support.ant
- ${project.version}
+ org.argeo.slc.dep
+ org.argeo.slc.dep.agent.extras
+ ${version.slc}
- detached
+ slc_gis_position
org.argeo.maven.plugins
maven-argeo-osgi-plugin
- target/exec/detached
- true
+ target/exec/agent
+ slc_gis_position.properties
-
- org.springframework.osgi.extender,
- org.argeo.slc.detached,
- org.argeo.slc.demo.det
-
-
- ${basedir}/site;in=org.argeo.slc.demo.det;ex=pom.xml;ex=target,
- ${basedir}/site;in=org.argeo.slc.demo.log4j;ex=pom.xml;ex=target,
-
- org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
+
+ ${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
+
@@ -186,39 +149,32 @@
org.argeo.slc.dep
- org.argeo.slc.dep.detached
- ${project.version}
-
-
- net.sourceforge.mx4j
- com.springsource.mx4j
-
-
- org.eclipse.osgi
- org.eclipse.osgi
- 3.5.0.v20090311-1300
+ org.argeo.slc.dep.gis
+ ${version.slc}
- standalone
+ detached
org.argeo.maven.plugins
maven-argeo-osgi-plugin
- target/exec/agent
+ target/exec/detached
+ true
-
+
org.springframework.osgi.extender,
- org.argeo.slc.support.equinox,
- org.argeo.slc.agent
-
-
- ${basedir}/site;in=*;ex=pom.xml;ex=target,
- ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-
+ org.argeo.slc.detached,
+ org.argeo.slc.demo.det
+
+
+ ${basedir}/site;in=org.argeo.slc.demo.det;ex=pom.xml;ex=target,
+ ${basedir}/site;in=org.argeo.slc.demo.log4j;ex=pom.xml;ex=target,
+
+ org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
@@ -227,13 +183,16 @@
org.argeo.slc.dep
- org.argeo.slc.dep.agent
- ${project.version}
+ org.argeo.slc.dep.detached
+ ${version.slc}
+
+
+ net.sourceforge.mx4j
+ com.springsource.mx4j
- org.argeo.slc.runtime
- org.argeo.slc.support.ant
- ${project.version}
+ org.eclipse.osgi
+ org.eclipse.osgi
@@ -253,7 +212,7 @@
-->
-
+
org.argeo.dep.osgi.catalina.start,
org.springframework.osgi.extender,
org.springframework.osgi.web.extender,
@@ -265,7 +224,7 @@
org.argeo.slc.server.jms,
org.argeo.slc.webapp,
org.argeo.slc.ria
-
+
@@ -274,8 +233,7 @@
org.argeo.slc.dep
- org.argeo.slc.dep.server
- ${project.version}
+ ${version.slc}
org.argeo.slc.server