differenciate imported config fragments: update to https://issues.apache.org/activemq/browse/AMQ-1894

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@813011 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/release/conf/activemq.xml

@@ -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>

assembly/src/release/conf/camel.xml

@@ -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"

assembly/src/release/conf/jetty.xml

@@ -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>
+ </beans>

assembly/src/sample-conf/activemq-security.xml

@@ -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>
+</beans>