Update ActiveMQ version

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

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/main.xml b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
index 91123fc9654ffbd5bc1d99c7a099a26f925371da..062a7aaf133b279df92c8cad8c11beb6b28e152f 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/main.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
@@ -7,12 +7,12 @@
        http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
 \r
-       <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" >\r
+       <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule">\r
                <property name="executionContext">\r
                        <ref bean="executionContext" />\r
-               </property>     \r
+               </property>\r
        </bean>\r
-               \r
+\r
        <bean id="main" parent="slcTemplate.simpleFlow">\r
                <constructor-arg>\r
                        <bean parent="slcTemplate.simpleSpec">\r
@@ -37,9 +37,18 @@
                </property>\r
        </bean>\r
 \r
+       <bean id="noArg" parent="slcTemplate.simpleFlow">\r
+               <property name="executables">\r
+                       <list>\r
+                               <bean parent="task.echo">\r
+                                       <property name="message" value="No rg!" />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
        <bean id="echo1" parent="task.echo" scope="execution">\r
-               <property name="message"\r
-                       value="From main! @{testKey}" />\r
+               <property name="message" value="From main! @{testKey}" />\r
                <aop:scoped-proxy />\r
        </bean>\r
 </beans>
\ No newline at end of file

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index fde306ff34a57751307569a44b80b196e07727a2..67cbe8968b58f170adf919b5bd0529c1526d34e1 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -19,7 +19,8 @@
                <version.tomcat>6.0.18</version.tomcat>
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.activemq>5.2.0.0005</version.activemq>
+               <version.activemq>5.2.0.0006</version.activemq>
+               <version.activemq-web>5.2.0.0005</version.activemq-web>
                <version.maven-argeo-osgi>0.1.7</version.maven-argeo-osgi>
        </properties>
        <scm>
@@ -764,7 +765,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-                               <version>${version.activemq}</version>
+                               <version>${version.activemq-web}</version>
                        </dependency>
 
                        <dependency>