apache · chaojun-zhang · Mar 28, 2011 · Mar 28, 2011 · Mar 28, 2011 · Oct 11, 2011
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>

diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>

diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-camel</artifactId>

diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-core</artifactId>

diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-fileserver</artifactId>

diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>

diff --git a/activemq-jmdns_1.0/pom.xml b/activemq-jmdns_1.0/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>activemq-parent</artifactId>
     <groupId>org.apache.activemq</groupId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>activemq-jmdns_1.0</artifactId>

diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>

diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-optional</artifactId>

diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-pool</artifactId>

diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>

diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>

diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-run</artifactId>

diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-spring</artifactId>

diff --git a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-activemq-memtest-plugin</artifactId>

diff --git a/activemq-tooling/maven-activemq-perf-plugin/pom.xml b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>5.5.0</version>
+        <version>5.5-SNAPSHOT</version>
 	</parent>
 
     <artifactId>maven-activemq-perf-plugin</artifactId>

diff --git a/activemq-tooling/maven-activemq-plugin/pom.xml b/activemq-tooling/maven-activemq-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-activemq-plugin</artifactId>

diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>

diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>

diff --git a/activemq-web-console/src/main/webapp/404.html b/activemq-web-console/src/main/webapp/404.html
@@ -83,7 +83,6 @@
                                                 <p>What do you want to do next?</p>
                                                 <ul class="alternate" type="square"> 
                                                     <li><a title="Manage ActiveMQ broker" href="/admin/">Manage ActiveMQ broker</a></li> 
-                                                    <li><a title="Manage Camel instance" href="/camel/">Manage Camel instance</a></li> 
                                                     <li><a title="See some Web demos" href="/demo/">See some Web demos</a></li>  
                                                 </ul> 
                                     </div> 

diff --git a/activemq-web-console/src/main/webapp/500.html b/activemq-web-console/src/main/webapp/500.html
@@ -84,7 +84,6 @@
                                                 <p>What do you want to do next?</p>
                                                 <ul class="alternate" type="square"> 
                                                     <li><a title="Manage ActiveMQ broker" href="/admin/">Manage ActiveMQ broker</a></li> 
-                                                    <li><a title="Manage Camel instance" href="/camel/">Manage Camel instance</a></li> 
                                                     <li><a title="See some Web demos" href="/demo/">See some Web demos</a></li>  
                                                 </ul> 
                                     </div> 

diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>

diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>

diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-xmpp</artifactId>

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -22,23 +22,14 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
   <packaging>pom</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
 
-  <repositories>
-    <!-- for camel-web's jersey dependencies -->
-    <repository>
-      <id>java.net.maven2</id>
-      <name>java.net Maven 2 Repo</name>
-      <url>http://download.java.net/maven/2</url>
-    </repository>
-  </repositories>
-
   <dependencies>
 
     <!-- activemq -->
@@ -134,11 +125,6 @@
       <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>

diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
@@ -93,46 +93,6 @@
       </includes>
     </dependencySet>
 
-    <dependencySet>
-      <outputDirectory>/webapps/camel</outputDirectory>
-      <unpack>true</unpack>
-      <unpackOptions>
-        <excludes>
-          <exclude>**/applicationContext.xml</exclude>
-          <!-- ignore jars already in distro -->
-          <exclude>**/act*.jar</exclude>
-          <exclude>**/ant*.jar</exclude>
-          <exclude>**/aop*.jar</exclude>
-<!--
-          <exclude>**/asm*.jar</exclude>
--->
-          <exclude>**/camel-*.jar</exclude>
-          <exclude>**/commons*.jar</exclude>
-          <exclude>**/groovy*.jar</exclude>
-          <exclude>**/jackson*.jar</exclude>
-          <exclude>**/jaxb*.jar</exclude>
-          <exclude>**/jdom*.jar</exclude>
-          <exclude>**/jettison*.jar</exclude>
-          <exclude>**/jruby*.jar</exclude>
-          <exclude>**/jstl*.jar</exclude>
-          <exclude>**/rome*.jar</exclude>
-          <exclude>**/sitemesh*.jar</exclude>
-          <exclude>**/slf4j-*.jar</exclude>
-          <exclude>**/spring-*.jar</exclude>
-          <exclude>**/standard*.jar</exclude>
-          <exclude>**/stax*.jar</exclude>
-          <!-- exclude unused javascript  -->
-          <exclude>**/bespin/</exclude>
-          <exclude>**/dijit/</exclude>
-          <exclude>**/dojo/</exclude>
-          <exclude>**/dojox/</exclude>
-        </excludes>
-      </unpackOptions>
-      <includes>
-        <include>org.apache.camel:camel-web:war</include>
-      </includes>
-    </dependencySet>
-
     <dependencySet>
       <outputDirectory>/</outputDirectory>
       <unpack>false</unpack>

diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
@@ -127,7 +127,6 @@
 
     <!-- 
         Enable web consoles, REST and Ajax APIs and demos
-        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 
     -->

diff --git a/assembly/src/release/conf/camel.xml b/assembly/src/release/conf/camel.xml
@@ -25,11 +25,6 @@
 
     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"  

diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
@@ -53,11 +53,6 @@
                             <property name="resourceBase" value="${activemq.home}/webapps/admin" />
                             <property name="logUrlOnStart" value="true" />
                         </bean>
-                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
-                            <property name="contextPath" value="/camel" />
-                            <property name="resourceBase" value="${activemq.home}/webapps/camel" />
-                            <property name="logUrlOnStart" value="true" />
-                        </bean>
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/demo" />
                             <property name="resourceBase" value="${activemq.home}/webapps/demo" />

diff --git a/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml b/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,6 @@ @@
         <!--
             Enable web consoles, REST and Ajax APIs and demos
-            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
         -->
@@ Expand Down @@