activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [24/25] activemq-6 git commit: ACTIVEMQ6-9 - port to markdown
Date Mon, 08 Dec 2014 15:49:55 GMT
ACTIVEMQ6-9 - port to markdown

https://issues.apache.org/jira/browse/ACTIVEMQ6-9

remove the jboss jdocbook build and style and replace using plane markdown


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

Branch: refs/heads/master
Commit: 4245a6b4fe667021eb791543577ea9a4c99155a1
Parents: d42481d
Author: Andy Taylor <andytaylor@apache.org>
Authored: Thu Dec 4 15:25:29 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Mon Dec 8 13:23:24 2014 +0000

----------------------------------------------------------------------
 distribution/activemq/src/main/assembly/dep.xml |   12 -
 docs/design-guide/en/Author_Group.xml           |   34 -
 docs/design-guide/en/Book_Info.xml              |   48 -
 docs/design-guide/en/HornetQ_Design_Guide.ent   |    5 -
 docs/design-guide/en/HornetQ_Design_Guide.xml   |   30 -
 docs/design-guide/en/about.md                   |    4 +
 docs/design-guide/en/about.xml                  |   28 -
 docs/design-guide/en/clustering.md              |   23 +
 docs/design-guide/en/clustering.xml             |   42 -
 docs/design-guide/en/notice.md                  |   17 +
 docs/design-guide/en/notice.xml                 |   41 -
 docs/design-guide/pom.xml                       |  310 ---
 docs/diagrams/standard_image.odg                |  Bin 11094 -> 0 bytes
 docs/eap-manual/en/Author_Group.xml             |   35 -
 docs/eap-manual/en/Book_Info.xml                |   49 -
 docs/eap-manual/en/HornetQ_EAP_Manual.ent       |    7 -
 docs/eap-manual/en/HornetQ_EAP_Manual.xml       |   29 -
 docs/eap-manual/en/clusters.xml                 |  573 -----
 docs/eap-manual/en/diagrams/ha-topologies1.odg  |  Bin 14529 -> 0 bytes
 docs/eap-manual/en/images/simple-colocated.jpg  |  Bin 94996 -> 0 bytes
 docs/eap-manual/en/images/simple-colocated2.jpg |  Bin 124592 -> 0 bytes
 docs/eap-manual/en/images/simple-colocated3.jpg |  Bin 162357 -> 0 bytes
 .../en/images/simple-dedicated-jca-remote.jpg   |  Bin 65959 -> 0 bytes
 .../en/images/simple-dedicated-jca.jpg          |  Bin 100349 -> 0 bytes
 docs/eap-manual/en/images/simple-dedicated.jpg  |  Bin 49812 -> 0 bytes
 docs/eap-manual/en/master.xml                   |    0
 docs/eap-manual/pom.xml                         |  309 ---
 docs/pom.xml                                    |   55 -
 .../en/ActiveMQ_QuickStart_Guide.ent            |    5 -
 .../en/ActiveMQ_QuickStart_Guide.xml            |   17 -
 docs/quickstart-guide/en/Author_Group.xml       |   45 -
 docs/quickstart-guide/en/Book_Info.xml          |   31 -
 docs/quickstart-guide/en/README.md              |    4 +
 docs/quickstart-guide/en/SUMMARY.md             |    7 +
 docs/quickstart-guide/en/about.md               |   49 +
 docs/quickstart-guide/en/about.xml              |   83 -
 docs/quickstart-guide/en/download.md            |   36 +
 docs/quickstart-guide/en/download.xml           |   74 -
 docs/quickstart-guide/en/examples.md            |  314 +++
 docs/quickstart-guide/en/examples.xml           |  329 ---
 .../en/images/hornetQ_logo_600px.png            |  Bin 23866 -> 0 bytes
 docs/quickstart-guide/en/installation.md        |   85 +
 docs/quickstart-guide/en/installation.xml       |  101 -
 docs/quickstart-guide/en/introduction.md        |   13 +
 docs/quickstart-guide/en/introduction.xml       |   32 -
 docs/quickstart-guide/en/master.xml             |    0
 docs/quickstart-guide/en/migrate.sh             |    6 +
 docs/quickstart-guide/en/notice.md              |   17 +
 docs/quickstart-guide/en/notice.xml             |   40 -
 docs/quickstart-guide/en/running.md             |  106 +
 docs/quickstart-guide/en/running.xml            |  124 -
 docs/quickstart-guide/pom.xml                   |  300 ---
 docs/user-manual/en/ActiveMQ_User_Manual.ent    |   22 -
 docs/user-manual/en/ActiveMQ_User_Manual.xml    |   79 -
 docs/user-manual/en/Author_Group.xml            |   86 -
 docs/user-manual/en/Book_Info.xml               |   48 -
 docs/user-manual/en/README.md                   |    7 +
 docs/user-manual/en/SUMMARY.md                  |   53 +
 docs/user-manual/en/aerogear-integration.md     |  101 +
 docs/user-manual/en/aerogear-integration.xml    |  115 -
 docs/user-manual/en/appserver-integration.md    | 1031 +++++++++
 docs/user-manual/en/appserver-integration.xml   | 1338 -----------
 docs/user-manual/en/architecture.md             |  159 ++
 docs/user-manual/en/architecture.xml            |  151 --
 docs/user-manual/en/book.json                   |   12 +
 docs/user-manual/en/client-classpath.md         |   32 +
 docs/user-manual/en/client-classpath.xml        |   51 -
 docs/user-manual/en/client-reconnection.md      |  149 ++
 docs/user-manual/en/client-reconnection.xml     |  147 --
 docs/user-manual/en/clusters.md                 | 1059 +++++++++
 docs/user-manual/en/clusters.xml                |  998 --------
 docs/user-manual/en/configuration-index.md      |  273 +++
 docs/user-manual/en/configuration-index.xml     |  396 ----
 docs/user-manual/en/configuring-transports.md   |  462 ++++
 docs/user-manual/en/configuring-transports.xml  |  443 ----
 docs/user-manual/en/connection-ttl.md           |  198 ++
 docs/user-manual/en/connection-ttl.xml          |  202 --
 docs/user-manual/en/core-bridges.md             |  225 ++
 docs/user-manual/en/core-bridges.xml            |  241 --
 docs/user-manual/en/diverts.md                  |  114 +
 docs/user-manual/en/diverts.xml                 |  113 -
 docs/user-manual/en/duplicate-detection.md      |  161 ++
 docs/user-manual/en/duplicate-detection.xml     |  148 --
 docs/user-manual/en/embedding-activemq.md       |  225 ++
 docs/user-manual/en/embedding-activemq.xml      |  270 ---
 docs/user-manual/en/examples.md                 |  826 +++++++
 docs/user-manual/en/examples.xml                |  693 ------
 docs/user-manual/en/filter-expressions.md       |   52 +
 docs/user-manual/en/filter-expressions.xml      |   86 -
 docs/user-manual/en/flow-control.md             |  304 +++
 docs/user-manual/en/flow-control.xml            |  290 ---
 docs/user-manual/en/ha.md                       |  892 ++++++++
 docs/user-manual/en/ha.xml                      |  985 --------
 docs/user-manual/en/images/activemq-logo.jpg    |  Bin 0 -> 6819 bytes
 docs/user-manual/en/intercepting-operations.md  |   84 +
 docs/user-manual/en/intercepting-operations.xml |   99 -
 docs/user-manual/en/interoperability.md         |  365 +++
 docs/user-manual/en/interoperability.xml        |  305 ---
 docs/user-manual/en/jms-bridge.md               |  460 ++++
 docs/user-manual/en/jms-bridge.xml              |  449 ----
 docs/user-manual/en/jms-core-mapping.md         |   39 +
 docs/user-manual/en/jms-core-mapping.xml        |   50 -
 docs/user-manual/en/large-messages.md           |  275 +++
 docs/user-manual/en/large-messages.xml          |  285 ---
 docs/user-manual/en/last-value-queues.md        |   55 +
 docs/user-manual/en/last-value-queues.xml       |   70 -
 docs/user-manual/en/libaio.md                   |  109 +
 docs/user-manual/en/libaio.xml                  |  129 --
 docs/user-manual/en/logging.md                  |   93 +
 docs/user-manual/en/logging.xml                 |  138 --
 docs/user-manual/en/management.md               | 1094 +++++++++
 docs/user-manual/en/management.xml              | 1117 ---------
 docs/user-manual/en/message-expiry.md           |   85 +
 docs/user-manual/en/message-expiry.xml          |  100 -
 docs/user-manual/en/message-grouping.md         |  198 ++
 docs/user-manual/en/message-grouping.xml        |  195 --
 docs/user-manual/en/messaging-concepts.md       |  312 +++
 docs/user-manual/en/messaging-concepts.xml      |  267 ---
 docs/user-manual/en/notice.md                   |   17 +
 docs/user-manual/en/notice.xml                  |   39 -
 docs/user-manual/en/paging.md                   |  160 ++
 docs/user-manual/en/paging.xml                  |  215 --
 docs/user-manual/en/perf-tuning.md              |  255 +++
 docs/user-manual/en/perf-tuning.xml             |  304 ---
 docs/user-manual/en/persistence.md              |  392 ++++
 docs/user-manual/en/persistence.xml             |  356 ---
 docs/user-manual/en/pre-acknowledge.md          |   92 +
 docs/user-manual/en/pre-acknowledge.xml         |   92 -
 docs/user-manual/en/preface.md                  |   52 +
 docs/user-manual/en/preface.xml                 |   86 -
 docs/user-manual/en/project-info.md             |   50 +
 docs/user-manual/en/queue-attributes.md         |  182 ++
 docs/user-manual/en/queue-attributes.xml        |  171 --
 docs/user-manual/en/rest.md                     | 1570 +++++++++++++
 docs/user-manual/en/rest.xml                    | 2150 ------------------
 docs/user-manual/en/scheduled-messages.md       |   36 +
 docs/user-manual/en/scheduled-messages.xml      |   53 -
 docs/user-manual/en/security.md                 |  306 +++
 docs/user-manual/en/security.xml                |  287 ---
 docs/user-manual/en/send-guarantees.md          |  151 ++
 docs/user-manual/en/send-guarantees.xml         |  152 --
 docs/user-manual/en/slow-consumers.md           |   36 +
 docs/user-manual/en/slow-consumers.xml          |   52 -
 docs/user-manual/en/spring-integration.md       |   50 +
 docs/user-manual/en/spring-integration.xml      |   81 -
 docs/user-manual/en/thread-pooling.md           |  154 ++
 docs/user-manual/en/thread-pooling.xml          |  150 --
 docs/user-manual/en/tools.md                    |   88 +
 docs/user-manual/en/tools.xml                   |  116 -
 docs/user-manual/en/transaction-config.md       |   22 +
 docs/user-manual/en/transaction-config.xml      |   38 -
 docs/user-manual/en/undelivered-messages.md     |  166 ++
 docs/user-manual/en/undelivered-messages.xml    |  159 --
 docs/user-manual/en/using-core.md               |  222 ++
 docs/user-manual/en/using-core.xml              |  223 --
 docs/user-manual/en/using-jms.md                |  410 ++++
 docs/user-manual/en/using-jms.xml               |  364 ---
 docs/user-manual/en/using-server.md             |  204 ++
 docs/user-manual/en/using-server.xml            |  208 --
 docs/user-manual/en/vertx-integration.md        |   91 +
 docs/user-manual/en/vertx-integration.xml       |  114 -
 docs/user-manual/en/wildcard-routing.md         |   21 +
 docs/user-manual/en/wildcard-routing.xml        |   42 -
 docs/user-manual/en/wildcard-syntax.md          |   28 +
 docs/user-manual/en/wildcard-syntax.xml         |   43 -
 docs/user-manual/pom.xml                        |  365 ---
 docs/user-manual/publican.cfg                   |    7 -
 .../src/main/resources/schemaToTable.xsl        |  374 ---
 pom.xml                                         |    1 -
 169 files changed, 14940 insertions(+), 19136 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/distribution/activemq/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml
index 088ae95..270c239 100644
--- a/distribution/activemq/src/main/assembly/dep.xml
+++ b/distribution/activemq/src/main/assembly/dep.xml
@@ -124,17 +124,5 @@
          <exclude>**/**/*.dat</exclude>
        </excludes>
      </fileSet>
-     <!-- docs -->
-     <!--todo, this is crap, there must be better jdocbook assembly integration-->
-      <fileSet>
-         <directory>../../docs/user-manual/target/docbook/publish/en/html/</directory>
-         <outputDirectory>web/user-manual</outputDirectory>
-         <lineEnding>keep</lineEnding>
-      </fileSet>
-      <fileSet>
-         <directory>../../docs/rest-manual/target/docbook/publish/en</directory>
-         <outputDirectory>docs/rest-manual</outputDirectory>
-         <lineEnding>keep</lineEnding>
-      </fileSet>
   </fileSets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/Author_Group.xml b/docs/design-guide/en/Author_Group.xml
deleted file mode 100644
index cc80d8b..0000000
--- a/docs/design-guide/en/Author_Group.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  ~ 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.
-  -->
-
-<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<authorgroup>
-  <author>
-    <firstname>Andy</firstname>
-    <surname>Taylor</surname>
-    <affiliation>
-      <shortaffil>Red Hat, Inc.</shortaffil>
-      <jobtitle>Core Developer</jobtitle>
-      <orgdiv>JBoss</orgdiv>
-    </affiliation>
-    <email>ataylor@redhat.com</email>
-  </author>
-</authorgroup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/Book_Info.xml b/docs/design-guide/en/Book_Info.xml
deleted file mode 100644
index 4d4a08f..0000000
--- a/docs/design-guide/en/Book_Info.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  ~ 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.
-  -->
-
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<bookinfo id="ActiveMQ_QuickStart_Guide">
-  <title>ActiveMQ Design Guide</title>
-  <subtitle>Putting the buzz in messaging</subtitle>
-  <productname>ActiveMQ</productname>
-  <edition>2.1.0</edition>
-  <pubsnumber>1</pubsnumber>
-  <abstract>
-    <para>This Design guide is to help current and future developers how ActiveMQ's architectures are designed to
-    help the future development and maintenance of the project</para>
-  </abstract>
-  <corpauthor>
-    <inlinemediaobject>
-      <imageobject>
-        <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
-      </imageobject>
-      <textobject>
-        <phrase>ActiveMQ Logo</phrase>
-      </textobject>
-    </inlinemediaobject>
-  </corpauthor>
-  <copyright>
-    <year>&YEAR;</year>
-    <holder>&HOLDER;</holder>
-  </copyright>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
-</bookinfo>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/HornetQ_Design_Guide.ent
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/HornetQ_Design_Guide.ent b/docs/design-guide/en/HornetQ_Design_Guide.ent
deleted file mode 100644
index 004902c..0000000
--- a/docs/design-guide/en/HornetQ_Design_Guide.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY PRODUCT "ActiveMQ">
-<!ENTITY BOOKID "ActiveMQ_Design_Guide">
-<!ENTITY YEAR "2011">
-<!ENTITY HOLDER "Red Hat Inc.">
-<!ENTITY semi ";">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/HornetQ_Design_Guide.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/HornetQ_Design_Guide.xml b/docs/design-guide/en/HornetQ_Design_Guide.xml
deleted file mode 100644
index 50961be..0000000
--- a/docs/design-guide/en/HornetQ_Design_Guide.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
-  ~ 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.
-  -->
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
-%BOOK_ENTITIES;
-
-]>
-<book>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="about.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clustering.xml"/>
-</book>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/about.md
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/about.md b/docs/design-guide/en/about.md
new file mode 100644
index 0000000..184d493
--- /dev/null
+++ b/docs/design-guide/en/about.md
@@ -0,0 +1,4 @@
+About ActiveMQ
+==============
+
+What is ActiveMQ?

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/about.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/about.xml b/docs/design-guide/en/about.xml
deleted file mode 100644
index ca8df7a..0000000
--- a/docs/design-guide/en/about.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ 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.
-  -->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<chapter id="about">
-   <title>About ActiveMQ</title>
-    <para>What is ActiveMQ?</para>
-</chapter>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/clustering.md
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/clustering.md b/docs/design-guide/en/clustering.md
new file mode 100644
index 0000000..235c0d9
--- /dev/null
+++ b/docs/design-guide/en/clustering.md
@@ -0,0 +1,23 @@
+Getting Started
+===============
+
+This chapter discusses the architecture behind clustering
+
+Discovery
+=========
+
+Discovery is done in 2 steps, initial discovery where the server locates
+another node in the cluster and topology discovery where the node finds
+out about all other nodes in the cluster
+
+Initial Discovery
+-----------------
+
+blah blah blah, UDP, static connectors etc etc
+
+Topology Discovery
+------------------
+
+blah blah blah, topology etc
+
+![ActiveMQ topology-update.jpg](images/topology-update.jpg)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/clustering.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/clustering.xml b/docs/design-guide/en/clustering.xml
deleted file mode 100644
index 9bc19ca..0000000
--- a/docs/design-guide/en/clustering.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ============================================================================= -->
-<!-- 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.                                                -->
-<!-- ============================================================================= -->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<chapter id="introduction">
-    <title>Getting Started</title>
-    <para>This chapter discusses the architecture behind clustering</para>
-    <section>
-       <title>Discovery</title>
-       <para>Discovery is done in 2 steps, initial discovery where the server locates another node in the cluster and 
-       topology discovery where the node finds out about all other nodes in the cluster</para>
-       <section>
-          <title>Initial Discovery</title>
-          <para>blah blah blah, UDP, static connectors etc etc</para>
-       </section>
-       <section>
-          <title>Topology Discovery</title>
-          <para>blah blah blah, topology etc</para>
-         <para>
-            <graphic fileref="images/topology-update.jpg" align="center" format="JPEG" scale="30"/>
-         </para>
-       </section>
-    </section>
-</chapter>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/notice.md
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/notice.md b/docs/design-guide/en/notice.md
new file mode 100644
index 0000000..2b2cdc2
--- /dev/null
+++ b/docs/design-guide/en/notice.md
@@ -0,0 +1,17 @@
+Legal Notice
+============
+
+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.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/en/notice.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/en/notice.xml b/docs/design-guide/en/notice.xml
deleted file mode 100644
index dfc2acb..0000000
--- a/docs/design-guide/en/notice.xml
+++ /dev/null
@@ -1,41 +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.
-  -->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_Design_Guide.ent">
-%BOOK_ENTITIES;
-]>
-
-<chapter id="notice">
-    <title>Legal Notice</title>
-
-        <para>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</para>
-        <para></para>
-        <para>http://www.apache.org/licenses/LICENSE-2.0</para>
-        <para></para>
-        <para>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.</para>
-
-</chapter>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/design-guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/design-guide/pom.xml b/docs/design-guide/pom.xml
deleted file mode 100644
index ca7729e..0000000
--- a/docs/design-guide/pom.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.project</groupId>
-	<artifactId>${docname}-${translation}</artifactId>
-	<version>1.0</version>
-	<packaging>jdocbook</packaging>
-	<name>${bookname}-(${translation})</name>
-
-  <properties>
-    <translation>en</translation>
-    <docname>ActiveMQ_Design_Guide</docname>
-    <bookname>ActiveMQ Design Guide</bookname>
-  </properties> 
-
-  <repositories>
-      <repository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Maven Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </snapshots>
-      </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Maven Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-    </pluginRepository>
-    <!--pluginRepository>
-          <id>jboss-snapshot-repository-group</id>
-          <name>JBoss Snapshot Maven Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/snapshot/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-    </pluginRepository-->
- </pluginRepositories>
-  
-  <profiles>
-
-    <!-- mvn compile -->
-    <profile>
-      <id>all</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-    		<plugins>
-    			<plugin>
-    				<groupId>org.jboss.maven.plugins</groupId>
-    				<artifactId>maven-jdocbook-plugin</artifactId>
-    				<version>2.2.1</version>
-    				<extensions>true</extensions>
-    				<configuration>
-    				  <formats>
-        				<format>
-        				  <formatName>pdf</formatName>
-        					<stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
-        					<finalName>${docname}.pdf</finalName>
-        				</format>
-    					  <format>
-    					    <formatName>html</formatName>
-    						  <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
-    						  <finalName>index.html</finalName>
-    					  </format>
-        				<format>
-        				  <formatName>html_single</formatName>
-        					<stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
-        					<finalName>index.html</finalName>
-        				</format>
-    					</formats>
-  					</configuration>
-  				</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-    <!-- mvn compile -Phtml -->
-    <profile>
-      <id>html</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-    		<plugins>
-    			<plugin>
-    				<groupId>org.jboss.maven.plugins</groupId>
-    				<artifactId>maven-jdocbook-plugin</artifactId>
-    				<version>2.2.1</version>
-    				<extensions>true</extensions>
-    				<configuration>
-    				  <formats>
-    					  <format>
-    					    <formatName>html</formatName>
-    						  <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
-    						  <finalName>index.html</finalName>
-    					  </format>
-    					</formats>
-  					</configuration>
-  				</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-    <!-- mvn compile -Phtml-single -->
-    <profile>
-      <id>html-single</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-    		<plugins>
-    			<plugin>
-    				<groupId>org.jboss.maven.plugins</groupId>
-    				<artifactId>maven-jdocbook-plugin</artifactId>
-    				<version>2.2.1</version>
-    				<extensions>true</extensions>
-  				</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-    <!-- mvn compile -Ppdf -->
-    <profile>
-      <id>pdf</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-    		<plugins>
-    			<plugin>
-    				<groupId>org.jboss.maven.plugins</groupId>
-    				<artifactId>maven-jdocbook-plugin</artifactId>
-    				<version>2.1.0</version>
-    				<extensions>true</extensions>
-    				<configuration>
-    				  <formats>
-        				<format>
-        				  <formatName>pdf</formatName>
-        					<stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
-        					<finalName>${docname}.pdf</finalName>
-        				</format>
-    					</formats>
-  					</configuration>
-  				</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-  </profiles>
-   <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-		           <groupId>org.jboss.maven.plugins</groupId>
-		           <artifactId>maven-jdocbook-plugin</artifactId>
-		           <version>2.2.1</version>
-		           <extensions>true</extensions>
-		           <dependencies>
-		              <dependency>
-		                 <groupId>org.jboss.pressgang</groupId>
-		                 <artifactId>pressgang-xslt</artifactId>
-		                 <version>1.2.0</version>
-		              </dependency>
-		              <dependency>
-		                 <groupId>org.jboss</groupId>
-		                 <artifactId>jbossorg-jdocbook-style</artifactId>
-		                 <version>1.1.1</version>
-		                 <type>jdocbook-style</type>
-		              </dependency>
-		           </dependencies>
-		           <configuration>
-		              <sourceDirectory>${project.basedir}</sourceDirectory>
-		              <sourceDocumentName>${docname}.xml</sourceDocumentName>
-		              <masterTranslation>en</masterTranslation>
-		              <imageResource>
-		                 <directory>${project.basedir}/en</directory>
-		                 <includes>
-		                    <include>images/*.png</include>
-		                    <include>images/*.jpg</include>
-		                 </includes>
-		              </imageResource>
-		              <formats>
-		                 <format>
-		                    <formatName>pdf</formatName>
-		                    <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
-		                    <finalName>${pdf.name}</finalName>
-		                 </format>
-		                 <format>
-		                    <formatName>html</formatName>
-		                    <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
-		                    <finalName>index.html</finalName>
-		                 </format>
-		                 <format>
-		                    <formatName>html_single</formatName>
-		                    <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
-		                    <finalName>index.html</finalName>
-		                 </format>
-		              </formats>
-		              <options>
-						<xincludeSupported>true</xincludeSupported>
-						<xmlTransformerType>saxon</xmlTransformerType>
-						<docbookVersion>1.72.0</docbookVersion>
-						<localeSeparator>-</localeSeparator>
-						<transformerParameters>
-							<property>
-								<name>javax.xml.parsers.DocumentBuilderFactory</name>
-								<value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
-							</property>
-							<property>
-								<name>javax.xml.parsers.SAXParserFactory</name>
-								<value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
-							</property>
-						</transformerParameters>
-		              </options>
-		           </configuration>
-		        </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-	<!--<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jboss.maven.plugins</groupId>
-				<artifactId>maven-jdocbook-plugin</artifactId>
-				<version>2.2.1</version>
-				<extensions>true</extensions>
-				<dependencies>
-					<dependency>
-                  <groupId>org.jboss.pressgang</groupId>
-                  <artifactId>pressgang-xslt</artifactId>
-                  <version>1.2.0</version>
-               </dependency>
-					<dependency>
-						<groupId>org.jboss</groupId>
-						<artifactId>jbossorg-jdocbook-style</artifactId>
-						<version>1.1.1</version>
-						<type>jdocbook-style</type>
-					</dependency>
-				</dependencies>
-				<configuration>
-		         <sourceDocumentName>${docname}.xml</sourceDocumentName>
-				  <sourceDirectory>.</sourceDirectory>
-				  <imageResource>
-					  <directory>${translation}</directory>
-					  <includes>
-						  <include>images/*</include>
-					  </includes>
-				  </imageResource>
-				  <options>
-					  <xincludeSupported>true</xincludeSupported>
-					  <xmlTransformerType>saxon</xmlTransformerType>
-    				<transformerParameters>
-    				  <property>
-    					  <name>javax.xml.parsers.DocumentBuilderFactory</name>
-    						<value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
-    					</property>
-    					<property>
-    						<name>javax.xml.parsers.SAXParserFactory</name>
-    						<value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
-    					</property>
-    				</transformerParameters>
-    			</options>
-			  </configuration>
-		  </plugin>
-		  
-	  </plugins>
-  </build>-->
-
-</project>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/diagrams/standard_image.odg
----------------------------------------------------------------------
diff --git a/docs/diagrams/standard_image.odg b/docs/diagrams/standard_image.odg
deleted file mode 100644
index ecab22a..0000000
Binary files a/docs/diagrams/standard_image.odg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/Author_Group.xml b/docs/eap-manual/en/Author_Group.xml
deleted file mode 100644
index 7b2e395..0000000
--- a/docs/eap-manual/en/Author_Group.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  ~ 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.
-  -->
-
-
-<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_EAP_Manual.ent">
-%BOOK_ENTITIES;
-]>
-<authorgroup>
-  <author>
-    <firstname>Andy</firstname>
-    <surname>Taylor</surname>
-    <affiliation>
-      <shortaffil>Red Hat, Inc.</shortaffil>
-      <jobtitle>Core Developer</jobtitle>
-      <orgdiv>JBoss</orgdiv>
-    </affiliation>
-    <email>ataylor@redhat.com</email>
-  </author>
-</authorgroup>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/Book_Info.xml b/docs/eap-manual/en/Book_Info.xml
deleted file mode 100644
index 96a48f3..0000000
--- a/docs/eap-manual/en/Book_Info.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  ~ 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.
-  -->
-
-
-<!-- This document was created with Syntext Serna Free. -->
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_EAP_Manual.ent">
-%BOOK_ENTITIES;
-]>
-<bookinfo id="ActiveMQ_EAP_Manual">
-  <title>ActiveMQ Eap Manual</title>
-  <subtitle>Putting the buzz in messaging</subtitle>
-  <productname>ActiveMQ</productname>
-  <edition>2.1.0</edition>
-  <pubsnumber>1</pubsnumber>
-  <abstract>
-    <para>This is a guide to using ActiveMQ within EAP</para>
-  </abstract>
-  <corpauthor>
-    <inlinemediaobject>
-      <imageobject>
-        <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
-      </imageobject>
-      <textobject>
-        <phrase>ActiveMQ Logo</phrase>
-      </textobject>
-    </inlinemediaobject>
-  </corpauthor>
-  <copyright>
-    <year>&YEAR;</year>
-    <holder>&HOLDER;</holder>
-  </copyright>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
-</bookinfo>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/HornetQ_EAP_Manual.ent
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/HornetQ_EAP_Manual.ent b/docs/eap-manual/en/HornetQ_EAP_Manual.ent
deleted file mode 100644
index c757b83..0000000
--- a/docs/eap-manual/en/HornetQ_EAP_Manual.ent
+++ /dev/null
@@ -1,7 +0,0 @@
-<!ENTITY PRODUCT "ActiveMQ">
-<!ENTITY BOOKID "ActiveMQ_EAP_Manual">
-<!ENTITY YEAR "2011">
-<!ENTITY HOLDER "Red Hat Inc.">
-<!ENTITY semi ";">
-
-

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/HornetQ_EAP_Manual.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/HornetQ_EAP_Manual.xml b/docs/eap-manual/en/HornetQ_EAP_Manual.xml
deleted file mode 100644
index 675c6cc..0000000
--- a/docs/eap-manual/en/HornetQ_EAP_Manual.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  ~ 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.
-  -->
-
-
-<!-- This document was created with Syntext Serna Free. -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "ActiveMQ_EAP_Manual.ent">
-%BOOK_ENTITIES;
-
-]>
-<book>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clusters.xml"/>
-</book>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/clusters.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml
deleted file mode 100644
index daacc4c..0000000
--- a/docs/eap-manual/en/clusters.xml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ 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.
-  -->
-
-<chapter id="clusters">
-   <title>ActiveMQ and EAP Cluster Configuration</title>
-   <section>
-      <title>Configuring Failover</title>
-      <para>
-         This chapter explains how to configure ActiveMQ within EAP with live backup-groups. Currently in this version
-         ActiveMQ only supports shared store for backup nodes so we assume that in the rest of this chapter.
-      </para>
-      <para>There are 2 main ways to configure ActiveMQ servers to have a backup server:</para>
-      <itemizedlist>
-         <listitem>
-            <para>Colocated. This is when an EAP instance has both a live and backup(s) running.</para>
-         </listitem>
-         <listitem>
-            <para>Dedicated. This is when an EAP instance has either a live or backup running but never both.</para>
-         </listitem>
-      </itemizedlist>
-      <section>
-         <title>Colocated Live and Backup in Symmetrical cluster</title>
-         <para>
-            The colocated symmetrical topology will be the most widely used topology, this is where an EAP instance has
-            a live node running plus 1 or more backup node. Each backup node will belong to a live node on another EAP
-            instance. In a simple cluster of 2
-            EAP instances this would mean that each EAP instance would have a live server and 1 backup server as in
-            diagram1.
-         </para>
-         <para>
-            <graphic fileref="images/simple-colocated.jpg" align="center" format="jpg" scale="30"/>
-         </para>
-         <para>
-            Here the continuous lines show before failover and the dotted lines show the state of the cluster after
-            failover has occurred. To start with the 2 live servers are connected forming a cluster with each live server
-            connected to its local applications (via JCA). Also remote clients are connected to the live servers. After
-            failover the backup connects to the still available live server (which happens to be in the same vm) and takes
-            over as the live server in the cluster. Any remote clients also failover.
-         </para>
-         <para>
-            One thing to mention is that in that depending on what consumers/producers and MDB's etc are available messages
-            will be distributed between the nodes to make sure that all clients are satisfied from a JMS perspective. That is
-            if a producer is sending messages to a queue on a backup server that has no consumers, the messages will be
-            distributed to a live node elsewhere.
-         </para>
-         <para>
-            The following diagram is slightly more complex but shows the same configuration with 3 servers. Note that the
-            cluster connections ave been removed to make the configuration clearer but in reality all live servers will
-            form a cluster.
-         </para>
-         <para>
-            <graphic fileref="images/simple-colocated2.jpg" align="center" format="jpg" scale="30"/>
-         </para>
-         <para>
-            With more than 2 servers it is up to the user as to how many backups per live server are configured, you can
-            have
-            as many backups as required but usually 1 would suffice. In 3 node topology you may have each EAP instance
-            configured
-            with 2 backups in a 4 node 3 backups and so on. The following diagram demonstrates this.
-         </para>
-         <para>
-            <graphic fileref="images/simple-colocated3.jpg" align="center" format="jpg" scale="30"/>
-         </para>
-         <section>
-            <title>Configuration</title>
-            <section>
-               <title>Live Server Configuration</title>
-               <para>
-                  First let's start with the configuration of the live server, we will use the EAP 'all' configuration as
-                  our starting point. Since this version only supports shared store for failover we need to configure
-                  this in the
-                  <literal>activemq-configuration.xml</literal>
-                  file like so:
-               </para>
-               <programlisting>
-                  &lt;shared-store>true&lt;/shared-store>
-               </programlisting>
-               <para>
-                  Obviously this means that the location of the journal files etc will have to be configured to be some
-                  where
-                  where
-                  this lives backup can access. You may change the lives configuration in
-                  <literal>activemq-configuration.xml</literal>
-                  to
-                  something like:
-               </para>
-               <programlisting>
-   &lt;large-messages-directory>/media/shared/data/large-messages&lt;/large-messages-directory>
-   &lt;bindings-directory>/media/shared/data/bindings&lt;/bindings-directory>
-   &lt;journal-directory>/media/shared/data/journal&lt;/journal-directory>
-   &lt;paging-directory>/media/shared/data/paging&lt;/paging-directory>
-               </programlisting>
-               <para>
-                  How these paths are configured will of course depend on your network settings or file system.
-               </para>
-               <para>
-                  Now we need to configure how remote JMS clients will behave if the server is shutdown in a normal
-                  fashion.
-                  By
-                  default
-                  Clients will not failover if the live server is shutdown. Depending on there connection factory
-                  settings
-                  they will either fail or try to reconnect to the live server.
-               </para>
-               <para>If you want clients to failover on a normal server shutdown the you must configure the
-                  <literal>failover-on-shutdown</literal>
-                  flag to true in the
-                  <literal>activemq-configuration.xml</literal>
-                  file like so:
-               </para>
-               <programlisting>
-   &lt;failover-on-shutdown>false&lt;/failover-on-shutdown>
-               </programlisting>
-               <para>Don't worry if you have this set to false (which is the default) but still want failover to occur,
-                  simply
-                  kill
-                  the
-                  server process directly or call
-                  <literal>forceFailover</literal>
-                  via jmx or the admin console on the core server object.
-               </para>
-               <para>We also need to configure the connection factories used by the client to be HA. This is done by
-                  adding
-                  certain attributes to the connection factories in<literal>activemq-jms.xml</literal>. Let's look at an
-                  example:
-               </para>
-               <programlisting>
-   &lt;connection-factory name="NettyConnectionFactory">
-      &lt;xa>true&lt;/xa>
-      &lt;connectors>
-         &lt;connector-ref connector-name="netty"/>
-      &lt;/connectors>
-      &lt;entries>
-         &lt;entry name="/ConnectionFactory"/>
-         &lt;entry name="/XAConnectionFactory"/>
-      &lt;/entries>
-
-      &lt;ha>true&lt;/ha>
-      &lt;!-- Pause 1 second between connect attempts -->
-      &lt;retry-interval>1000&lt;/retry-interval>
-
-      &lt;!-- Multiply subsequent reconnect pauses by this multiplier. This can be used to
-      implement an exponential back-off. For our purposes we just set to 1.0 so each reconnect
-      pause is the same length -->
-      &lt;retry-interval-multiplier>1.0&lt;/retry-interval-multiplier>
-
-      &lt;!-- Try reconnecting an unlimited number of times (-1 means "unlimited") -->
-      &lt;reconnect-attempts>-1&lt;/reconnect-attempts>
-   &lt;/connection-factory>
-
-               </programlisting>
-               <para>We have added the following attributes to the connection factory used by the client:</para>
-               <itemizedlist>
-                  <listitem>
-                     <para>
-                        <literal>ha</literal>
-                        - This tells the client it support HA and must always be true for failover
-                        to occur
-                     </para>
-                  </listitem>
-                  <listitem>
-                     <para>
-                        <literal>retry-interval</literal>
-                        - this is how long the client will wait after each unsuccessful
-                        reconnect to the server
-                     </para>
-                  </listitem>
-                  <listitem>
-                     <para>
-                        <literal>retry-interval-multiplier</literal>
-                        - is used to configure an exponential back off for
-                        reconnect attempts
-                     </para>
-                  </listitem>
-                  <listitem>
-                     <para>
-                        <literal>reconnect-attempts</literal>
-                        - how many reconnect attempts should a client make before failing,
-                        -1 means unlimited.
-                     </para>
-                  </listitem>
-               </itemizedlist>
-            </section>
-            <section>
-               <title>Backup Server Configuration</title>
-               <para>
-                  Now let's look at how to create and configure a backup server on the same eap instance. This is running
-                  on the same eap instance as the live server from the previous chapter but is configured as the backup
-                  for a live server running on a different eap instance.
-               </para>
-               <para>
-                  The first thing to mention is that the backup only needs a <literal>activemq-jboss-beans.xml</literal>
-                  and a <literal>activemq-configuration.xml</literal> configuration file. This is because any JMS components
-                  are created from the Journal when the backup server becomes live.
-               </para>
-               <para>
-                  Firstly we need to define a new ActiveMQ Server that EAP will deploy. We do this by creating a new
-                  <literal>activemq-jboss-beans.xml</literal>
-                  configuration. We will place this under a new directory
-                  <literal>activemq-backup1</literal>
-                  which will need creating
-                  in the
-                  <literal>deploy</literal>
-                  directory but in reality it doesn't matter where this is put. This will look like:
-               </para>
-               <programlisting>
-   &lt;?xml version="1.0" encoding="UTF-8"?>
-
-   &lt;deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-      &lt;!-- The core configuration -->
-      &lt;bean name="BackupConfiguration" class="org.apache.activemq.core.config.impl.FileConfiguration">
-         &lt;property
-            name="configurationUrl">${jboss.server.home.url}/deploy/activemq-backup1/activemq-configuration.xml&lt;/property>
-      &lt;/bean>
-
-
-      &lt;!-- The core server -->
-      &lt;bean name="BackupActiveMQServer" class="org.apache.activemq.core.server.impl.ActiveMQServerImpl">
-         &lt;constructor>
-            &lt;parameter>
-               &lt;inject bean="BackupConfiguration"/>
-            &lt;/parameter>
-            &lt;parameter>
-               &lt;inject bean="MBeanServer"/>
-            &lt;/parameter>
-            &lt;parameter>
-               &lt;inject bean="ActiveMQSecurityManager"/>
-            &lt;/parameter>
-         &lt;/constructor>
-         &lt;start ignored="true"/>
-         &lt;stop ignored="true"/>
-      &lt;/bean>
-
-      &lt;!-- The JMS server -->
-      &lt;bean name="BackupJMSServerManager" class="org.apache.activemq.jms.server.impl.JMSServerManagerImpl">
-         &lt;constructor>
-            &lt;parameter>
-               &lt;inject bean="BackupActiveMQServer"/>
-            &lt;/parameter>
-         &lt;/constructor>
-      &lt;/bean>
-
-   &lt;/deployment>
-               </programlisting>
-               <para>
-                  The first thing to notice is the BackupConfiguration bean. This is configured to pick up the
-                  configuration
-                  for
-                  the
-                  server which we will place in the same directory.
-               </para>
-               <para>
-                  After that we just configure a new ActiveMQ Server and JMS server.
-               </para>
-               <note>
-                  <para>
-                     Notice that the names of the beans have been changed from that of the live servers configuration.
-                     This
-                     is
-                     so
-                     there is no clash. Obviously if you add more backup servers you will need to rename those as well,
-                     backup1,
-                     backup2 etc.
-                  </para>
-               </note>
-               <para>
-                  Now let's add the server configuration in
-                  <literal>activemq-configuration.xml</literal>
-                  and add it to the same directory
-                  <literal>deploy/activemq-backup1</literal>
-                  and configure it like so:
-               </para>
-               <programlisting>
-   &lt;configuration xmlns="urn:activemq"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
-
-      &lt;jmx-domain>org.apache.activemq.backup1&lt;/jmx-domain>
-
-      &lt;clustered>true&lt;/clustered>
-
-      &lt;backup>true&lt;/backup>
-
-      &lt;shared-store>true&lt;/shared-store>
-
-      &lt;allow-failback>true&lt;/allow-failback>
-
-      &lt;bindings-directory>/media/shared/data/activemq-backup/bindings&lt;/bindings-directory>
-
-      &lt;journal-directory>/media/shared/data/activemq-backup/journal&lt;/journal-directory>
-
-      &lt;journal-min-files>10&lt;/journal-min-files>
-
-      &lt;large-messages-directory>/media/shared/data/activemq-backup/largemessages&lt;/large-messages-directory>
-
-      &lt;paging-directory>/media/shared/data/activemq-backup/paging&lt;/paging-directory>
-
-      &lt;connectors>
-         &lt;connector name="netty-connector">
-            &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
-            &lt;param key="host" value="${jboss.bind.address:localhost}"/>
-            &lt;param key="port" value="${activemq.remoting.backup.netty.port:5446}"/>
-         &lt;/connector>
-
-         &lt;connector name="in-vm">
-            &lt;factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class>
-            &lt;param key="server-id" value="${activemq.server-id:0}"/>
-         &lt;/connector>
-
-      &lt;/connectors>
-
-      &lt;acceptors>
-         &lt;acceptor name="netty">
-            &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
-            &lt;param key="host" value="${jboss.bind.address:localhost}"/>
-            &lt;param key="port" value="${activemq.remoting.backup.netty.port:5446}"/>
-         &lt;/acceptor>
-      &lt;/acceptors>
-
-      &lt;broadcast-groups>
-         &lt;broadcast-group name="bg-group1">
-            &lt;group-address>231.7.7.7&lt;/group-address>
-            &lt;group-port>9876&lt;/group-port>
-            &lt;broadcast-period>1000&lt;/broadcast-period>
-            &lt;connector-ref>netty-connector&lt;/connector-ref>
-         &lt;/broadcast-group>
-      &lt;/broadcast-groups>
-
-      &lt;discovery-groups>
-         &lt;discovery-group name="dg-group1">
-            &lt;group-address>231.7.7.7&lt;/group-address>
-            &lt;group-port>9876&lt;/group-port>
-            &lt;refresh-timeout>60000&lt;/refresh-timeout>
-            &lt;/discovery-group>
-      &lt;/discovery-groups>
-
-      &lt;cluster-connections>
-         &lt;cluster-connection name="my-cluster">
-            &lt;address>jms&lt;/address>
-            &lt;connector-ref>netty-connector&lt;/connector-ref>
-            &lt;discovery-group-ref discovery-group-name="dg-group1"/>
-            &lt;!--max hops defines how messages are redistributed, the default is 1 meaning only distribute to directly
-            connected nodes, to disable set to 0-->
-            &lt;!--&lt;max-hops>0&lt;/max-hops>-->
-         &lt;/cluster-connection>
-      &lt;/cluster-connections>
-
-      &lt;security-settings>
-         &lt;security-setting match="#">
-            &lt;permission type="createNonDurableQueue" roles="guest"/>
-            &lt;permission type="deleteNonDurableQueue" roles="guest"/>
-            &lt;permission type="consume" roles="guest"/>
-            &lt;permission type="send" roles="guest"/>
-         &lt;/security-setting>
-      &lt;/security-settings>
-
-      &lt;address-settings>
-         &lt;!--default for catch all-->
-         &lt;address-setting match="#">
-            &lt;dead-letter-address>jms.queue.DLQ&lt;/dead-letter-address>
-            &lt;expiry-address>jms.queue.ExpiryQueue&lt;/expiry-address>
-            &lt;redelivery-delay>0&lt;/redelivery-delay>
-            &lt;max-size-bytes>10485760&lt;/max-size-bytes>
-            &lt;message-counter-history-day-limit>10&lt;/message-counter-history-day-limit>
-            &lt;address-full-policy>BLOCK&lt;/address-full-policy>
-         &lt;/address-setting>
-      &lt;/address-settings>
-
-   &lt;/configuration>
-
-               </programlisting>
-               <para>
-                  The second thing you can see is we have added a
-                  <literal>jmx-domain</literal>
-                  attribute, this is used when
-                  adding objects, such as the ActiveMQ server and JMS server to jmx, we change this from the default
-                  <literal>org.apache.activemq</literal>
-                  to avoid naming clashes with the live server
-               </para>
-               <para>
-                  The first important part of the configuration is to make sure that this server starts as a backup
-                  server not
-                  a live server, via the
-                  <literal>backup</literal>
-                  attribute.
-               </para>
-               <para>
-                  After that we have the same cluster configuration as live, that is
-                  <literal>clustered</literal>
-                  is true and
-                  <literal>shared-store</literal>
-                  is true. However you can see we have added a new configuration element
-                  <literal>allow-failback</literal>. When this is set to true then this backup server will automatically
-                  stop
-                  and fall back into backup node if failover occurs and the live server has become available. If false
-                  then
-                  the user will have to stop the server manually.
-               </para>
-               <para>
-                  Next we can see the configuration for the journal location, as in the live configuration this must
-                  point to
-                  the same directory as this backup's live server.
-               </para>
-               <para>
-                  Now we see the connectors configuration, we have 3 defined which are needed for the following
-               </para>
-               <itemizedlist>
-                  <listitem>
-                     <para>
-                        <literal>netty-connector.</literal>
-                        This is the connector used to connect to this backup server once live.
-                     </para>
-                  </listitem>
-               </itemizedlist>
-               <para>After that you will see the acceptors defined, This is the acceptor where clients will reconnect.
-               </para>
-               <para>
-                  The Broadcast groups, Discovery group and cluster configurations are as per normal, details of these
-                  can be found in the ActiveMQ user manual.
-               </para>
-               <note>
-                  <para>notice the commented out <literal>max-hops</literal> in the cluster connection, set this to 0 if
-                  you want to disable server side load balancing.</para>
-               </note>
-               <para>
-                  When the backup becomes it will be not be servicing any JEE components on this eap instance. Instead any
-                  existing messages will be redistributed around the cluster and new messages forwarded to and from the backup
-                  to service any remote clients it has (if it has any).
-               </para>
-            </section>
-            <section>
-               <title>Configuring multiple backups</title>
-               <para>
-                  In this instance we have assumed that there are only 2 nodes where each node has a backup for the other
-                  node. However you may want to configure a server too have multiple backup nodes. For example you may want
-                  3 nodes where each node has 2 backups, one for each of the other 2 live servers. For this you would simply
-                  copy the backup configuration and make sure you do the following:
-               </para>
-               <itemizedlist>
-                  <listitem>
-                     <para>
-                        Make sure that you give all the beans in the <literal>activemq-jboss-beans.xml</literal> configuration
-                        file a unique name, i.e.
-                     </para>
-                  </listitem>
-               </itemizedlist>
-            </section>
-            <section>
-               <title>Running the shipped example</title>
-               <para>
-                  EAP ships with an example configuration for this topology. Look under <literal>extras/activemq/resources/examples/symmetric-cluster-with-backups-colocated</literal>
-                  and follow the read me
-               </para>
-            </section>
-         </section>
-      </section>
-      <section>
-         <title>Dedicated Live and Backup in Symmetrical cluster</title>
-         <para>
-            In reality the configuration for this is exactly the same as the backup server in the previous section, the only
-            difference is that a backup will reside on an eap instance of its own rather than colocated with another live server.
-            Of course this means that the eap instance is passive and not used until the backup comes live and is only
-            really useful for pure JMS applications.
-         </para>
-         <para>The following diagram shows a possible configuration for this:</para>
-         <para>
-            <graphic fileref="images/simple-dedicated.jpg" align="center" format="jpg" scale="30"/>
-        </para>
-         <para>
-            Here you can see how this works with remote JMS clients. Once failover occurs the ActiveMQ backup Server takes
-            running within another eap instance takes over as live.
-         </para>
-         <para>
-            This is fine with applications that are pure JMS and have no JMS components such as MDB's. If you are using
-            JMS components then there are 2 ways that this can be done. The first is shown in the following diagram:
-         </para>
-         <para>
-            <graphic fileref="images/simple-dedicated-jca.jpg" align="center" format="jpg" scale="30"/>
-         </para>
-         <para>
-            Because there is no live activemq server running by default in the eap instance running the backup server it
-            makes no sense to host any applications in it. However you can host applications on the server running the live
-            activemq server. If failure occurs to an live activemq server then remote jms clients will failover as previously
-            explained however what happens to any messages meant for or sent from JEE components. Well when the backup comes
-            live, messages will be distributed to and from the backup server over ActiveMQ cluster connections and handled
-            appropriately.
-         </para>
-         <para>
-            The second way to do this is to have both live and backup server remote form the eap instance as shown in the
-            following diagram.
-         </para>
-         <para>
-            <graphic fileref="images/simple-dedicated-jca-remote.jpg" align="center" format="jpg" scale="30"/>
-         </para>
-         <para>
-            Here you can see that all the Application (via JCA) will be serviced by a ActiveMQ server in its own eap instance.
-         </para>
-         <section>
-            <title>Configuration of dedicated Live and backup</title>
-            <para>
-               The live server configuration is exactly the same as in the previous example. The only difference of course
-               is that there is no backup in the eap instance.
-            </para>
-            <para>
-               For the backup server the <literal>activemq-configuration.xml</literal> is unchanged, however since there is
-               no live server we need to make sure that the <literal>activemq-jboss-beans.xml</literal> instantiates all
-               the beans needed. For this simply use the same configuration as in the live server changing only the
-               location of the <literal>activemq-configuration.xml</literal> parameter for the <literal>Configuration</literal>
-               bean.
-            </para>
-            <para>
-               As before there will be no <literal>activemq-jms.xml</literal> or <literal>jms-ds.xml</literal> configuration.
-            </para>
-            <para>
-               If you want both activemq servers to be in there own dedicated server where they are remote to applications,
-               as in the last diagram. Then simply edit the <literal>jms-ds.xml</literal> and change the following lines to
-            </para>
-            <programlisting>
-   &lt;config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property>
-   &lt;config-property name="ConnectionParameters" type="java.lang.String">host=127.0.0.1;port=5446&lt;/config-property>
-            </programlisting>
-            <para>
-               This will change the outbound JCA connector, to configure the inbound connector for MDB's edit the
-               <literal>ra.xml</literal> config file and change the following parameters.
-            </para>
-            <programlisting>
-   &lt;config-property>
-      &lt;description>The transport type&lt;/description>
-      &lt;config-property-name>ConnectorClassName&lt;/config-property-name>
-      &lt;config-property-type>java.lang.String&lt;/config-property-type>
-      &lt;config-property-value>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property-value>
-   &lt;/config-property>
-   &lt;config-property>
-      &lt;description>The transport configuration. These values must be in the form of key=val;key=val;&lt;/description>
-      &lt;config-property-name>ConnectionParameters&lt;/config-property-name>
-      &lt;config-property-type>java.lang.String&lt;/config-property-type>
-      &lt;config-property-value>host=127.0.0.1;port=5446&lt;/config-property-value>
-   &lt;/config-property>
-            </programlisting>
-            <para>
-               In both cases the host and port should match your live server. If you are using Discovery then set the
-               appropriate parameters for <literal>DiscoveryAddress</literal> and <literal>DiscoveryPort</literal> to match
-               your configured broadcast groups.
-            </para>
-         </section>
-         <section>
-            <title>Running the shipped example</title>
-            <para>
-               EAP ships with an example configuration for this topology. Look under
-               <literal>extras/activemq/resources/examples/cluster-with-dedicated-backup</literal>
-               and follow the read me
-            </para>
-         </section>
-      </section>
-   </section>
-</chapter>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/diagrams/ha-topologies1.odg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/diagrams/ha-topologies1.odg b/docs/eap-manual/en/diagrams/ha-topologies1.odg
deleted file mode 100644
index f42e64f..0000000
Binary files a/docs/eap-manual/en/diagrams/ha-topologies1.odg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/images/simple-colocated.jpg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/images/simple-colocated.jpg b/docs/eap-manual/en/images/simple-colocated.jpg
deleted file mode 100644
index ed998e5..0000000
Binary files a/docs/eap-manual/en/images/simple-colocated.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/images/simple-colocated2.jpg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/images/simple-colocated2.jpg b/docs/eap-manual/en/images/simple-colocated2.jpg
deleted file mode 100644
index 76e6ee3..0000000
Binary files a/docs/eap-manual/en/images/simple-colocated2.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/images/simple-colocated3.jpg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/images/simple-colocated3.jpg b/docs/eap-manual/en/images/simple-colocated3.jpg
deleted file mode 100644
index d07a9eb..0000000
Binary files a/docs/eap-manual/en/images/simple-colocated3.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/images/simple-dedicated-jca-remote.jpg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/images/simple-dedicated-jca-remote.jpg b/docs/eap-manual/en/images/simple-dedicated-jca-remote.jpg
deleted file mode 100644
index 6a98b3a..0000000
Binary files a/docs/eap-manual/en/images/simple-dedicated-jca-remote.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/images/simple-dedicated-jca.jpg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/images/simple-dedicated-jca.jpg b/docs/eap-manual/en/images/simple-dedicated-jca.jpg
deleted file mode 100644
index 4d6387f..0000000
Binary files a/docs/eap-manual/en/images/simple-dedicated-jca.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/images/simple-dedicated.jpg
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/images/simple-dedicated.jpg b/docs/eap-manual/en/images/simple-dedicated.jpg
deleted file mode 100644
index ea97b2c..0000000
Binary files a/docs/eap-manual/en/images/simple-dedicated.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4245a6b4/docs/eap-manual/en/master.xml
----------------------------------------------------------------------
diff --git a/docs/eap-manual/en/master.xml b/docs/eap-manual/en/master.xml
deleted file mode 100644
index e69de29..0000000


Mime
View raw message