Separate agent modules

git-svn-id: https://svn.argeo.org/slc/trunk@2591 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/pom.xml b/demo/pom.xml
index 6e0b28bfc2099fc3b252b40add016bcc052b7164..6e5650069c76a41f166b90c1661c61fbdafef27b 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -136,11 +136,12 @@
                                                                <slc.osgi.start>
                                                                        org.springframework.osgi.extender,
                                                                        org.argeo.slc.support.equinox,
-                                                                       org.argeo.slc.agent
+                                                                       org.argeo.slc.agent,
+                                                                       org.argeo.slc.agent.jms
                                                                </slc.osgi.start>
                                                                <slc.osgi.bundles>
                                                                        ${basedir}/site;in=*;ex=pom.xml;ex=target,
-                                                                       ${basedir}/../server/org.argeo.slc.siteserver/bundles;in=org.argeo.slc.agent;ex=pom.xml;ex=target
+                                                                       ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
                                                                </slc.osgi.bundles>
                                                        </systemProperties>
                                                </configuration>

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 3951fbb4e126959bb5d26c871c514fde39a68529..b281c9acef8832688c7e20b7789cd52073c90be4 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -22,9 +22,10 @@
                                        </argsToAppend>
                                        <systemProperties>
                                                <slc.osgi.bundles>
-                                                       ${basedir}/../../demo/site;in=*;ex=target,
-                                                       ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*
-                                                               </slc.osgi.bundles>
+                                                       ${basedir}/../../demo/site;in=*;ex=target,ex=pom.xml,
+                                                       ${basedir}/../../server/org.argeo.slc.siteserver/bundles;in=*;ex=target,ex=pom.xml,
+                                                       ${basedir}/../../modules/agent;in=*;ex=target,ex=pom.xml
+                                               </slc.osgi.bundles>
                                                <slc.osgi.start>
                                                        org.springframework.osgi.extender,
                                                        org.argeo.slc.server.main,