activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r813011 - in /activemq/trunk/assembly/src: release/conf/activemq-camel.xml release/conf/activemq-jetty.xml release/conf/activemq.xml release/conf/camel.xml release/conf/jetty.xml sample-conf/activemq-security.xml
Date Wed, 09 Sep 2009 16:00:09 GMT
Author: gtully
Date: Wed Sep  9 16:00:09 2009
New Revision: 813011

URL: http://svn.apache.org/viewvc?rev=813011&view=rev
Log:
differenciate imported config fragments: update to https://issues.apache.org/activemq/browse/AMQ-1894

Added:
    activemq/trunk/assembly/src/release/conf/camel.xml
      - copied, changed from r812999, activemq/trunk/assembly/src/release/conf/activemq-camel.xml
    activemq/trunk/assembly/src/release/conf/jetty.xml
      - copied, changed from r812999, activemq/trunk/assembly/src/release/conf/activemq-jetty.xml
Removed:
    activemq/trunk/assembly/src/release/conf/activemq-camel.xml
    activemq/trunk/assembly/src/release/conf/activemq-jetty.xml
Modified:
    activemq/trunk/assembly/src/release/conf/activemq.xml
    activemq/trunk/assembly/src/sample-conf/activemq-security.xml

Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=813011&r1=813010&r2=813011&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Wed Sep  9 16:00:09 2009
@@ -105,13 +105,13 @@
         Uncomment to enable Camel
         Take a look at activemq-camel.xml for more details
          
-    <import resource="activemq-camel.xml"/>
+    <import resource="camel.xml"/>
     -->
 
     <!-- 
         Enable web consoles, REST and Ajax APIs and demos
         Take a look at activemq-jetty.xml for more details 
     -->
-    <import resource="activemq-jetty.xml"/>
+    <import resource="jetty.xml"/>
     
 </beans>

Copied: activemq/trunk/assembly/src/release/conf/camel.xml (from r812999, activemq/trunk/assembly/src/release/conf/activemq-camel.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/camel.xml?p2=activemq/trunk/assembly/src/release/conf/camel.xml&p1=activemq/trunk/assembly/src/release/conf/activemq-camel.xml&r1=812999&r2=813011&rev=813011&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq-camel.xml (original)
+++ activemq/trunk/assembly/src/release/conf/camel.xml Wed Sep  9 16:00:09 2009
@@ -23,7 +23,7 @@
     
     Include this file in your configuration to enable Camel
     
-    e.g. <import resource="activemq-camel.xml"/>
+    e.g. <import resource="camel.xml"/>
 -->
 <beans
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Copied: activemq/trunk/assembly/src/release/conf/jetty.xml (from r812999, activemq/trunk/assembly/src/release/conf/activemq-jetty.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?p2=activemq/trunk/assembly/src/release/conf/jetty.xml&p1=activemq/trunk/assembly/src/release/conf/activemq-jetty.xml&r1=812999&r2=813011&rev=813011&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq-jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Wed Sep  9 16:00:09 2009
@@ -18,7 +18,7 @@
     An embedded servlet engine for serving up the Admin consoles, REST and Ajax APIs and
some demos 
     Include this file in your configuration to enable ActiveMQ web components
     
-    e.g. <import resource="activemq-jetty.xml"/>
+    e.g. <import resource="jetty.xml"/>
 -->
 <beans>
     <jetty xmlns="http://mortbay.com/schemas/jetty/1.0">
@@ -33,4 +33,4 @@
             <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver"
logUrlOnStart="true"/>
         </handlers>
     </jetty>
- </beans>
\ No newline at end of file
+ </beans>

Modified: activemq/trunk/assembly/src/sample-conf/activemq-security.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/activemq-security.xml?rev=813011&r1=813010&r2=813011&view=diff
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/activemq-security.xml (original)
+++ activemq/trunk/assembly/src/sample-conf/activemq-security.xml Wed Sep  9 16:00:09 2009
@@ -88,7 +88,7 @@
   <commandAgent xmlns="http://activemq.apache.org/schema/core" brokerUrl="vm://localhost"
username="${activemq.username}" password="${activemq.password}"/>
 
   <!-- Use Web applications and Camel in secured broker environment -->
-  <import resource="activemq-jetty.xml"/>
-  <import resource="activemq-camel.xml"/>
+  <import resource="jetty.xml"/>
+  <import resource="camel.xml"/>
 
-</beans>
\ No newline at end of file
+</beans>



Mime
View raw message