X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=demo%2Fpom.xml;h=67cee7228d3308c8582c8b074dcd7be45f314108;hb=2491290303da15a1ff1f8b56348ad06481646a0e;hp=27e7888d0c0b3df08b22024ab2689631e4becd5a;hpb=719f374a748e531ae706115252978e06ad72c308;p=gpl%2Fargeo-slc.git
diff --git a/demo/pom.xml b/demo/pom.xml
index 27e7888d0..67cee7228 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -3,109 +3,46 @@
org.argeo.slc
argeo-slc
- 0.11.4-SNAPSHOT
+ 0.13.1-SNAPSHOT
..
org.argeo.slc
demo
pom
- Argeo SLC Demo Deploy
+ SLC Demo
site
- org.argeo.slc.maven
+ org.argeo.maven.plugins
maven-argeo-osgi-plugin
${version.maven-argeo-osgi}
-clean
-
- ${basedir}/site;in=*;ex=**/.svn/**,${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=**/.svn/**
-
-
- 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.support.equinox
-
-
- org.argeo.slc.runtime
- org.argeo.slc.osgiboot
-
-
-
server
- org.argeo.slc.maven
+ org.argeo.maven.plugins
maven-argeo-osgi-plugin
target/exec/server
-
- -Xmx256m
-
- 0
+ server.properties
-
- 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
-
-
+ file:${basedir}/log4j.properties
+
+ ${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
+
@@ -115,8 +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
+
+
@@ -124,23 +99,82 @@
- org.argeo.slc.maven
+ org.argeo.maven.plugins
maven-argeo-osgi-plugin
target/exec/agent
-
- -Xmx128m
-
-
+ agent.properties
+
+
+ ${basedir}/site;in=*;ex=pom.xml;ex=target,
+ ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
+
+
+
+
+
+
+
+
+ org.argeo.slc.dep
+ org.argeo.slc.dep.agent
+ ${version.slc}
+
+
+ org.argeo.slc.dep
+ org.argeo.slc.dep.agent.extras
+ ${version.slc}
+
+
+
+
+ slc_gis_position
+
+
+
+ org.argeo.maven.plugins
+ maven-argeo-osgi-plugin
+
+ target/exec/agent
+ slc_gis_position.properties
-
+
+ ${basedir}/../modules/gis;in=*;ex=pom.xml;ex=target
+
+
+
+
+
+
+
+
+ org.argeo.slc.dep
+ org.argeo.slc.dep.gis
+ ${version.slc}
+
+
+
+
+ detached
+
+
+
+ org.argeo.maven.plugins
+ maven-argeo-osgi-plugin
+
+ target/exec/detached
+ true
+
+
org.springframework.osgi.extender,
- org.argeo.slc.support.equinox,
- org.argeo.slc.agent,
- org.argeo.slc.demo.basic
-
+ 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
@@ -149,8 +183,16 @@
org.argeo.slc.dep
- org.argeo.slc.dep.server
- ${project.version}
+ org.argeo.slc.dep.detached
+ ${version.slc}
+
+
+ net.sourceforge.mx4j
+ com.springsource.mx4j
+
+
+ org.eclipse.osgi
+ org.eclipse.osgi
@@ -159,7 +201,7 @@
- org.argeo.slc.maven
+ org.argeo.maven.plugins
maven-argeo-osgi-plugin
target/exec/server
@@ -170,7 +212,7 @@
-->
-
+
org.argeo.dep.osgi.catalina.start,
org.springframework.osgi.extender,
org.springframework.osgi.web.extender,
@@ -182,7 +224,7 @@
org.argeo.slc.server.jms,
org.argeo.slc.webapp,
org.argeo.slc.ria
-
+
@@ -191,8 +233,11 @@
org.argeo.slc.dep
- org.argeo.slc.dep.server
- ${project.version}
+ ${version.slc}
+
+
+ org.argeo.slc.server
+ org.argeo.slc.ria