You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/03/09 17:51:41 UTC
[1/2] activemq-6 git commit: add stylesheet to example read me
Repository: activemq-6
Updated Branches:
refs/heads/master 5a0ff8fce -> 8de3b4007
add stylesheet to example read me
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/3bea103c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/3bea103c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/3bea103c
Branch: refs/heads/master
Commit: 3bea103cfada4b6098444f9ee90c0ebffa6208aa
Parents: 5a0ff8f
Author: Andy Taylor <an...@apache.org>
Authored: Mon Mar 9 16:18:25 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Mon Mar 9 16:18:25 2015 +0000
----------------------------------------------------------------------
.../src/main/resources/examples/index.html | 98 +++++++++++++-------
1 file changed, 65 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/3bea103c/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
index 50439e9..4bd3ac7 100644
--- a/activemq-website/src/main/resources/examples/index.html
+++ b/activemq-website/src/main/resources/examples/index.html
@@ -1,40 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">
<!--
-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.
+ 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.
+ Architecture
-->
+<html lang="en">
+<head>
+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+ <meta content="ActiveMQ's next generation of messaging" name="description"/>
+ <meta content="messaging,stomp,jms,activemq" name="keywords"/>
+ <meta content="ActiveMQ" name="author"/>
+ <link type="text/css" rel="stylesheet" href="../styles/impact/css/pygmentize.css"/>
+ <link type="text/css" rel="stylesheet" href="../styles/impact/css/site.css"/>
+ <title>ActiveMQ</title>
+</head>
+<body>
+<div id="navigation">
+ <div class="wrapper">
+ <ul>
+ <li><a href="../index.html">ActiveMQ 6.0</a></li>
+ </ul> <div></div>
+ </div>
+</div>
+<div id="content">
+ <div class="wrapper">
+ <div class="logo">
+ <img src="../images/activemq-logo.png" alt="ActiveMQ logo"/>
+ </div>
+ <div class="message">
+
+ <h1>Apache ActiveMQ Examples</h1>
-<h1>Apache ActiveMQ Examples</h1>
+ <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>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>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>.
-<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>
-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>
+ <div></div>
+ </div>
+ </div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file
[2/2] activemq-6 git commit: Merge PR #164
Posted by ma...@apache.org.
Merge PR #164
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/8de3b400
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/8de3b400
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/8de3b400
Branch: refs/heads/master
Commit: 8de3b4007b29a843bbed880f276e1c5a4e1e033a
Parents: 5a0ff8f 3bea103
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Mar 9 16:51:17 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Mar 9 16:51:17 2015 +0000
----------------------------------------------------------------------
.../src/main/resources/examples/index.html | 98 +++++++++++++-------
1 file changed, 65 insertions(+), 33 deletions(-)
----------------------------------------------------------------------