From 5273aab54855faf0850db22c6f873211f41489f6 Mon Sep 17 00:00:00 2001
From: James Strachan <jstrachan@apache.org>
Date: Fri, 20 Feb 2009 14:54:54 +0000
Subject: [PATCH] First cut of AMQ-2131 adding the /camel web application to
 the ActiveMQ broker distro

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@746264 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                               | 11 ++++++++++-
 assembly/src/main/descriptors/common-bin.xml   |  8 ++++++++
 assembly/src/release/conf/activemq.xml         |  5 +++--
 assembly/src/release/example/conf/activemq.xml |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 19629c4b78..bdaca60847 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -104,6 +104,11 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jetty</artifactId>
     </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>
@@ -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>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 5c8b77dd4f..9f8e8dfda5 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -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>
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 596b6d4175..866e1a917a 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -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>
diff --git a/assembly/src/release/example/conf/activemq.xml b/assembly/src/release/example/conf/activemq.xml
index ddca8aace4..c40f67c3b4 100644
--- a/assembly/src/release/example/conf/activemq.xml
+++ b/assembly/src/release/example/conf/activemq.xml
@@ -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">