Remove automated start of demo bundles

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

diff --git a/demo/agent.properties b/demo/agent.properties
index 1b05a55cbe31d3679042872459e5233919384b31..f2d47a389bcbc144f66e76dfa60914671308b07a 100644 (file)
--- a/demo/agent.properties
+++ b/demo/agent.properties
@@ -2,7 +2,10 @@ argeo.osgi.start=\
 org.springframework.osgi.extender,\
 org.argeo.slc.support.equinox,\
 org.argeo.slc.agent,\
-org.argeo.slc.agent.jms
+org.argeo.slc.agent.jms,\
+org.argeo.slc.demo.minimal,\
+org.argeo.slc.demo.basic,\
+org.argeo.slc.demo.ant                                         
 #org.argeo.slc.agent.jmx
 #com.sun.management.jmxremote=
 

diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
index 8142c1b1c2e73b0b6b16752d974c160156529bc6..2f66cde0105209095e3d053f976794c359244166 100644 (file)
--- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
+++ b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
@@ -4,14 +4,14 @@
        xsi:schemaLocation="http://www.springframework.org/schema/osgi  
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
        http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"><!--
 
        <bundle id="minimal" symbolic-name="org.argeo.slc.demo.minimal"
                action="start" />
        <bundle id="basic" symbolic-name="org.argeo.slc.demo.basic"
                action="start" />
        <bundle id="ant" symbolic-name="org.argeo.slc.demo.ant" action="start" />
-       <!--
+       --><!--
                <bundle id="maven" symbolic-name="org.argeo.slc.demo.maven"
                action="start" />
        -->

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index db113ebf1f3ab0b6211993f446837263ad24adfe..acbcbf47bb626001337007975e3dc7dba3e457a3 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -45,7 +45,10 @@
                                                        org.argeo.slc.server.main,
                                                        org.argeo.slc.ria,
                                                        org.argeo.slc.agent,
-                                                       org.argeo.slc.agent.jms                                                 
+                                                       org.argeo.slc.agent.jms,
+                                                       org.argeo.slc.demo.minimal,
+                                                       org.argeo.slc.demo.basic,
+                                                       org.argeo.slc.demo.ant                                          
                                                </argeo.osgi.start>
                                        </systemProperties>
                                </configuration>