From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 18 Jun 2010 08:26:34 +0000 (+0000)
Subject: Remove automated start of demo bundles
X-Git-Tag: argeo-slc-2.1.7~1283
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=eaddcedb8dd398ff64344a4d9527f9f52212f94a;p=gpl%2Fargeo-slc.git

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 1b05a55cb..f2d47a389 100644
--- 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 8142c1b1c..2f66cde01 100644
--- 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 db113ebf1..acbcbf47b 100644
--- 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>