You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/02/26 10:26:03 UTC
[3/5] activemq-6 git commit: doc changes on architecture including
picture changes
doc changes on architecture including picture changes
I have changed the OpenOffice files. Exported the pictures
As I exported the pictures I selected the group on the slide,
File->Export, JPG file, and selected selection only.
The size was the default size and that worked alright.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/c8708784
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/c8708784
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/c8708784
Branch: refs/heads/master
Commit: c870878402b9aa999dde7c580e445845db1ffde6
Parents: cec3ddf
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Feb 25 15:29:36 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Feb 26 00:26:52 2015 -0500
----------------------------------------------------------------------
docs/user-manual/en/architecture.md | 15 ++++++++----
.../en/diagrams/architecture-diagrams.odg | Bin 10587 -> 12181 bytes
docs/user-manual/en/images/architecture1.jpg | Bin 19948 -> 38156 bytes
docs/user-manual/en/images/architecture2.jpg | Bin 18718 -> 15337 bytes
docs/user-manual/en/images/architecture3.jpg | Bin 12274 -> 9614 bytes
docs/user-manual/en/messaging-concepts.md | 2 +-
docs/user-manual/en/persistence.md | 23 +++++++------------
7 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/architecture.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/architecture.md b/docs/user-manual/en/architecture.md
index 91a1a9c..8390490 100644
--- a/docs/user-manual/en/architecture.md
+++ b/docs/user-manual/en/architecture.md
@@ -28,14 +28,21 @@ ActiveMQ clients, potentially on different physical machines interact
with the ActiveMQ server. ActiveMQ currently provides two APIs for
messaging at the client side:
-1. Core client API. This is a simple intuitive Java API that allows the
+1. Core client API. This is a simple intuitive Java API that allows the
full set of messaging functionality without some of the complexities
of JMS.
-2. JMS client API. The standard JMS API is available at the client
+2. JMS client API. The standard JMS API is available at the client
side.
-JMS semantics are implemented by a thin JMS facade layer on the client
+ActiveMQ also provides different protocol implementations on the server so you can use respective clients for these protocols:
+
+1. Stomp
+2. OpenWire
+3. AMQP
+
+
+JMS semantics are implemented by a JMS facade layer on the client
side.
The ActiveMQ server does not speak JMS and in fact does not know
@@ -66,7 +73,7 @@ application that requires messaging functionality internally but you
don't want to expose that as a ActiveMQ server you can directly
instantiate and embed ActiveMQ servers in your own application.
-For more information on embedding ActiveMQ, see [Embedding HornetQ](embedding-hornetq.md).
+For more information on embedding ActiveMQ, see [Embedding ActiveMQ](embedding-activemq.md).
## ActiveMQ integrated with a JEE application server
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/diagrams/architecture-diagrams.odg
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/diagrams/architecture-diagrams.odg b/docs/user-manual/en/diagrams/architecture-diagrams.odg
index 33d99cf..e73560b 100644
Binary files a/docs/user-manual/en/diagrams/architecture-diagrams.odg and b/docs/user-manual/en/diagrams/architecture-diagrams.odg differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/images/architecture1.jpg
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/architecture1.jpg b/docs/user-manual/en/images/architecture1.jpg
index cb1161f..3320b03 100644
Binary files a/docs/user-manual/en/images/architecture1.jpg and b/docs/user-manual/en/images/architecture1.jpg differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/images/architecture2.jpg
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/architecture2.jpg b/docs/user-manual/en/images/architecture2.jpg
index 274f578..9645f34 100644
Binary files a/docs/user-manual/en/images/architecture2.jpg and b/docs/user-manual/en/images/architecture2.jpg differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/images/architecture3.jpg
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/images/architecture3.jpg b/docs/user-manual/en/images/architecture3.jpg
index 3c1dfd5..f8c250a 100644
Binary files a/docs/user-manual/en/images/architecture3.jpg and b/docs/user-manual/en/images/architecture3.jpg differ
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/messaging-concepts.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/messaging-concepts.md b/docs/user-manual/en/messaging-concepts.md
index 5f2ea31..e963d2a 100644
--- a/docs/user-manual/en/messaging-concepts.md
+++ b/docs/user-manual/en/messaging-concepts.md
@@ -170,7 +170,7 @@ Let's take a brief look at these:
### Java Message Service (JMS)
[JMS](http://en.wikipedia.org/wiki/Java_Message_Service) is part of
-Sun's JEE specification. It's a Java API that encapsulates both message
+Oracle's JEE specification. It's a Java API that encapsulates both message
queue and publish-subscribe messaging patterns. JMS is a lowest common
denominator specification - i.e. it was created to encapsulate common
functionality of the already existing messaging systems that were
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c8708784/docs/user-manual/en/persistence.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md
index 9497ac0..44e0375 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -354,31 +354,24 @@ message data, duplicate id caches or paging data will be persisted.
You may want to inspect the existent records on each one of the journals
used by ActiveMQ, and you can use the export/import tool for that
-purpose. The export/import are classes located at the activemq-core.jar,
+purpose.
you can export the journal as a text file by using this command:
-`java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal
- <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>
- <FileOutput>`
+`java -cp activemq-tools-jar-with-dependencies.jar export-journal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>`
To import the file as binary data on the journal (Notice you also
require netty.jar):
-`java -cp activemq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal
- <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>
- <FileInput>`
+`java -cp activemq-tools-jar-with-dependencies.jar import-journal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileInput>`
-- JournalDirectory: Use the configured folder for your selected
- folder. Example: ./activemq/data/journal
+- JournalDirectory: Use the configured folder for your selected folder. Example: ./activemq/data/journal
-- JournalPrefix: Use the prefix for your selected journal, as
- discussed above
+- JournalPrefix: Use the prefix for your selected journal, as discussed above
-- FileExtension: Use the extension for your selected journal, as
- discussed above
+- FileExtension: Use the extension for your selected journal, as discussed above
- FileSize: Use the size for your selected journal, as discussed above
-- FileOutput: text file that will contain the exported data
-
+- FileOutput or FileInput: text file that will contain the exported data
+See [Tools](tools.md) for more information.