camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1152210 - in /camel/trunk: examples/camel-example-jms-file/src/main/resources/META-INF/spring/ examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/ examples/camel-example-route-throttling/src/main/resources/META-INF/sp...
Date Fri, 29 Jul 2011 13:19:48 GMT
Author: davsclaus
Date: Fri Jul 29 13:19:46 2011
New Revision: 1152210

URL: http://svn.apache.org/viewvc?rev=1152210&view=rev
Log:
CAMEL-4282: Example and archetypes should enable JMX for ActiveMQ if used.

Modified:
    camel/trunk/examples/camel-example-jms-file/src/main/resources/META-INF/spring/camelContext.xml
    camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
    camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
    camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
    camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
    camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
    camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml

Modified: camel/trunk/examples/camel-example-jms-file/src/main/resources/META-INF/spring/camelContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/src/main/resources/META-INF/spring/camelContext.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jms-file/src/main/resources/META-INF/spring/camelContext.xml
(original)
+++ camel/trunk/examples/camel-example-jms-file/src/main/resources/META-INF/spring/camelContext.xml
Fri Jul 29 13:19:46 2011
@@ -26,7 +26,7 @@
          http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd">
 
   <!-- lets configure the ActiveMQ JMS broker server to listen on TCP 51616 -->
-  <broker:broker id="broker" useJmx="false" persistent="false" brokerName="localhost">
+  <broker:broker id="broker" useJmx="true" persistent="false" brokerName="localhost">
     <broker:transportConnectors>
       <broker:transportConnector name="tcp" uri="tcp://localhost:51616"/>
     </broker:transportConnectors>

Modified: camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++ camel/trunk/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
Fri Jul 29 13:19:46 2011
@@ -27,7 +27,7 @@
          http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd">
 
   <!-- This creates an embedded ActiveMQ Broker -->
-  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="false" persistent="false"
+  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="true" persistent="false"
           brokerName="myBroker" id="broker">
     <transportConnectors>
       <transportConnector uri="vm://myBroker"/>

Modified: camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++ camel/trunk/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
Fri Jul 29 13:19:46 2011
@@ -82,7 +82,7 @@
 
   </camelContext>
 
-  <broker:broker useJmx="false" persistent="true" brokerName="localhost" dataDirectory="target/data"
+  <broker:broker useJmx="true" persistent="true" brokerName="localhost" dataDirectory="target/data"
                  useShutdownHook="true">
     <broker:transportConnectors>
       <broker:transportConnector name="tcp" uri="tcp://localhost:51616"/>

Modified: camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
(original)
+++ camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
Fri Jul 29 13:19:46 2011
@@ -36,7 +36,7 @@
   <context:component-scan base-package="org.apache.camel.example.server"/>
 
   <!-- lets configure the ActiveMQ JMS broker server to listen on TCP 61610 -->
-  <broker:broker useJmx="false" persistent="false" brokerName="localhost">
+  <broker:broker useJmx="true" persistent="false" brokerName="myBroker">
     <broker:transportConnectors>
       <broker:transportConnector name="tcp" uri="tcp://localhost:61610"/>
     </broker:transportConnectors>

Modified: camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++ camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
Fri Jul 29 13:19:46 2011
@@ -47,7 +47,7 @@
 
   <!-- START SNIPPET: e4 -->
   <!-- lets configure the ActiveMQ JMS broker server to listen on TCP 61610 -->
-  <broker:broker useJmx="false" persistent="false" brokerName="localhost">
+  <broker:broker useJmx="true" persistent="false" brokerName="myBroker">
     <broker:transportConnectors>
       <broker:transportConnector name="tcp" uri="tcp://localhost:61610"/>
     </broker:transportConnectors>

Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
Fri Jul 29 13:19:46 2011
@@ -27,7 +27,7 @@
        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
   <!-- This creates an embedded ActiveMQ Broker -->
-  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="false" persistent="false">
+  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="true" persistent="false">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616" />
     </transportConnectors>
@@ -47,7 +47,6 @@
          routing on the messages using XPath. 
   -->
   <camelContext xmlns="http://camel.apache.org/schema/spring">
-    <package>${package}</package>
     <route>
       <from uri="file:src/data?noop=true"/>
       <to uri="activemq:personnel.records"/>

Modified: camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1152210&r1=1152209&r2=1152210&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Fri Jul 29 13:19:46 2011
@@ -28,7 +28,7 @@
     ">
 
   <!-- This creates an embedded ActiveMQ Broker -->
-  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="false" persistent="false">
+  <broker xmlns="http://activemq.apache.org/schema/core" useJmx="true" persistent="false">
     <transportConnectors>
       <transportConnector uri="tcp://localhost:61616" />
     </transportConnectors>



Mime
View raw message