You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/09/06 15:28:49 UTC
svn commit: r993024 - in /activemq/trunk/assembly/src/release:
conf/activemq.xml conf/camel.xml webapps/camel/WEB-INF/applicationContext.xml
Author: dejanb
Date: Mon Sep 6 13:28:49 2010
New Revision: 993024
URL: http://svn.apache.org/viewvc?rev=993024&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2203 - duplication of camel config
Modified:
activemq/trunk/assembly/src/release/conf/activemq.xml
activemq/trunk/assembly/src/release/conf/camel.xml
activemq/trunk/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=993024&r1=993023&r2=993024&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Mon Sep 6 13:28:49 2010
@@ -125,15 +125,10 @@
</broker>
<!--
- Uncomment to enable Camel
- Take a look at activemq-camel.xml for more details
-
- <import resource="camel.xml"/>
- -->
-
- <!--
Enable web consoles, REST and Ajax APIs and demos
- Take a look at activemq-jetty.xml for more details
+ It also includes Camel (with its web console), see ${ACTIVEMQ_HOME}/conf/camel.xml for more info
+
+ Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
-->
<import resource="jetty.xml"/>
Modified: activemq/trunk/assembly/src/release/conf/camel.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/camel.xml?rev=993024&r1=993023&r2=993024&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/camel.xml (original)
+++ activemq/trunk/assembly/src/release/conf/camel.xml Mon Sep 6 13:28:49 2010
@@ -24,6 +24,12 @@
Include this file in your configuration to enable Camel
e.g. <import resource="camel.xml"/>
+
+ Note: this configuration is already included in a default configuration via Camel Web Console.
+ See ${ACTIVEMQ_HOME}/conf/jetty.xml for more info on how to disable it, in case you want to do so.
+ Also check ${ACTIVEMQ_HOME}/webapps/camel/WEB-INF/application-context.xml to see how this config is included in Camel Web Console
+
+
-->
<beans
xmlns="http://www.springframework.org/schema/beans"
Modified: activemq/trunk/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml?rev=993024&r1=993023&r2=993024&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml (original)
+++ activemq/trunk/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml Mon Sep 6 13:28:49 2010
@@ -31,33 +31,7 @@
<value>file:${activemq.base}/conf/credentials.properties</value>
</property>
</bean>
-
- <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
- <!-- You can use a <package> element for each root package to search for Java routes -->
- <package>org.foo.bar</package>
-
- <!-- You can use Spring XML syntax to define the routes here using the <route> element -->
- <route>
- <from uri="activemq:example.A"/>
- <to uri="activemq:example.B"/>
- </route>
- </camelContext>
-
- <!--
- Lets configure some Camel endpoints
- http://activemq.apache.org/camel/components.html
- -->
-
- <!-- configure the camel activemq component to use the current broker -->
- <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent" >
- <property name="connectionFactory">
- <bean class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="vm://localhost?create=false&waitForStart=10000" />
- <property name="userName" value="${activemq.username}"/>
- <property name="password" value="${activemq.password}"/>
- </bean>
- </property>
- </bean>
+ <import resource="file:${activemq.base}/conf/camel.xml"/>
+
</beans>