Repository: qpid-site Updated Branches: refs/heads/asf-site 1b73996fd -> f74d600bf
QPID-7265: update qpid-java release scripts to account for 0-10 client docs, fix some link issues Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/45461d95 Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/45461d95 Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/45461d95 Branch: refs/heads/asf-site Commit: 45461d957e06820540fbe436f61612f30f18c85b Parents: e53ba14 Author: Robert Gemmell <[email protected]> Authored: Sun May 15 15:55:56 2016 +0100 Committer: Robert Gemmell <[email protected]> Committed: Sun May 15 15:57:23 2016 +0100 ---------------------------------------------------------------------- input/components/jms/amqp-0-x.md | 4 ++-- scripts/gen-java-release-books | 14 +++++++++----- scripts/gen-java-release-examples | 6 +++--- scripts/gen-java-release-page | 6 +----- 4 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/45461d95/input/components/jms/amqp-0-x.md ---------------------------------------------------------------------- diff --git a/input/components/jms/amqp-0-x.md b/input/components/jms/amqp-0-x.md index c9b0b26..4c5ccb4 100644 --- a/input/components/jms/amqp-0-x.md +++ b/input/components/jms/amqp-0-x.md @@ -23,9 +23,9 @@ The client is also available [via Maven]({{site_url}}/maven.html). <div class="two-column" markdown="1"> - [API reference](http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html) - - [Using the Qpid JMS client (AMQP 0-10)]({{current_release_url}}/programming/book/QpidJMS.html) + - [Using the Qpid JMS client (AMQP 0-10)]({{current_java_release_url}}/jms-client-0-10/book/index.html) - [Using the Qpid JMS client (AMQP 0-9-1, 0-9, 0-8)]({{current_java_release_url}}/jms-client-0-8/book/index.html) - - [Examples (AMQP 0-10)]({{current_release_url}}/qpid-jms/examples/index.html) + - [Examples (AMQP 0-10)]({{current_java_release_url}}/qpid-jms/examples/index.html) - [Examples (AMQP 0-9-1, 0-9, 0-8)]({{current_java_release_url}}/jms-client-0-8/book/JMS-Client-0-8-Examples.html) </div> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/45461d95/scripts/gen-java-release-books ---------------------------------------------------------------------- diff --git a/scripts/gen-java-release-books b/scripts/gen-java-release-books index 90fdb6e..4e29862 100755 --- a/scripts/gen-java-release-books +++ b/scripts/gen-java-release-books @@ -28,27 +28,31 @@ def gen_books(release, source_dir, output_dir): input_dir = join(source_dir, "doc") cpp_broker_book_url = "/releases/qpid-cpp-{{current_cpp_release}}/cpp-broker/book/" - # TODO seems programming book is rather in limbo at the moment, neither published with cpp or java? - programming_book_url = "/releases/qpid-0.32/programming/book/" + jms_client010_book_url = "/releases/qpid-java-{}/jms-client-0-10/book/".format(release) - call("mvn -f {} -pl doc -amd -Ddoc=true package -DqpidCppBook={} -DqpidProgrammingBook={}", + call("mvn -f {} -pl doc -amd -Ddoc=true package -DqpidCppBook={} -DqpidJmsClient010Book={}", toplevel_pom, cpp_broker_book_url, - programming_book_url) + jms_client010_book_url) java_broker_input_dir = join(input_dir, "java-broker", "target", "docbkx") jms_client08_input_dir = join(input_dir, "jms-client-0-8", "target", "docbkx") + jms_client010_input_dir = join(input_dir, "jms-client-0-10", "target", "docbkx") + java_broker_output_dir = join(output_dir, "java-broker") jms_client08_output_dir = join(output_dir, "jms-client-0-8") + jms_client010_output_dir = join(output_dir, "jms-client-0-10") remove(java_broker_output_dir) remove(jms_client08_output_dir) + remove(jms_client010_output_dir) copy(java_broker_input_dir, join(java_broker_output_dir, "book")) copy(jms_client08_input_dir, join(jms_client08_output_dir, "book")) + copy(jms_client010_input_dir, join(jms_client010_output_dir, "book")) - output_dirs = [java_broker_output_dir, jms_client08_output_dir] + output_dirs = [java_broker_output_dir, jms_client08_output_dir, jms_client010_output_dir] for dir in output_dirs: for path in find(dir, "*.html"): http://git-wip-us.apache.org/repos/asf/qpid-site/blob/45461d95/scripts/gen-java-release-examples ---------------------------------------------------------------------- diff --git a/scripts/gen-java-release-examples b/scripts/gen-java-release-examples index 997f7e7..32411fc 100755 --- a/scripts/gen-java-release-examples +++ b/scripts/gen-java-release-examples @@ -28,9 +28,9 @@ def gen_jms(release, source_dir, release_dir): "java", "org", "apache", "qpid", "example") output_dir = join(component_dir, "examples") - release_url = get_release_branch_url("java", release) - readme_url = "{}/java/client/README.txt".format(release_url) - source_url = "{}/java/client/example/src/main/java/org/apache/qpid/example".format(release_url) + release_url = "http://svn.apache.org/repos/asf/qpid/java/tags/{}".format(release) + readme_url = "{}/client/README.txt".format(release_url) + source_url = "{}/client/example/src/main/java/org/apache/qpid/example".format(release_url) input_names = list_dir(input_dir, "*.java", "*.properties") http://git-wip-us.apache.org/repos/asf/qpid-site/blob/45461d95/scripts/gen-java-release-page ---------------------------------------------------------------------- diff --git a/scripts/gen-java-release-page b/scripts/gen-java-release-page index 44eec0e..5494d74 100755 --- a/scripts/gen-java-release-page +++ b/scripts/gen-java-release-page @@ -24,15 +24,11 @@ from datetime import datetime source_artefact_records = ( ("qpid-java-{}.tar.gz", "Java broker, Qpid JMS, Qpid JCA"), -# ("qpid-java-qmf-tools-{}.tar.gz", "Java QMF tools"), ) binary_artefact_records = ( ("qpid-broker-{}-bin.tar.gz", "Java broker"), ("qpid-client-{}-bin.tar.gz", "Qpid JMS (AMQP 0-10, 0-9-1, 0-9, 0-8)"), -# ("qpid-amqp-1-0-client-jms-{}-bin.tar.gz", "Qpid JMS (AMQP 1.0) ^"), -# ("qpid-qmf2-tools-{}-bin.tar.gz", "Java QMF tools"), -# ("qpid-broker-plugins-management-qmf2-{}-bin.tar.gz", "Broker plugins for the Java QMF tools"), ) component_records = ( @@ -48,7 +44,7 @@ documentation = \ - [Installing Qpid Java](java-broker/book/Java-Broker-Installation.html) - [Java broker book](java-broker/book/index.html) - [API reference](http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html) -;; - [Using the Qpid JMS client (AMQP 0-10)](programming/book/QpidJMS.html) ([PDF](programming/programming-book.pdf)) + - [Using the Qpid JMS client (AMQP 0-10)](jms-client-0-10/book/index.html) - [Using the Qpid JMS client (AMQP 0-9-1, 0-9, 0-8)](jms-client-0-8/book/index.html) - [JMS examples (AMQP 0-10)](qpid-jms/examples/index.html) - [JMS examples (AMQP 0-9-1, 0-9, 0-8)](jms-client-0-8/book/JMS-Client-0-8-Examples.html) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
