Fix issue with the ordering of event on the server side.

[gpl/argeo-slc.git] / demo / pom.xml

diff --git a/demo/pom.xml b/demo/pom.xml
index 6f1eeaea0176556c22027e3d81fc3d81d18e5387..f2d0b19e9950939c0c6c13f411627fc8707fbaac 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -21,7 +21,7 @@
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <configuration>
                                        <systemProperties>
-                                               <slc.osgi.bundles>${basedir}/site;in=*;ex=**/.svn/**</slc.osgi.bundles>
+                                               <slc.osgi.bundles>${basedir}/site;in=*;ex=**/.svn/**,${basedir}/../server/org.argeo.slc.siteserver/bundles;in=*;ex=**/.svn/**</slc.osgi.bundles>
                                        </systemProperties>
                                </configuration>
                        </plugin>
@@ -58,10 +58,8 @@
                                                        <execDir>target/exec/server</execDir>
                                                        <jvmArgs>
                                                                <jvmArg>-Xmx256m</jvmArg>
-                                                               <!--
-                                                                       <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
-                                                               -->
                                                        </jvmArgs>
+                                                       <debug>0</debug>
                                                        <systemProperties>
                                                                <slc.osgi.start>
                                                                        org.argeo.dep.osgi.catalina.start,
@@ -74,11 +72,9 @@
                                                                        org.argeo.slc.server.services,
                                                                        org.argeo.slc.server.jms,
                                                                        org.argeo.slc.webapp,
-                                                                       org.argeo.slc.ria,
-                                                                       org.argeo.slc.support.equinox,
-                                                                       org.argeo.slc.demo.basic,
-                                                                       org.argeo.slc.demo.manager
+                                                                       org.argeo.slc.ria
                                                                </slc.osgi.start>
+                                                               <!--  <slc.osgiboot.debug>true</slc.osgiboot.debug>-->
                                                        </systemProperties>
                                                </configuration>
                                        </plugin>
@@ -94,13 +90,53 @@
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/agent</execDir>
+                                                       <jvmArgs>
+                                                               <jvmArg>-Xmx128m</jvmArg>
+                                                               <!--
+                                                                       <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8001</jvmArg>
+                                                               -->
+                                                       </jvmArgs>
                                                        <systemProperties>
                                                                <slc.osgi.start>
                                                                        org.springframework.osgi.extender,
                                                                        org.argeo.slc.support.equinox,
-                                                                       org.argeo.slc.demo.basic,
-                                                                       org.argeo.slc.demo.agent,
-                                                                       org.argeo.slc.demo.manager
+                                                                       org.argeo.slc.agent,
+                                                                       org.argeo.slc.demo.basic
+                                                               </slc.osgi.start>
+                                                       </systemProperties>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>server_mysql</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.slc.maven</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <configuration>
+                                                       <execDir>target/exec/server</execDir>
+                                                       <jvmArgs>
+                                                               <jvmArg>-Xmx256m</jvmArg>
+                                                               <!--
+                                                                       <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
+                                                               -->
+                                                       </jvmArgs>
+                                                       <systemProperties>
+                                                               <slc.osgi.start>
+                                                                       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.mysql,
+                                                                       org.argeo.slc.server.hibernate,
+                                                                       org.argeo.slc.server.services,
+                                                                       org.argeo.slc.server.jms,
+                                                                       org.argeo.slc.webapp,
+                                                                       org.argeo.slc.ria
                                                                </slc.osgi.start>
                                                        </systemProperties>
                                                </configuration>