diff --git a/docs/user-manual/en/architecture.md b/docs/user-manual/en/architecture.md index 91a1a9c404..83904905b9 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 diff --git a/docs/user-manual/en/diagrams/architecture-diagrams.odg b/docs/user-manual/en/diagrams/architecture-diagrams.odg index 33d99cf6bb..e73560be77 100644 Binary files a/docs/user-manual/en/diagrams/architecture-diagrams.odg and b/docs/user-manual/en/diagrams/architecture-diagrams.odg differ diff --git a/docs/user-manual/en/images/architecture1.jpg b/docs/user-manual/en/images/architecture1.jpg index cb1161f645..3320b0304e 100644 Binary files a/docs/user-manual/en/images/architecture1.jpg and b/docs/user-manual/en/images/architecture1.jpg differ diff --git a/docs/user-manual/en/images/architecture2.jpg b/docs/user-manual/en/images/architecture2.jpg index 274f578a5e..9645f34bef 100644 Binary files a/docs/user-manual/en/images/architecture2.jpg and b/docs/user-manual/en/images/architecture2.jpg differ diff --git a/docs/user-manual/en/images/architecture3.jpg b/docs/user-manual/en/images/architecture3.jpg index 3c1dfd5742..f8c250a9f1 100644 Binary files a/docs/user-manual/en/images/architecture3.jpg and b/docs/user-manual/en/images/architecture3.jpg differ diff --git a/docs/user-manual/en/messaging-concepts.md b/docs/user-manual/en/messaging-concepts.md index 5f2ea31cd7..e963d2a66e 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 diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md index 9497ac0aa1..44e03756ae 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 - - ` +`java -cp activemq-tools-jar-with-dependencies.jar export-journal ` 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 - - ` +`java -cp activemq-tools-jar-with-dependencies.jar import-journal ` -- 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.