You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/07/03 19:37:18 UTC
svn commit: r552926 - in /activemq/trunk: assembly/pom.xml
assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml
assembly/src/release/conf/activemq.xml
assembly/src/release/conf/log4j.properties pom.xml
Author: jstrachan
Date: Tue Jul 3 10:37:10 2007
New Revision: 552926
URL: http://svn.apache.org/viewvc?view=rev&rev=552926
Log:
added support for AMQ-1307 so that enterprise integration patterns can be used easily in the broker. For more help see the documentation: http://cwiki.apache.org/ACTIVEMQ/enterprise-integration-patterns.html
Modified:
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
activemq/trunk/assembly/src/release/conf/activemq.xml
activemq/trunk/assembly/src/release/conf/log4j.properties
activemq/trunk/pom.xml
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?view=diff&rev=552926&r1=552925&r2=552926
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Jul 3 10:37:10 2007
@@ -103,6 +103,24 @@
<optional>true</optional>
</dependency>
+ <!-- camel -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-activemq</artifactId>
+ </dependency>
+
<!-- commons -->
<dependency>
<groupId>commons-httpclient</groupId>
Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=552926&r1=552925&r2=552926
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Jul 3 10:37:10 2007
@@ -150,6 +150,12 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-web</include>
+
+ <!-- camel -->
+ <include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-spring</include>
+ <include>org.apache.camel:camel-jms</include>
+ <include>org.apache.camel:camel-activemq</include>
</includes>
</dependencySet>
<dependencySet>
@@ -207,6 +213,7 @@
<include>jdom:jdom</include>
</includes>
</dependencySet>
+
<!-- we cannot exclude stuff from inside the war...
Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=552926&r1=552925&r2=552926
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Jul 3 10:37:10 2007
@@ -155,6 +155,12 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-web</include>
+
+ <!-- camel -->
+ <include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-spring</include>
+ <include>org.apache.camel:camel-jms</include>
+ <include>org.apache.camel:camel-activemq</include>
</includes>
</dependencySet>
<dependencySet>
@@ -215,5 +221,6 @@
<include>jdom:jdom</include>
</includes>
</dependencySet>
+
</dependencySets>
</assembly>
Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?view=diff&rev=552926&r1=552925&r2=552926
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Tue Jul 3 10:37:10 2007
@@ -15,7 +15,13 @@
limitations under the License.
-->
<!-- START SNIPPET: example -->
-<beans>
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.org/config/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
<!-- Allows us to use system properties as variables in this configuration file -->
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -86,6 +92,26 @@
-->
</broker>
+
+ <!--
+ ** Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
+ ** For more details see
+ **
+ ** http://activemq.apache.org/enterprise-integration-patterns.html
+ -->
+ <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring" packages="org.foo.bar">
+<!--
+ Create EIP routes here using Spring if we like; otherwise Camel will pick up all routes defined
+ in the package named 'org.foo.bar' or any of its child packages
+
+ <route>
+ <from uri="activemq:com.acme.MyQueue"/>
+ <to uri="activemq:com.acme.SomeOtherQueue"/>
+ </route>
+-->
+ </camelContext>
+
+
<!-- lets create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
<commandAgent xmlns="http://activemq.org/config/1.0"/>
Modified: activemq/trunk/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/log4j.properties?view=diff&rev=552926&r1=552925&r2=552926
==============================================================================
--- activemq/trunk/assembly/src/release/conf/log4j.properties (original)
+++ activemq/trunk/assembly/src/release/conf/log4j.properties Tue Jul 3 10:37:10 2007
@@ -25,7 +25,14 @@
# When debugging or reporting problems to the ActiveMQ team,
# comment out the above lines and uncomment the next.
+
#log4j.rootLogger=DEBUG, out, stdout
+
+# Or for more fine grained debug logging uncomment one of these
+#log4j.logger.org.apache.activemq=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
+
+
#The logging properties used during tests..
# CONSOLE appender not used by default
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?view=diff&rev=552926&r1=552925&r2=552926
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Jul 3 10:37:10 2007
@@ -36,6 +36,7 @@
<aopalliance-version>1.0</aopalliance-version>
<axion-version>1.0-M3-dev</axion-version>
<axis-version>1.2-RC1</axis-version>
+ <camel-version>1.0.0</camel-version>
<cglib-version>2.0</cglib-version>
<commons-beanutils-version>1.6.1</commons-beanutils-version>
<commons-collections-version>3.1</commons-collections-version>
@@ -371,6 +372,29 @@
<!-- =============================== -->
<!-- Optional dependencies -->
<!-- =============================== -->
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jms</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-activemq</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
+
+
<!-- for custom XML parsing -->
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -418,7 +442,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0</version>
+ <version>2.0.6</version>
<optional>true</optional>
<exclusions>
<exclusion>