Repository: activemq-6
Updated Branches:
  refs/heads/master 1ae6f5da3 -> 8af60b10a


fixed example readme


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

Branch: refs/heads/master
Commit: 40ba4aed2f91eff068100f9f52b5499fd1731b74
Parents: 1ae6f5d
Author: Andy Taylor <[email protected]>
Authored: Mon Mar 9 10:19:47 2015 +0000
Committer: Andy Taylor <[email protected]>
Committed: Mon Mar 9 11:33:57 2015 +0000

----------------------------------------------------------------------
 .../src/main/resources/examples/index.html      |  40 ++++++
 activemq-website/src/main/resources/index.html  |   2 +-
 .../activemq/src/main/resources/README.html     |   2 +-
 .../src/main/resources/examples/index.html      | 122 -------------------
 4 files changed, 42 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/40ba4aed/activemq-website/src/main/resources/examples/index.html
----------------------------------------------------------------------
diff --git a/activemq-website/src/main/resources/examples/index.html 
b/activemq-website/src/main/resources/examples/index.html
new file mode 100644
index 0000000..a8ae835
--- /dev/null
+++ b/activemq-website/src/main/resources/examples/index.html
@@ -0,0 +1,40 @@
+<!--
+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.
+-->
+
+<h1>Apache ActiveMQ Examples</h1>
+<h2>JMS Examples</h2>
+<p>Apache ActiveMQ comes with over 90 runnable examples. These can be found in 
the examples directory in the root of the 
+distribution folder. There are examples covering JMS as well as all the 
protocols and functionality that Apache ActiveMQ 
+supports.</p>
+
+<p>Each example has its own instructions as to how they can be run, but for 
most of them it is as simple as running 
+<code>mvn verify -Pexample</code> from the example directory. This will start 
a broker with the correct configuration, run the
+example and then stop the broker.  You'll need to ensure there is not a broker 
already running as this may conflict
+with the broker that is configured and used in the example.</p>
+
+<p>If you want to run an example against an already running broker then 
firstly you will need to start the broker using
+the example configuration. An example configuration is provided which by 
default to run the queue example, to run this
+use the command  <code>./activemq run --config 
xml:../config/examples/bootstrap.xml</code>.
+
+Once the server has started run the example with the command <code>mvn 
-DskipBrokerStart verify -Pexample</code>. If you want
+to run a different example simply edit the 
<code>config/examples/bootstrap.xml</code> aand change the paths to point
+the correct configuration (this will be found in the directory of the example 
you wish to run). By default the broker
+will use the <code>data/server0</code> directory for the journal, to avoid 
problems it is best to delete this
+directory between running different examples or set the 
<code>ACTIVEMQ_DATA_DIR</code> environment property in
+<code>activemq.conf</code>to use a different location</p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/40ba4aed/activemq-website/src/main/resources/index.html
----------------------------------------------------------------------
diff --git a/activemq-website/src/main/resources/index.html 
b/activemq-website/src/main/resources/index.html
index dd403f5..c3d9fc9 100644
--- a/activemq-website/src/main/resources/index.html
+++ b/activemq-website/src/main/resources/index.html
@@ -52,7 +52,7 @@
         <ul>
             <li><a target="_blank" href="api/index.html">API</a></li>
             <li><a target="_blank" href="user-manual/index.html">User 
Manual</a></li>
-            <li><a href="../examples/index.html">Examples</a></li>
+            <li><a href="examples/index.html">Examples</a></li>
         </ul>
         <div></div>
     </div>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/40ba4aed/distribution/activemq/src/main/resources/README.html
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/README.html 
b/distribution/activemq/src/main/resources/README.html
index 8e41d4f..f0c0503 100644
--- a/distribution/activemq/src/main/resources/README.html
+++ b/distribution/activemq/src/main/resources/README.html
@@ -59,7 +59,7 @@ $ ./activemq stop</br></br>
 
 The broker comes shipped with an in depth user manual and a bunch of examples 
to help you get started.  The manual is accessible from the broker website.  
Start the broker then navigate to the <a href="http://localhost:8161";>Apache 
ActiveMQ</a>.</br></br>
 
-The examples are shipped inside the distribution folder under "examples": <a 
href="./examples/index.html">Apache ActiveMQ Examples</a>.</br></br>
+The examples are shipped inside the distribution folder under 
"examples"</br></br>
 
 <h2>Release Notes - ActiveMQ 6.0.0</h2>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/40ba4aed/distribution/activemq/src/main/resources/examples/index.html
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/examples/index.html 
b/distribution/activemq/src/main/resources/examples/index.html
deleted file mode 100644
index 6e1abf8..0000000
--- a/distribution/activemq/src/main/resources/examples/index.html
+++ /dev/null
@@ -1,122 +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.
--->
-
-<h1>Apache ActiveMQ Examples</h1>
-<h2>JMS Examples</h2>
-<p>Each example has its own instructions as to how they can be run, but for 
most of them it is as simple as running
-    <code>mvn verify -Pexample</code> from the example directory. This will 
start a broker with the correct configuration, run the
-example and then stop the server so you will need to make sure there is not a 
broker already running</p>
-<p>If you want to run an example against an already running broker then 
firstly you will need to start the broker to use
-the examples configuration. An example configuration is provided which by 
default to run the queue example, to run this
-use the command <code>./activemq run --config 
xml:../config/examples/bootstrap.xml</code>. Once the server has started run the
-example with the command <code>mvn -DskipBrokerStart verify</code>. If you 
want to run a different example simply edit the
-<code>config/examples/bootstrap.xml</code> and change the paths. By default 
the broker will use the <code>data/server0</code>
-directory for the journal, to avoid problems it is best to delete this 
directory between running different examples or
-set the <code>ACTIVEMQ_DATA_DIR</code> environment property in 
<code>activemq.conf</code>to use a different location</p>
-   <ol>
-       <li><a href="./jms/aerogear/readme.html">AeroGear Example</a></li>
-       <li><a 
href="./jms/application-layer-failover/readme.html">Application-Layer Failover 
Example</a></li>
-       <li><a href="./jms/bridge/readme.html">Core Bridge Example</a></li>
-       <li><a href="./jms/browser/readme.html">JMS QueueBrowser 
Example</a></li>
-       <li><a href="./jms/client-kickoff/readme.html">Client Kickoff 
Example</a></li>
-       <li><a href="./jms/client-side-failoverlistener/readme.html">Client 
Side FailoverListener Example</a></li>
-       <li><a href="./jms/client-side-load-balancing/readme.html">JMS 
Client-Side Load-Balancing Example</a></li>
-       <li><a href="./jms/clustered-durable-subscription/readme.html">JMS 
Durable Subscription  Example</a></li>
-       <li><a href="./jms/clustered-grouping/readme.html">JMS Clustered 
Grouping  Example</a></li>
-       <li><a href="./jms/clustered-jgroups/readme.html">ActiveMQ Clustering 
with JGroups Example</a></li>
-       <li><a href="./jms/clustered-queue/readme.html">JMS Load Balanced 
Clustered Queue Example</a></li>
-       <li><a href="./jms/clustered-standalone/readme.html">JMS Clustered 
Stand-alone Example</a></li>
-       <li><a href="./jms/clustered-static-discovery/readme.html">JMS Load 
Balanced Static Clustered Queue Example</a></li>
-       <li><a href="./jms/clustered-static-oneway/readme.html">JMS Load 
Balanced Static Clustered One Way Queue Example</a></li>
-       <li><a href="./jms/clustered-topic/readme.html">JMS Clustered Topic 
Example</a></li>
-       <li><a href="./jms/colocated-failover/readme.html">JMS Colocated 
Failover Shared Store Example</a></li>
-       <li><a href="./jms/colocated-failover-scale-down/readme.html">JMS 
Colocated Failover Recover Only Example</a></li>
-       <li><a href="./jms/consumer-rate-limit/readme.html">JMS Message 
Consumer Rate Limiting Example</a></li>
-       <li><a href="./jms/dead-letter/readme.html">Dead Letter Example</a></li>
-       <li><a href="./jms/delayed-redelivery/readme.html">Delayed Redelivery 
Example</a></li>
-       <li><a href="./jms/divert/readme.html">Divert Example</a></li>
-       <li><a href="./jms/durable-subscription/readme.html">JMS Durable 
Subscription Example</a></li>
-       <li><a href="./jms/embedded/readme.html">Embedded JMS Server 
Example</a></li>
-       <li><a href="./jms/embedded-simple/readme.html">Embedded JMS Server 
Example</a></li>
-       <li><a href="./jms/expiry/readme.html">JMS Expiration Example</a></li>
-       <li><a href="./jms/ha-policy-autobackup/readme.html">Auto-backup 
Example</a></li>
-       <li><a href="./jms/http-transport/readme.html">JMS HTTP Example</a></li>
-       <li><a href="./jms/instantiate-connection-factory/readme.html">JMS 
Instantiate Connection Factory Example</a></li>
-       <li><a href="./jms/interceptor/readme.html">JMS Interceptor 
Example</a></li>
-       <li><a href="./jms/jms-auto-closeable/readme.html">JMS Auto Closable  
Example</a></li>
-       <li><a href="./jms/jms-bridge/readme.html">JMS Bridge Example</a></li>
-       <li><a href="./jms/jms-completion-listener/readme.html">JMS Completion 
Listener Example</a></li>
-       <li><a href="./jms/jms-context/readme.html">JMS Context Example</a></li>
-       <li><a href="./jms/jms-shared-consumer/readme.html">JMS Shared Consumer 
Example</a></li>
-       <li><a href="./jms/jmx/readme.html">JMX Management Example</a></li>
-       <li><a href="./jms/large-message/readme.html">Large Message 
Example</a></li>
-       <li><a href="./jms/last-value-queue/readme.html">Last-Value Queue 
Example</a></li>
-       <li><a href="./jms/management/readme.html">Management Example</a></li>
-       <li><a href="./jms/management-notifications/readme.html">Management 
Notification Example</a></li>
-       <li><a href="./jms/message-counters/readme.html">JMS Message Counter 
Example</a></li>
-       <li><a href="./jms/message-group/readme.html">Message Group 
Example</a></li>
-       <li><a href="./jms/message-group2/readme.html">Message Group 
Example</a></li>
-       <li><a href="./jms/message-priority/readme.html">JMS Message Priority 
Example</a></li>
-       <li><a href="./jms/multiple-failover/readme.html">Multiple Fail-over 
Example</a></li>
-       <li><a href="./jms/multiple-failover-failback/readme.html">Multiple 
Fail-over/Fail-back Example</a></li>
-       <li><a href="./jms/no-consumer-buffering/readme.html">No Consumer 
Buffering Example</a></li>
-       <li><a href="./jms/non-transaction-failover/readme.html">JMS Failover 
Without Transactions Example</a></li>
-       <li><a href="./jms/openwire/readme.html">JMS OpenWire Example</a></li>
-       <li><a href="./jms/paging/readme.html">Paging Example</a></li>
-       <li><a href="./jms/perf/readme.html">JMS Simple Performance 
Example</a></li>
-       <li><a href="./jms/pre-acknowledge/readme.html">JMS Pre-Acknowledge 
Example</a></li>
-       <li><a href="./jms/producer-rate-limit/readme.html">JMS Message 
Producer Rate Example</a></li>
-       <li><a href="./jms/proton-cpp/readme.html">AMQP CPP Example</a></li>
-       <li><a href="./jms/proton-j/readme.html">Proton qpid java 
Example</a></li>
-       <li><a href="./jms/proton-ruby/readme.html">Proton Ruby Example</a></li>
-       <li><a href="./jms/queue/readme.html">JMS Queue Example</a></li>
-       <li><a href="./jms/queue-message-redistribution/readme.html">Message 
Redistribution Example</a></li>
-       <li><a href="./jms/queue-requestor/readme.html">JMS QueueRequestor 
Example</a></li>
-       <li><a href="./jms/queue-selector/readme.html">JMS Queue Selector 
Example</a></li>
-       <li><a href="./jms/reattach-node/readme.html">JMS Reattach 
Example</a></li>
-       <li><a href="./jms/replicated-failback/readme.html">JMS Multiple 
Failover using Replication Example</a></li>
-       <li><a href="./jms/replicated-failback-static/readme.html">JMS Multiple 
Failover using Replication Example</a></li>
-       <li><a href="./jms/replicated-multiple-failover/readme.html">JMS 
Multiple Failover using Replication Example</a></li>
-       <li><a href="./jms/replicated-transaction-failover/readme.html">JMS 
Failover With Transaction using Replication Example</a></li>
-       <li><a href="./jms/request-reply/readme.html">JMS Request-Reply 
Example</a></li>
-       <li><a href="./jms/scale-down/readme.html">JMS Colocated Failover 
Shared Store Example</a></li>
-       <li><a href="./jms/scheduled-message/readme.html">JMS Scheduled Message 
Example</a></li>
-       <li><a href="./jms/security/readme.html">JMS Security Example</a></li>
-       <li><a href="./jms/send-acknowledgements/readme.html">Asynchronous Send 
Acknowledgements Example</a></li>
-       <li><a href="./jms/spring-integration/readme.html">ActiveMQ Spring 
Example Example</a></li>
-       <li><a href="./jms/ssl-enabled/readme.html">JMS SSL Example</a></li>
-       <li><a href="./jms/static-selector/readme.html">Static Message Selector 
Example</a></li>
-       <li><a href="./jms/static-selector-jms/readme.html">Static Message 
Selector Example</a></li>
-       <li><a href="./jms/stomp/readme.html">Stomp Example</a></li>
-       <li><a href="./jms/stomp1.1/readme.html">Stomp 1.1 Example</a></li>
-       <li><a href="./jms/stomp1.2/readme.html">Stomp 1.2 Example</a></li>
-       <li><a href="./jms/stomp-websockets/readme.html">Stomp WebSockets 
Example</a></li>
-       <li><a href="./jms/stop-server-failover/readme.html">JMS Failover 
Without Transactions Example</a></li>
-       <li><a href="./jms/symmetric-cluster/readme.html">JMS Symmetric Cluster 
Example</a></li>
-       <li><a href="./jms/temp-queue/readme.html">JMS Temporary Queue 
Example</a></li>
-       <li><a href="./jms/topic/readme.html">JMS Topic Example</a></li>
-       <li><a href="./jms/topic-hierarchies/readme.html">Topic Hierarchy 
Example</a></li>
-       <li><a href="./jms/topic-selector-example1/readme.html">JMS Topic 
Selector Example 1 Example</a></li>
-       <li><a href="./jms/topic-selector-example2/readme.html">JMS Topic 
Selector Example 2 Example</a></li>
-       <li><a href="./jms/transaction-failover/readme.html">JMS Failover With 
Transaction Example</a></li>
-       <li><a href="./jms/transactional/readme.html">JMS Transactional Session 
Example</a></li>
-       <li><a href="./jms/xa-heuristic/readme.html">JMS XA Heuristic 
Example</a></li>
-       <li><a href="./jms/xa-receive/readme.html">JMS XA Receive 
Example</a></li>
-       <li><a href="./jms/xa-send/readme.html">JMS XA Send Example</a></li>
-   </ol>

Reply via email to