activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject git commit: Fixing up the user-guid.html that is part of the distro to reflect changed paths. Moving the camel.xml to the examples conf dir.
Date Fri, 11 Oct 2013 14:01:34 GMT
Updated Branches:
  refs/heads/trunk ee0933c71 -> 5b5133c28


Fixing up the user-guid.html that is part of the distro to reflect changed paths.  Moving
the camel.xml to the examples conf dir.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5b5133c2
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5b5133c2
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5b5133c2

Branch: refs/heads/trunk
Commit: 5b5133c28b98b3715fe955bd18d9481035a3f42c
Parents: ee0933c
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Fri Oct 11 10:01:10 2013 -0400
Committer: Hiram Chirino <hiram@hiramchirino.com>
Committed: Fri Oct 11 10:01:28 2013 -0400

----------------------------------------------------------------------
 assembly/src/release/conf/camel.xml          | 63 -----------------------
 assembly/src/release/docs/user-guide.html    | 10 ++--
 assembly/src/release/examples/conf/camel.xml | 63 +++++++++++++++++++++++
 3 files changed, 68 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/5b5133c2/assembly/src/release/conf/camel.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/camel.xml b/assembly/src/release/conf/camel.xml
deleted file mode 100644
index 2347891..0000000
--- a/assembly/src/release/conf/camel.xml
+++ /dev/null
@@ -1,63 +0,0 @@
- <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!-- 
-
-    Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
-    For more information, see:
-    
-    http://camel.apache.org
-    
-    Include this file in your configuration to enable Camel
-    
-    e.g. <import resource="camel.xml"/>
-    
--->
-<beans
-   xmlns="http://www.springframework.org/schema/beans"  
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-     http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  
-    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-
-        <!-- You can use Spring XML syntax to define the routes here using the <route>
element -->
-        <route>
-            <description>Example Camel Route</description>
-            <from uri="activemq:example.A"/>
-            <to uri="activemq:example.B"/>
-        </route>
-    </camelContext>
-
-    <!--
-       Lets configure some Camel endpoints
-    
-       http://camel.apache.org/components.html
-    -->
-
-    <!-- configure the camel activemq component to use the current broker -->
-    <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent"
>
-        <property name="connectionFactory">
-          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-            <property name="brokerURL" value="vm://amq-broker?create=false"/>
-            <property name="userName" value="${activemq.username}"/>
-            <property name="password" value="${activemq.password}"/>
-          </bean>
-        </property>
-    </bean>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/activemq/blob/5b5133c2/assembly/src/release/docs/user-guide.html
----------------------------------------------------------------------
diff --git a/assembly/src/release/docs/user-guide.html b/assembly/src/release/docs/user-guide.html
index b8d31c2..1564a03 100755
--- a/assembly/src/release/docs/user-guide.html
+++ b/assembly/src/release/docs/user-guide.html
@@ -98,13 +98,13 @@ If you're using Windows, just type
 </p>
 <pre>
     cd bin
-    activemq.bat console xbean:conf/activemq-demo.xml
+    activemq.bat console xbean:examples/conf/activemq-demo.xml
 </pre>
 <p>
 On Unix-like systems, type
 </p>
 <pre>
-    ./bin/activemq console xbean:conf/activemq-demo.xml
+    ./bin/activemq console xbean:examples/conf/activemq-demo.xml
 </pre>
 
 In a web browser you can access the url <a href="http://0.0.0.0:8161/demo">http://0.0.0.0:8161/demo</a>
to access the ActiveMQ web demos.
@@ -144,7 +144,7 @@ To test this is all working, try typing
 
 <pre>
     java -version
-    cd example
+    cd examples/openwire/swissarmy
     ant -version
 </pre>
 
@@ -155,7 +155,7 @@ Once you've got Java and Ant installed correctly you should be able to
run
 </p>
 
 <pre>
-    cd example
+    cd examples/openwire/swissarmy
     ant consumer
 </pre>
 
@@ -164,7 +164,7 @@ and in another shell
 </p>
 
 <pre>
-    cd example
+    cd examples/openwire/swissarmy
     ant producer
 </pre>
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/5b5133c2/assembly/src/release/examples/conf/camel.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/conf/camel.xml b/assembly/src/release/examples/conf/camel.xml
new file mode 100644
index 0000000..2347891
--- /dev/null
+++ b/assembly/src/release/examples/conf/camel.xml
@@ -0,0 +1,63 @@
+ <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!-- 
+
+    Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
+    For more information, see:
+    
+    http://camel.apache.org
+    
+    Include this file in your configuration to enable Camel
+    
+    e.g. <import resource="camel.xml"/>
+    
+-->
+<beans
+   xmlns="http://www.springframework.org/schema/beans"  
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="
+     http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+  
+    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+        <!-- You can use Spring XML syntax to define the routes here using the <route>
element -->
+        <route>
+            <description>Example Camel Route</description>
+            <from uri="activemq:example.A"/>
+            <to uri="activemq:example.B"/>
+        </route>
+    </camelContext>
+
+    <!--
+       Lets configure some Camel endpoints
+    
+       http://camel.apache.org/components.html
+    -->
+
+    <!-- configure the camel activemq component to use the current broker -->
+    <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent"
>
+        <property name="connectionFactory">
+          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+            <property name="brokerURL" value="vm://amq-broker?create=false"/>
+            <property name="userName" value="${activemq.username}"/>
+            <property name="password" value="${activemq.password}"/>
+          </bean>
+        </property>
+    </bean>
+
+</beans>


Mime
View raw message