You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/21 22:35:19 UTC
[02/23] qpid-site git commit: NO-JIRA: Update JMS AMQP 0-x templates
and scripts
NO-JIRA: Update JMS AMQP 0-x templates and scripts
Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/fd5570e5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/fd5570e5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/fd5570e5
Branch: refs/heads/asf-site
Commit: fd5570e543a61c4eecd4669bf0300678a99bb183
Parents: aa2d455
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Nov 21 22:32:16 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Nov 21 22:32:16 2017 +0000
----------------------------------------------------------------------
input/components/jms/amqp-0-x.md | 20 +++---
input/maven.md | 2 +-
input/releases/index.md | 1 +
scripts/gen-jms-amqp-0-x-release-docs | 105 +++++++++++++++++++++++++++-
scripts/gen-jms-amqp-0-x-release-notes | 4 +-
scripts/gen-jms-amqp-0-x-release-page | 21 +++---
6 files changed, 130 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/fd5570e5/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 bac97f6..f42edda 100644
--- a/input/components/jms/amqp-0-x.md
+++ b/input/components/jms/amqp-0-x.md
@@ -1,18 +1,16 @@
-# AMQP 0-x JMS
+# Qpid JMS AMQP 0-x
A JMS 1.1 implementation supporting AMQP versions 0-10, 0-9-1, 0-9, and
0-8. For AMQP 1.0 support, use the newer [Qpid JMS](index.html) client.
## Download
-This JMS implementation is released as part of {{current_java_release_link}}.
-
<div class="two-column" markdown="1">
- - [Java binary](http://www.apache.org/dyn/closer.lua/qpid/java/{{current_java_release}}/binaries/qpid-client-{{current_java_release}}-bin.tar.gz)
- - [PGP signature](http://www.apache.org/dist/qpid/java/{{current_java_release}}/binaries/qpid-client-{{current_java_release}}-bin.tar.gz.asc)
- - [MD5 checksum](http://www.apache.org/dist/qpid/java/{{current_java_release}}/binaries/qpid-client-{{current_java_release}}-bin.tar.gz.md5)
- - [SHA512 checksum](http://www.apache.org/dist/qpid/java/{{current_java_release}}/binaries/qpid-client-{{current_java_release}}-bin.tar.gz.sha)
+ - [Binary](http://www.apache.org/dyn/closer.lua/qpid/jms-amqp-0-x/{{current_jms_amqp_0_x_release}}/binaries/apache-qpid-jms-amqp-0-x-{{current_jms_amqp_0_x_release}}-bin.tar.gz)
+ - [PGP signature](http://www.apache.org/dist/qpid/jms-amqp-0-x/{{current_jms_amqp_0_x_release}}/binaries/apache-qpid-jms-amqp-0-x-{{current_jms_amqp_0_x_release}}-bin.tar.gz.asc)
+ - [MD5 checksum](http://www.apache.org/dist/qpid/jms-amqp-0-x/{{current_jms_amqp_0_x_release}}/binaries/apache-qpid-jms-amqp-0-x-{{current_jms_amqp_0_x_release}}-bin.tar.gz.md5)
+ - [SHA512 checksum](http://www.apache.org/dist/qpid/jms-amqp-0-x/{{current_jms_amqp_0_x_release}}/binaries/apache-qpid-jms-amqp-0-x-{{current_jms_amqp_0_x_release}}-bin.tar.gz.sha512)
</div>
@@ -23,10 +21,10 @@ 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_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_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)
+ - [Using the Qpid JMS AMQP 0-x - AMQP 0-10]({{current_jms_amqp_0_x_release_url}}/jms-amqp-0-10-book/index.html)
+ - [Using the Qpid JMS AMQP 0-x - AMQP 0-9-1, 0-9, 0-8]({{current_jms_amqp_0_x_release_url}}/jms-amqp-0-8-book/index.html)
+ - [Examples (AMQP 0-10)]({{current_jms_amqp_0_x_release_url}}/examples/index.html)
+ - [Examples (AMQP 0-9-1, 0-9, 0-8)]({{current_jms_amqp_0_x_release_url}}/jms-amqp-0-8-book/JMS-Client-0-8-Examples.html)
</div>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/fd5570e5/input/maven.md
----------------------------------------------------------------------
diff --git a/input/maven.md b/input/maven.md
index 788c5e7..980df03 100644
--- a/input/maven.md
+++ b/input/maven.md
@@ -39,7 +39,7 @@ The following dependencies can be added to the POM for your Maven build to utili
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.qpid<span class="nt"></groupId></span>
<span class="nt"><artifactId></span>qpid-client<span class="nt"></artifactId></span>
- <span class="nt"><version></span>{{current_java_release}}<span class="nt"></version></span>
+ <span class="nt"><version></span>{{current_jms_amqp_0_x_release}}<span class="nt"></version></span>
<span class="nt"></dependency></span>
<span class="nt"><dependency></span>
<span class="nt"><groupId></span>org.apache.geronimo.specs<span class="nt"></groupId></span>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/fd5570e5/input/releases/index.md
----------------------------------------------------------------------
diff --git a/input/releases/index.md b/input/releases/index.md
index 0792b25..7ae5351 100644
--- a/input/releases/index.md
+++ b/input/releases/index.md
@@ -28,6 +28,7 @@ the
<div class="two-column" markdown="1">
+ - [Qpid JMS AMQP 0-x 6.3.0](qpid-jms-amqp-0-x-6.3.0/index.html), November 2017
- [Qpid Broker-J 7.0.0](qpid-broker-j-7.0.0/index.html), November 2017
- [Qpid JMS 0.27.0](qpid-jms-0.27.0/index.html), October 2017
- [Qpid Proton 0.18.1](qpid-proton-0.18.1/index.html), November 2017
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/fd5570e5/scripts/gen-jms-amqp-0-x-release-docs
----------------------------------------------------------------------
diff --git a/scripts/gen-jms-amqp-0-x-release-docs b/scripts/gen-jms-amqp-0-x-release-docs
index 58125f4..e080d55 100755
--- a/scripts/gen-jms-amqp-0-x-release-docs
+++ b/scripts/gen-jms-amqp-0-x-release-docs
@@ -19,9 +19,111 @@
#
from generate import *
+import uuid
+from xml.etree import ElementTree
def gen_jms_docs(release, source_dir, output_dir):
- pass
+ toplevel_pom = join(source_dir, "pom.xml")
+ input_dir = join(source_dir, "doc")
+
+ cpp_broker_book_url = "/releases/qpid-cpp-{{current_cpp_release}}/cpp-broker/book/"
+ jms_client010_book_url = "/releases/qpid-jms-0-x-{}/jms-0-10/book/".format(release)
+
+ call("mvn -f {} -pl doc -amd -Ddoc=true package -DqpidCppBook={} -DqpidJmsClient010Book={}",
+ toplevel_pom,
+ cpp_broker_book_url,
+ jms_client010_book_url)
+
+ 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")
+
+ jms_client08_output_dir = join(output_dir, "jms-amqp-0-8-book")
+ jms_client010_output_dir = join(output_dir, "jms-amqp-0-10-book")
+
+ remove(jms_client08_output_dir)
+ remove(jms_client010_output_dir)
+
+ copy(jms_client08_input_dir, jms_client08_output_dir)
+ copy(jms_client010_input_dir, jms_client010_output_dir)
+
+ output_dirs = [jms_client08_output_dir, jms_client010_output_dir]
+
+ for dir in output_dirs:
+ for path in find(dir, "*.html"):
+ print path
+
+ tree = ElementTree.parse(path)
+ elem = tree.find(".//{http://www.w3.org/1999/xhtml}body")
+
+ elem.tag = "div"
+ elem.set("class", "docbook")
+
+ remove_namespace(elem, "http://www.w3.org/1999/xhtml")
+
+ # A hack to preserve docbook's empty anchors in an
+ # IE-compatible way
+
+ target = str(uuid.uuid4())
+
+ for a in tree.iter("a"):
+ if a.text is None:
+ a.text = target
+
+ content = ElementTree.tostring(elem)
+ content = content.replace(target, "")
+
+ write("{}.in".format(path), content)
+ remove(path)
+
+def infile_replace(filename, old_string, new_string):
+ fileContent = ""
+ with open(filename,'r') as f:
+ fileContent=f.read()
+ if old_string in fileContent:
+ newContent=fileContent.replace(old_string, new_string)
+ with open(filename,'w') as f:
+ f.write(newContent)
+ f.flush()
+
+# From http://homework.nwsnet.de/releases/45be/
+def remove_namespace(doc, namespace):
+ """Remove namespace in the passed document in place."""
+ ns = u'{%s}' % namespace
+ nsl = len(ns)
+ for elem in doc.getiterator():
+ if elem.tag.startswith(ns):
+ elem.tag = elem.tag[nsl:]
+
+def gen_jms_examples(release, source_dir, release_dir):
+ input_dir = join(source_dir, "client", "example", "src", "main",
+ "java", "org", "apache", "qpid", "example")
+ output_dir = join(release_dir, "examples")
+
+ release_url = "https://github.com/apache/qpid-jms-amqp-0-x/tree/{}".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")
+
+ for name in input_names:
+ lang = "java"
+
+ if name.endswith(".properties"):
+ lang = "ini"
+
+ gen_example_page(release=release,
+ input_dir=input_dir,
+ input_name=name,
+ output_dir=output_dir,
+ lang=lang)
+
+ gen_examples_index(release=release,
+ input_names=input_names,
+ output_dir=output_dir,
+ title="Qpid JMS AMQP 0-x Examples",
+ readme_url=readme_url,
+ source_url=source_url)
+
## Now do stuff ##
@@ -29,5 +131,6 @@ release, issues_release, source_release, release_dir, checkout_dir = setup_relea
source_dir = checkout_dir or fetch_source("jms-amqp-0-x", source_release)
gen_jms_docs(release, source_dir, release_dir)
+gen_jms_examples(release, source_dir, release_dir)
notice("Docs generated")
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/fd5570e5/scripts/gen-jms-amqp-0-x-release-notes
----------------------------------------------------------------------
diff --git a/scripts/gen-jms-amqp-0-x-release-notes b/scripts/gen-jms-amqp-0-x-release-notes
index dac4f82..19a0fb8 100755
--- a/scripts/gen-jms-amqp-0-x-release-notes
+++ b/scripts/gen-jms-amqp-0-x-release-notes
@@ -41,9 +41,9 @@ template = \
;; under the License.
;;
-# Qpid JMS for AMQP 0-x {release} Release Notes
+# Qpid JMS AMQP 0-x {release} Release Notes
-Qpid JMS for AMQP 0-x is XXX.
+Qpid JMS AMQP 0-x is JMS 1.1 compatible client which can speak AMQP 0-8,0-9,0-9-1 and 0-10.
For more information about this release, including download links and
documentation, see the [release overview](index.html).
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/fd5570e5/scripts/gen-jms-amqp-0-x-release-page
----------------------------------------------------------------------
diff --git a/scripts/gen-jms-amqp-0-x-release-page b/scripts/gen-jms-amqp-0-x-release-page
index 98e6d27..6d31508 100755
--- a/scripts/gen-jms-amqp-0-x-release-page
+++ b/scripts/gen-jms-amqp-0-x-release-page
@@ -23,8 +23,9 @@ from generate import *
from datetime import datetime
download_records = (
- ("apache-qpid-jms-amqp-0-x-{}-bin.tar.gz", "Qpid JMS binaries"),
- ("apache-qpid-jms-amqp-0-x-{}-src.tar.gz", "Qpid JMS source code"),
+ ("apache-qpid-jms-amqp-0-x-{}-bin.tar.gz", "Qpid JMS binaries", "binaries/"),
+ ("apache-qpid-jms-amqp-0-x-{}-bin.zip", "Qpid JMS binaries", "binaries/"),
+ ("apache-qpid-jms-amqp-0-x-{}-src.tar.gz", "Qpid JMS source code", ""),
)
documentation = \
@@ -32,6 +33,10 @@ documentation = \
<div class="two-column" markdown="1">
- [API reference](http://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html)
+ - [Using the Qpid JMS AMQP 0-x - AMQP 0-10](jms-amqp-0-10-book/index.html)
+ - [Using the Qpid JMS AMQP 0-x - AMQP 0-9-1, 0-9, 0-8](jms-amqp-0-8-book/index.html)
+ - [Examples (AMQP 0-10)](examples/index.html)
+ - [Examples (AMQP 0-9-1, 0-9, 0-8)](jms-amqp-0-8-book/JMS-Client-0-8-Examples.html)
</div>
"""
@@ -57,9 +62,9 @@ template = \
;; under the License.
;;
-# Qpid JMS for AMQP 0-x {release}
+# Qpid JMS AMQP 0-x {release}
-Qpid JMS for AMQP 0-x is XXX.
+Qpid JMS AMQP 0-x is JMS 1.1 compatible client which can speak AMQP 0-8,0-9,0-9-1 and 0-10.
For a detailed list of the changes in this release, see the [release
notes](release-notes.html).
@@ -103,14 +108,14 @@ def gen_release_page(release, issues_release, source_release, release_dir):
downloads = list()
components = list()
- artifact_url_template = "http://archive.apache.org/dist/qpid/jms-amqp-0-x/{}/{}"
+ artifact_url_template = "http://archive.apache.org/dist/qpid/jms-amqp-0-x/{}/{}{}"
- for artifact, summary in download_records:
+ for artifact, summary, subfolder in download_records:
artifact = artifact.format(release)
- artifact_url = artifact_url_template.format(release, artifact)
+ artifact_url = artifact_url_template.format(release, subfolder, artifact)
asc_url = "{}.asc".format(artifact_url)
md5_url = "{}.md5".format(artifact_url)
- sha_url = "{}.sha".format(artifact_url)
+ sha_url = "{}.sha512".format(artifact_url)
args = summary, artifact, artifact_url, asc_url, md5_url, sha_url
downloads.append("| {} | [{}]({}) | [ASC]({}), [MD5]({}), [SHA512]({}) |".format(*args))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org