Author: jstrachan
Date: Fri Feb 20 14:54:54 2009
New Revision: 746264
URL: http://svn.apache.org/viewvc?rev=746264&view=rev
Log:
First cut of AMQ-2131 adding the /camel web application to the ActiveMQ broker
distro
Modified:
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/assembly/src/release/conf/activemq.xml
activemq/trunk/assembly/src/release/example/conf/activemq.xml
Modified: activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=746264&r1=746263&r2=746264&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Fri Feb 20 14:54:54 2009
@@ -106,6 +106,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
</dependency>
<!-- for the XML parsing -->
@@ -117,7 +122,11 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
<!-- commons -->
<dependency>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=746264&r1=746263&r2=746264&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Fri Feb 20
14:54:54 2009
@@ -83,6 +83,14 @@
<include>${pom.groupId}:activemq-run</include>
</includes>
</dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/webapps/camel</outputDirectory>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.apache.camel:camel-web:war</include>
+ </includes>
+ </dependencySet>
<dependencySet>
<outputDirectory>/</outputDirectory>
Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=746264&r1=746263&r2=746264&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Fri Feb 20 14:54:54
2009
@@ -21,7 +21,7 @@
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.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
+ http://camel.apache.org/schema/spring
http://camel.apache.org/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">
@@ -119,7 +119,7 @@
**
** http://activemq.apache.org/enterprise-integration-patterns.html
-->
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <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>
@@ -164,6 +164,7 @@
<handlers>
<webAppContext contextPath="/admin"
resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true"/>
+ <webAppContext contextPath="/camel"
resourceBase="${activemq.base}/webapps/camel" logUrlOnStart="true"/>
<webAppContext contextPath="/demo"
resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true"/>
<webAppContext contextPath="/fileserver"
resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true"/>
</handlers>
Modified: activemq/trunk/assembly/src/release/example/conf/activemq.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/example/conf/activemq.xml?rev=746264&r1=746263&r2=746264&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/example/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/example/conf/activemq.xml Fri Feb 20
14:54:54 2009
@@ -21,7 +21,7 @@
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.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
<broker xmlns="http://activemq.apache.org/schema/core"; useJmx="false">
