activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1182365 - in /activemq/branches/activemq-5.4: ./ activemq-web-console/src/main/webapp/ assembly/ assembly/src/main/descriptors/ assembly/src/release/conf/ assembly/src/release/webapps/ assembly/src/release/webapps/camel/WEB-INF/ assembly/s...
Date Wed, 12 Oct 2011 13:51:38 GMT
Author: chirino
Date: Wed Oct 12 13:51:37 2011
New Revision: 1182365

URL: http://svn.apache.org/viewvc?rev=1182365&view=rev
Log:
Merge rev 1181860 from trunk: AMQ-3491 - Investigate and resolve LGPL dependency via camel-web.
Removing camel-web dependency due to its downstream lgpl dep. We can bring it back in if/when
it is cleaned up.

Removed:
    activemq/branches/activemq-5.4/assembly/src/release/webapps/camel/WEB-INF/applicationContext.xml
    activemq/branches/activemq-5.4/assembly/src/release/webapps/camel/js/dojo/dojo.js
Modified:
    activemq/branches/activemq-5.4/   (props changed)
    activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/404.html
    activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/500.html
    activemq/branches/activemq-5.4/assembly/pom.xml
    activemq/branches/activemq-5.4/assembly/src/main/descriptors/common-bin.xml
    activemq/branches/activemq-5.4/assembly/src/release/conf/activemq.xml
    activemq/branches/activemq-5.4/assembly/src/release/conf/camel.xml
    activemq/branches/activemq-5.4/assembly/src/release/conf/jetty.xml
    activemq/branches/activemq-5.4/assembly/src/release/webapps/index.html
    activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
  (props changed)
    activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
  (props changed)
    activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
  (props changed)
    activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
  (props changed)
    activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
  (props changed)
    activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
  (props changed)
    activemq/branches/activemq-5.4/pom.xml

Propchange: activemq/branches/activemq-5.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 12 13:51:37 2011
@@ -0,0 +1,2 @@
+/activemq/branches/activemq-5.5:1181896
+/activemq/trunk:1181860

Modified: activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/404.html
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/404.html?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/404.html (original)
+++ activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/404.html Wed Oct 12
13:51:37 2011
@@ -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> 

Modified: activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/500.html
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/500.html?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/500.html (original)
+++ activemq/branches/activemq-5.4/activemq-web-console/src/main/webapp/500.html Wed Oct 12
13:51:37 2011
@@ -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> 

Modified: activemq/branches/activemq-5.4/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/assembly/pom.xml?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/assembly/pom.xml (original)
+++ activemq/branches/activemq-5.4/assembly/pom.xml Wed Oct 12 13:51:37 2011
@@ -30,15 +30,6 @@
   <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 -->
@@ -136,11 +127,6 @@
     </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 -->

Modified: activemq/branches/activemq-5.4/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/assembly/src/main/descriptors/common-bin.xml?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/branches/activemq-5.4/assembly/src/main/descriptors/common-bin.xml Wed Oct 12
13:51:37 2011
@@ -94,46 +94,6 @@
     </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>
       <scope>runtime</scope>

Modified: activemq/branches/activemq-5.4/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/assembly/src/release/conf/activemq.xml?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/assembly/src/release/conf/activemq.xml (original)
+++ activemq/branches/activemq-5.4/assembly/src/release/conf/activemq.xml Wed Oct 12 13:51:37
2011
@@ -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 
     -->

Modified: activemq/branches/activemq-5.4/assembly/src/release/conf/camel.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/assembly/src/release/conf/camel.xml?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/assembly/src/release/conf/camel.xml (original)
+++ activemq/branches/activemq-5.4/assembly/src/release/conf/camel.xml Wed Oct 12 13:51:37
2011
@@ -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"  

Modified: activemq/branches/activemq-5.4/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/assembly/src/release/conf/jetty.xml?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/assembly/src/release/conf/jetty.xml (original)
+++ activemq/branches/activemq-5.4/assembly/src/release/conf/jetty.xml Wed Oct 12 13:51:37
2011
@@ -54,11 +54,6 @@
                             <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"
/>
                             <property name="logUrlOnStart" value="true" />

Modified: activemq/branches/activemq-5.4/assembly/src/release/webapps/index.html
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/assembly/src/release/webapps/index.html?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/assembly/src/release/webapps/index.html (original)
+++ activemq/branches/activemq-5.4/assembly/src/release/webapps/index.html Wed Oct 12 13:51:37
2011
@@ -91,7 +91,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> 

Propchange: activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.4/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
            ('svn:mergeinfo' removed)

Modified: activemq/branches/activemq-5.4/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.4/pom.xml?rev=1182365&r1=1182364&r2=1182365&view=diff
==============================================================================
--- activemq/branches/activemq-5.4/pom.xml (original)
+++ activemq/branches/activemq-5.4/pom.xml Wed Oct 12 13:51:37 2011
@@ -435,12 +435,6 @@
         <artifactId>camel-jms</artifactId>
         <version>${camel-version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-web</artifactId>
-        <version>${camel-version}</version>
-        <type>war</type>
-      </dependency>
 
       <dependency>
         <groupId>org.osgi</groupId>
@@ -1173,7 +1167,6 @@
             <!-- activemq-xmpp schemas -->
             <exclude>**/resources/*.xsd</exclude>
             <!-- web, web-console, web-demo files -->
-            <exclude>**/webapps/camel/js/dojo/dojo.js</exclude>
             <exclude>**/webapp/js/dojo.js</exclude>
             <exclude>**/webapp/js/jquery-*.js</exclude>
             <exclude>**/webapp/js/prototype.js</exclude>



Mime
View raw message