From b5cb6522a6bf5fc0513dcc72a3b69c59db2c8be3 Mon Sep 17 00:00:00 2001 From: Martyn Taylor Date: Wed, 13 May 2015 12:31:31 +0100 Subject: [PATCH 1/2] Doc updates --- docs/quickstart-guide/en/about.md | 4 ++-- docs/quickstart-guide/en/download.md | 26 +++----------------------- docs/quickstart-guide/en/examples.md | 14 +++++++------- docs/user-manual/en/flow-control.md | 3 +-- 4 files changed, 13 insertions(+), 34 deletions(-) diff --git a/docs/quickstart-guide/en/about.md b/docs/quickstart-guide/en/about.md index 96eaedf0fb..0a74458941 100644 --- a/docs/quickstart-guide/en/about.md +++ b/docs/quickstart-guide/en/about.md @@ -11,14 +11,14 @@ What is ActiveMQ? isn't please visit the [FAQs wiki page](http://www.jboss.org/community/wiki/ActiveMQGeneralFAQs). -Why use ActiveMQ? Here are just a few of the reasons: +Why use ActiveMQ Artemis? Here are just a few of the reasons: - 100% open source software. ActiveMQ Artemis is licenced using the Apache Software License v2.0 to minimise barriers to adoption. - ActiveMQ Artemis is designed with usability in mind. -- Written in Java. Runs on any platform with a Java 6+ runtime, that's +- Written in Java. Runs on any platform with a Java 7+ runtime, that's everything from Windows desktops to IBM mainframes. - Amazing performance. Our class beating high performance journal diff --git a/docs/quickstart-guide/en/download.md b/docs/quickstart-guide/en/download.md index 6004bf4ab8..35ca689c86 100644 --- a/docs/quickstart-guide/en/download.md +++ b/docs/quickstart-guide/en/download.md @@ -1,36 +1,16 @@ Download ======== -The official ActiveMQ Artemis project page is . +The official ActiveMQ Artemis project page is . Software Download ================= The software can be download from the Download -page: +page: Project Information =================== -- Please take a look at our project - [wiki](http://www.jboss.org/community/wiki/ActiveMQ) - -- If you have any user questions please use our [user - forum](https://community.jboss.org/en/activemq) - -- If you have development related questions, please use our [developer - forum](http://www.jboss.org/index.html?module=bb&op=viewforum&f=313) - -- Pop in and chat to us in our [IRC - channel](irc://irc.freenode.net:6667/activemq) - -- Our project [blog](http://activemq.blogspot.com/) - -- Follow us on [twitter](http://twitter.com/activemq) - -- ActiveMQ Artemis Git repository is - -- All release tags are available from - - +- ActiveMQ Artemis Git repository is diff --git a/docs/quickstart-guide/en/examples.md b/docs/quickstart-guide/en/examples.md index f050a9c6e0..78ff9d856b 100644 --- a/docs/quickstart-guide/en/examples.md +++ b/docs/quickstart-guide/en/examples.md @@ -44,7 +44,7 @@ Type the command `mvn verify` and you should see the following output: [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ - [INFO] Building ActiveMQ Artemis JMS Queue Example 2.3.0.BETA-SNAPSHOT + [INFO] Building ActiveMQ Artemis JMS Queue Example 1.0.0 [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jms-queue-example --- @@ -64,21 +64,21 @@ Type the command `mvn verify` and you should see the following output: [INFO] --- maven-surefire-plugin:2.13:test (default-test) @ activemq-jms-queue-example --- [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ activemq-jms-queue-example --- - [INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT.jar + [INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-1.0.0.jar [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example >>> [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example --- - [INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT-sources.jar + [INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-1.0.0-sources.jar [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example >>> [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example --- - [WARNING] Artifact org.apache.activemq.examples.jms:activemq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate + [WARNING] Artifact org.apache.activemq.examples.jms:activemq-jms-queue-example:java-source:sources:1.0.0 already attached to project, ignoring duplicate [INFO] [INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ activemq-jms-queue-example --- [file:/home/andy/projects/activemq-master/examples/jms/queue/target/classes/activemq/server0/] @@ -103,7 +103,7 @@ Type the command `mvn verify` and you should see the following output: Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run INFO: AMQ221007: Server is now live Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start - INFO: AMQ221001: ActiveMQ Artemis Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] + INFO: AMQ221001: ActiveMQ Artemis Server version 1.0.0 (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] [INFO] [INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ activemq-jms-queue-example --- Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.ActiveMQExample getContext @@ -120,7 +120,7 @@ Type the command `mvn verify` and you should see the following output: Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.management.impl.ManagementServiceImpl stop WARN: AMQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor] Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl stop - INFO: AMQ221002: ActiveMQ Artemis Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped + INFO: AMQ221002: ActiveMQ Artemis Server version 1.0.0 (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] stopped [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ @@ -157,7 +157,7 @@ In the shell window you should see something like the following output: [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ - [INFO] Building ActiveMQ Artemis JEE MDB Example 2.3.0.BETA-SNAPSHOT + [INFO] Building ActiveMQ Artemis JEE MDB Example 1.0.0 [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jee-mdb-bmt-example --- diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md index 7bec8b7180..7f45f4fe53 100644 --- a/docs/user-manual/en/flow-control.md +++ b/docs/user-manual/en/flow-control.md @@ -39,8 +39,7 @@ The value can be: - `-1` for an *unbounded* buffer -- `0` to not buffer any messages. See ? for working example of a - consumer with no buffering. +- `0` to not buffer any messages. - `>0` for a buffer with the given maximum size in bytes. From e1ce1719b54dc1ecad93f3f7dde3134ddb695325 Mon Sep 17 00:00:00 2001 From: Martyn Taylor Date: Wed, 13 May 2015 12:56:46 +0100 Subject: [PATCH 2/2] Exclude dev files and other docs from src distro --- .../src/main/assembly/source-assembly.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml index 3509b53586..87129d6fee 100644 --- a/artemis-distribution/src/main/assembly/source-assembly.xml +++ b/artemis-distribution/src/main/assembly/source-assembly.xml @@ -38,10 +38,21 @@ should use this descriptor directly in future --> tests/extra-tests/ - + data/ + + docs/design-guide/ + docs/diagrams/ + docs/quickstart-guide/ + + + RELEASING.md + ratReport.txt + .gitignore + artemis_doap.rdf + %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]