Repository: qpid-site Updated Branches: refs/heads/asf-site ed580ca0d -> 80510a543
QPID-7697: Add stubs for Qpid Interop Test; various minor improvements Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/80510a54 Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/80510a54 Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/80510a54 Branch: refs/heads/asf-site Commit: 80510a543e01411d7cc6eddf1b0167bf30a2004e Parents: ed580ca Author: Justin Ross <jr...@apache.org> Authored: Sat Mar 4 12:41:48 2017 -0800 Committer: Justin Ross <jr...@apache.org> Committed: Mon Mar 13 16:56:54 2017 -0700 ---------------------------------------------------------------------- Makefile | 51 +++--- content/components/interop-test/index.html | 198 +++++++++++++++++++++++ content/dashboard.html | 6 + content/releases/index.html | 4 + input/_transom_config.py | 21 ++- input/components/index.md | 6 +- input/components/interop-test/index.md | 63 ++++++++ input/dashboard.md | 20 +++ input/documentation.md | 19 +++ input/download.md | 5 + input/releases/index.md | 4 + python/generate.py | 7 +- scripts/gen-interop-test-release-notes | 74 +++++++++ scripts/gen-interop-test-release-page | 201 ++++++++++++++++++++++++ 14 files changed, 643 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 06ddede..819133a 100644 --- a/Makefile +++ b/Makefile @@ -103,39 +103,42 @@ clean: gen-amqp-type-reference: scripts/gen-amqp-type-reference misc/amqp > input/amqp/type-reference.html.in -.PHONY: gen-proton-release -gen-proton-release: gen-proton-release-page gen-proton-release-notes gen-proton-release-api-doc gen-proton-release-examples - -.PHONY: gen-proton-j-release -gen-proton-j-release: gen-proton-j-release-page gen-proton-j-release-notes gen-proton-j-release-api-doc +.PHONY: gen-cpp-release +gen-cpp-release: gen-cpp-release-page gen-cpp-release-notes gen-cpp-release-api-doc gen-cpp-release-examples gen-cpp-release-books .PHONY: gen-dispatch-release gen-dispatch-release: gen-dispatch-release-page gen-dispatch-release-notes gen-dispatch-release-books +.PHONY: gen-interop-test-release +gen-interop-test-release: gen-interop-test-release-page gen-interop-test-release-notes + .PHONY: gen-java-release gen-java-release: gen-java-release-page gen-java-release-notes gen-java-release-books gen-java-release-examples .PHONY: gen-jms-release gen-jms-release: gen-jms-release-page gen-jms-release-notes gen-jms-release-docs -.PHONY: gen-cpp-release -gen-cpp-release: gen-cpp-release-page gen-cpp-release-notes gen-cpp-release-api-doc gen-cpp-release-examples gen-cpp-release-books +.PHONY: gen-proton-release +gen-proton-release: gen-proton-release-page gen-proton-release-notes gen-proton-release-api-doc gen-proton-release-examples + +.PHONY: gen-proton-j-release +gen-proton-j-release: gen-proton-j-release-page gen-proton-j-release-notes gen-proton-j-release-api-doc .PHONY: gen-python-release gen-python-release: gen-python-release-page gen-python-release-notes gen-python-release-api-doc gen-python-release-examples -gen-proton-release-%: RELEASE_DIR := input/releases/qpid-proton-${RELEASE} -gen-proton-release-%: - scripts/gen-proton-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} - -gen-proton-j-release-%: RELEASE_DIR := input/releases/qpid-proton-j-${RELEASE} -gen-proton-j-release-%: - scripts/gen-proton-j-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} +gen-cpp-release-%: RELEASE_DIR := input/releases/qpid-cpp-${RELEASE} +gen-cpp-release-%: + scripts/gen-cpp-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} gen-dispatch-release-%: RELEASE_DIR := input/releases/qpid-dispatch-${RELEASE} gen-dispatch-release-%: scripts/gen-dispatch-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} +gen-interop-test-release-%: RELEASE_DIR := input/releases/qpid-interop-test-${RELEASE} +gen-interop-test-release-%: + scripts/gen-interop-test-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} + gen-java-release-%: RELEASE_DIR := input/releases/qpid-java-${RELEASE} gen-java-release-%: scripts/gen-java-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} @@ -144,18 +147,18 @@ gen-jms-release-%: RELEASE_DIR := input/releases/qpid-jms-${RELEASE} gen-jms-release-%: scripts/gen-jms-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} -gen-cpp-release-%: RELEASE_DIR := input/releases/qpid-cpp-${RELEASE} -gen-cpp-release-%: - scripts/gen-cpp-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} +gen-proton-release-%: RELEASE_DIR := input/releases/qpid-proton-${RELEASE} +gen-proton-release-%: + scripts/gen-proton-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} + +gen-proton-j-release-%: RELEASE_DIR := input/releases/qpid-proton-j-${RELEASE} +gen-proton-j-release-%: + scripts/gen-proton-j-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} gen-python-release-%: RELEASE_DIR := input/releases/qpid-python-${RELEASE} gen-python-release-%: scripts/gen-python-release-$* ${RELEASE} ${ISSUES_RELEASE} ${SOURCE_RELEASE} ${RELEASE_DIR} ${CHECKOUT_DIR} -.PHONY: update-plano -update-plano: - curl "https://raw.githubusercontent.com/ssorj/plano/master/python/plano.py" -o python/plano.py - -.PHONY: update-transom -update-transom: - curl "https://raw.githubusercontent.com/ssorj/transom/master/python/transom.py" -o python/transom.py +.PHONY: update-% +update-%: + curl "https://raw.githubusercontent.com/ssorj/$*/master/python/$*.py" -o python/$*.py http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/content/components/interop-test/index.html ---------------------------------------------------------------------- diff --git a/content/components/interop-test/index.html b/content/components/interop-test/index.html new file mode 100644 index 0000000..1cac596 --- /dev/null +++ b/content/components/interop-test/index.html @@ -0,0 +1,198 @@ +<!DOCTYPE html> +<!-- + - + - Licensed to the Apache Software Foundation (ASF) under one + - or more contributor license agreements. See the NOTICE file + - distributed with this work for additional information + - regarding copyright ownership. The ASF licenses this file + - to you under the Apache License, Version 2.0 (the + - "License"); you may not use this file except in compliance + - with the License. You may obtain a copy of the License at + - + - http://www.apache.org/licenses/LICENSE-2.0 + - + - Unless required by applicable law or agreed to in writing, + - software distributed under the License is distributed on an + - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + - KIND, either express or implied. See the License for the + - specific language governing permissions and limitations + - under the License. + - +--> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> + <head> + <title>Qpid Interop Test - Apache Qpid™</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0"/> + <link rel="stylesheet" href="/site.css" type="text/css" async="async"/> + <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/> + <script type="text/javascript">var _deferredFunctions = [];</script> + <script type="text/javascript" src="/deferred.js" defer="defer"></script> + <!--[if lte IE 8]> + <link rel="stylesheet" href="/ie.css" type="text/css"/> + <script type="text/javascript" src="/html5shiv.js"></script> + <![endif]--> + + <!-- Redirects for `go get` and godoc.org --> + <meta name="go-import" + content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/> + <meta name="go-source" + content="qpid.apache.org +https://github.com/apache/qpid-proton/blob/go1/README.md +https://github.com/apache/qpid-proton/tree/go1{/dir} +https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/> + </head> + <body> + <div id="-content"> + <div id="-top" class="panel"> + <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a> + + <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a> + + <ul id="-global-navigation"> + <li><a id="-logotype" href="/index.html">Apache Qpid<sup>™</sup></a></li> + <li><a href="/documentation.html">Documentation</a></li> + <li><a href="/download.html">Download</a></li> + <li><a href="/discussion.html">Discussion</a></li> + </ul> + </div> + + <div id="-menu" class="panel" style="display: none;"> + <div class="flex"> + <section> + <h3>Project</h3> + + <ul> + <li><a href="/overview.html">Overview</a></li> + <li><a href="/components/index.html">Components</a></li> + <li><a href="/releases/index.html">Releases</a></li> + </ul> + </section> + + <section> + <h3>Messaging APIs</h3> + + <ul> + <li><a href="/proton/index.html">Qpid Proton</a></li> + <li><a href="/components/jms/index.html">Qpid JMS</a></li> + <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li> + </ul> + </section> + + <section> + <h3>Servers and tools</h3> + + <ul> + <li><a href="/components/java-broker/index.html">Broker for Java</a></li> + <li><a href="/components/cpp-broker/index.html">C++ broker</a></li> + <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li> + </ul> + </section> + + <section> + <h3>Resources</h3> + + <ul> + <li><a href="/dashboard.html">Dashboard</a></li> + <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li> + <li><a href="/resources.html">More resources</a></li> + </ul> + </section> + </div> + </div> + + <div id="-search" class="panel" style="display: none;"> + <form action="http://www.google.com/search" method="get"> + <input type="hidden" name="sitesearch" value="qpid.apache.org"/> + <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/> + <button type="submit">Search</button> + <a href="/search.html">More ways to search</a> + </form> + </div> + + <div id="-middle" class="panel"> + <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/components/index.html">Components</a></li><li>Qpid Interop Test</li></ul> + + <div id="-middle-content"> + <div id="-left-column"> + +<h1 id="qpid-interop-test">Qpid Interop Test</h1> + +<div class="feature"> + +<h2 id="amqp-interoperability-testing">AMQP interoperability testing</h2> + +<p>XXX</p> + +</div> + +<h2 id="features">Features</h2> + +<ul> +<li>XXX</li> +</ul> + +<h2 id="documentation">Documentation</h2> + +<ul> +<li>XXX</li> +</ul> + +</div> + +<div id="-right-column" class="right-column-adjusted"> + +<h2 id="releases">Releases</h2> + +<ul> +<li>XXX</li> +</ul> + +<h2 id="issues">Issues</h2> + +<ul> +<li><form id="-jira-goto-form">Go to issue <input name="jira" value="QPIDIT-"/></form></li> +<li><a href="https://issues.apache.org/jira/browse/QPIDIT">JIRA project page</a></li> +</ul> + +<h2 id="source-code">Source code</h2> + +<ul> +<li><a href="https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git">Git clone URL</a></li> +</ul> + +<h2 id="resources">Resources</h2> + +<ul> +<li>XXX</li> +</ul> + +</div> + + + <hr/> + + <ul id="-apache-navigation"> + <li><a href="http://www.apache.org/">Apache</a></li> + <li><a href="http://www.apache.org/licenses/">License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li> + <li><a href="/security.html">Security</a></li> + <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li> + </ul> + + <p id="-legal"> + Apache Qpid, Messaging built on AMQP; Copyright © 2015 + The Apache Software Foundation; Licensed under + the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache + License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton, + Proton, Apache, the Apache feather logo, and the Apache Qpid + project logo are trademarks of The Apache Software + Foundation; All other marks mentioned may be trademarks or + registered trademarks of their respective owners + </p> + </div> + </div> + </div> + </body> +</html> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/content/dashboard.html ---------------------------------------------------------------------- diff --git a/content/dashboard.html b/content/dashboard.html index 98e76a9..08d3c67 100644 --- a/content/dashboard.html +++ b/content/dashboard.html @@ -170,6 +170,12 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/> <td><a href="https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git">Git</a>, <a href="https://github.com/apache/qpid-dispatch">GitHub mirror</a></td> </tr> <tr> + <td><a href="/components/interop-test/index.html">Interop Test</a></td> + <td><a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20QPIDIT%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC">Open issues</a> — <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318621&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3">New bug</a> — <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318621&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3">New improvement</a></td> + <td>-</td> + <td><a href="https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git">Git</a></td> +</tr> +<tr> <td><a href="/components/jms/index.html">JMS</a></td> <td><a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20QPIDJMS%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC">Open issues</a> — <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12314524&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3">New bug</a> — <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12314524&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3">New improvement</a></td> <td><a href="https://builds.apache.org/view/M-R/view/Qpid/job/Qpid-JMS-Test-JDK8/">Java 8</a></td> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/content/releases/index.html ---------------------------------------------------------------------- diff --git a/content/releases/index.html b/content/releases/index.html index 502c801..1670f7c 100644 --- a/content/releases/index.html +++ b/content/releases/index.html @@ -123,6 +123,8 @@ the <h2 id="current-releases">Current releases</h2> +<div class="two-column"> + <ul> <li><a href="qpid-proton-j-0.18.0/index.html">Qpid Proton-J 0.18.0</a>, March 2017</li> <li><a href="qpid-proton-0.17.0/index.html">Qpid Proton 0.17.0</a>, February 2017</li> @@ -133,6 +135,8 @@ the <li><a href="qpid-python-1.35.0/index.html">Qpid Python 1.35.0</a>, August 2016</li> </ul> +</div> + <h2 id="past-releases">Past releases</h2> <div class="two-column"> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/_transom_config.py ---------------------------------------------------------------------- diff --git a/input/_transom_config.py b/input/_transom_config.py index 325e790..9e99042 100644 --- a/input/_transom_config.py +++ b/input/_transom_config.py @@ -20,12 +20,13 @@ class _Release(object): qpid_release = _Release("Qpid", "qpid", "0.32") cpp_release = _Release("Qpid C++", "qpid-cpp", "1.36.0") -python_release = _Release("Qpid Python", "qpid-python", "1.35.0") dispatch_release = _Release("Qpid Dispatch", "qpid-dispatch", "0.7.0") +interop_test_release = _Release("Qpid Interop Test", "qpid-interop", "0.1.0") java_release = _Release("Qpid for Java", "qpid-java", "6.1.1") jms_release = _Release("Qpid JMS", "qpid-jms", "0.20.0") proton_release = _Release("Qpid Proton", "qpid-proton", "0.17.0") proton_j_release = _Release("Qpid Proton-J", "qpid-proton-j", "0.18.0") +python_release = _Release("Qpid Python", "qpid-python", "1.35.0") _svn_base = "http://svn.apache.org/repos/asf/qpid" @@ -38,9 +39,13 @@ current_cpp_release = cpp_release.number current_cpp_release_url = cpp_release.url current_cpp_release_link = cpp_release.link -current_python_release = python_release.number -current_python_release_url = python_release.url -current_python_release_link = python_release.link +current_dispatch_release = dispatch_release.number +current_dispatch_release_url = dispatch_release.url +current_dispatch_release_link = dispatch_release.link + +current_interop_test_release = interop_test_release.number +current_interop_test_release_url = interop_test_release.url +current_interop_test_release_link = interop_test_release.link current_java_release = java_release.number current_java_release_url = java_release.url @@ -50,10 +55,6 @@ current_jms_release = jms_release.number current_jms_release_url = jms_release.url current_jms_release_link = jms_release.link -current_dispatch_release = dispatch_release.number -current_dispatch_release_url = dispatch_release.url -current_dispatch_release_link = dispatch_release.link - current_proton_release = proton_release.number current_proton_release_url = proton_release.url current_proton_release_link = proton_release.link @@ -61,3 +62,7 @@ current_proton_release_link = proton_release.link current_proton_j_release = proton_j_release.number current_proton_j_release_url = proton_j_release.url current_proton_j_release_link = proton_j_release.link + +current_python_release = python_release.number +current_python_release_url = python_release.url +current_python_release_link = python_release.link http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/components/index.md ---------------------------------------------------------------------- diff --git a/input/components/index.md b/input/components/index.md index f008afc..af00991 100644 --- a/input/components/index.md +++ b/input/components/index.md @@ -68,7 +68,7 @@ connecting clients, brokers, and standalone services. - [Broker for Java](java-broker/index.html) - A pure-Java AMQP message broker - [C++ broker](cpp-broker/index.html) - A native-code AMQP message broker - [Dispatch router](dispatch-router/index.html) - An AMQP router for scalable messaging interconnect - + ## Compatibility <div class="scroll" markdown="1"> @@ -87,3 +87,7 @@ instance, the brokers are implemented in C++ and Java respectively, but they do not require C++ or JMS clients for communication. </div> + +;;## Other components +;; +;; - [Qpid Interop Test](interop-test/index.html) - Tests for interoperability of AMQP components http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/components/interop-test/index.md ---------------------------------------------------------------------- diff --git a/input/components/interop-test/index.md b/input/components/interop-test/index.md new file mode 100644 index 0000000..ca0478f --- /dev/null +++ b/input/components/interop-test/index.md @@ -0,0 +1,63 @@ +;; +;; Licensed to the Apache Software Foundation (ASF) under one +;; or more contributor license agreements. See the NOTICE file +;; distributed with this work for additional information +;; regarding copyright ownership. The ASF licenses this file +;; to you under the Apache License, Version 2.0 (the +;; "License"); you may not use this file except in compliance +;; with the License. You may obtain a copy of the License at +;; +;; http://www.apache.org/licenses/LICENSE-2.0 +;; +;; Unless required by applicable law or agreed to in writing, +;; software distributed under the License is distributed on an +;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +;; KIND, either express or implied. See the License for the +;; specific language governing permissions and limitations +;; under the License. +;; + +<div id="-left-column" markdown="1"> + +# Qpid Interop Test + +<div class="feature" markdown="1"> + +## AMQP interoperability testing + +XXX + +</div> + +## Features + + - XXX + +## Documentation + + - XXX + +</div> + +<div id="-right-column" class="right-column-adjusted" markdown="1"> + +## Releases + +;; - {{current_interop_test_release_link}} +;; - [Past releases]({{site_url}}/releases/index.html#past-releases) + - XXX + +## Issues + + - <form id="-jira-goto-form">Go to issue <input name="jira" value="QPIDIT-"/></form> + - [JIRA project page](https://issues.apache.org/jira/browse/QPIDIT) + +## Source code + + - [Git clone URL](https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git) + +## Resources + + - XXX + +</div> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/dashboard.md ---------------------------------------------------------------------- diff --git a/input/dashboard.md b/input/dashboard.md index 7fe7c12..26adf5a 100644 --- a/input/dashboard.md +++ b/input/dashboard.md @@ -1,3 +1,22 @@ +;; +;; Licensed to the Apache Software Foundation (ASF) under one +;; or more contributor license agreements. See the NOTICE file +;; distributed with this work for additional information +;; regarding copyright ownership. The ASF licenses this file +;; to you under the Apache License, Version 2.0 (the +;; "License"); you may not use this file except in compliance +;; with the License. You may obtain a copy of the License at +;; +;; http://www.apache.org/licenses/LICENSE-2.0 +;; +;; Unless required by applicable law or agreed to in writing, +;; software distributed under the License is distributed on an +;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +;; KIND, either express or implied. See the License for the +;; specific language governing permissions and limitations +;; under the License. +;; + # Dashboard <div id="-dashboard-forms" class="feature"> @@ -25,6 +44,7 @@ | [Java]({{site_url}}/components/java-broker/index.html) | [Open issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20QPID%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20in%20\(%22Java%20Broker%22%2C%20%22Java%20Client%22%2C%20%22Java%20Common%22%2C%20%22Java%20Management%20%3A%20JMX%20Console%22%2C%20%22Java%20Performance%20Tests%22%2C%20%22Java%20Tests%22%2C%20%22Java%20Tools%22%2C%20JCA\)%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310520&issuetype=1&components=12311388&components=12311389&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310520&issuetype=4&components=12311388&components=12311389&summary=[Enter%20a%20brief%20description]&priority=3) | [Java 7](https://builds.apache.org/view/M-R/view/Qpid/job/Qpid-Java-Java-Test-IBMJDK1.7/), [Java 8](https://builds.apache.org /view/M-R/view/Qpid/job/Qpid-Java-Java-Test-JDK1.8/) | [Subversion](https://svn.apache.org/repos/asf/qpid/java/trunk), [GitHub mirror](https://github.com/apache/qpid-java) | | [Python]({{site_url}}/components/messaging-api/index.html) | [Open issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20QPID%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20in%20\(%22Python%20Client%22%2C%20%22Python%20Test%20Suite%22\)%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310520&issuetype=1&components=12311544&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310520&issuetype=4&components=12311544&summary=[Enter%20a%20brief%20description]&priority=3) | - | [Git](https://git-wip-us.apache.org/repos/asf/qpid-python.git), [GitHub mirror](https://github.com/apache/qpid-python) | | [Dispatch]({{site_url}}/components/dispatch-router/index.html) | [Open issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20DISPATCH%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12315321&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12315321&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3) | - | [Git](https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git), [GitHub mirror](https://github.com/apache/qpid-dispatch) | +| [Interop Test]({{site_url}}/components/interop-test/index.html) | [Open issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20QPIDIT%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318621&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318621&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3) | - | [Git](https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git) | | [JMS]({{site_url}}/components/jms/index.html) | [Open issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20QPIDJMS%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12314524&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12314524&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3) | [Java 8](https://builds.apache.org/view/M-R/view/Qpid/job/Qpid-JMS-Test-JDK8/) | [Git](https://git-wip-us.apache.org/repos/asf/qpid-jms.git), [GitHub mirror](https://github.com/apache/qpid-jms) | | [Proton]({{site_url}}/proton/index.html) | [Open issues](https://issues.apache.org/jira/issues/?jql=project%20%3D%20PROTON%20AND%20resolution%20%3D%20Unresolved%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313720&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313720&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3) | [Linux](https://builds.apache.org/view/M-R/view/Qpid/job/Qpid-proton-c/) | [Git](https://git-wip-us.apache.org/repos/asf/qpid-proton.git), [GitHub mirror](https://github.com/apache/qpid-proton) | | [Proton-J]({{site_url}}/proton/index.html) | [Open issues](https://issues.apache.org/jira/browse/?jql=project%20%3D%20PROTON%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20proton-j%20ORDER%20BY%20priority%20DESC) — [New bug](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313720&issuetype=1&summary=[Enter%20a%20brief%20description]&priority=3) — [New improvement](https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12313720&issuetype=4&summary=[Enter%20a%20brief%20description]&priority=3) | [Java 7](https://builds.apache.org/view/M-R/view/Qpid/job/Qpid-proton-j/) | [Git](https://git-wip-us.apache.org/repos/asf/qpid-proton-j.git), [GitHub mirror](https://github.com/apache/qpid-proton-j) | http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/documentation.md ---------------------------------------------------------------------- diff --git a/input/documentation.md b/input/documentation.md index 271bd43..7bd2989 100644 --- a/input/documentation.md +++ b/input/documentation.md @@ -1,3 +1,22 @@ +;; +;; Licensed to the Apache Software Foundation (ASF) under one +;; or more contributor license agreements. See the NOTICE file +;; distributed with this work for additional information +;; regarding copyright ownership. The ASF licenses this file +;; to you under the Apache License, Version 2.0 (the +;; "License"); you may not use this file except in compliance +;; with the License. You may obtain a copy of the License at +;; +;; http://www.apache.org/licenses/LICENSE-2.0 +;; +;; Unless required by applicable law or agreed to in writing, +;; software distributed under the License is distributed on an +;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +;; KIND, either express or implied. See the License for the +;; specific language governing permissions and limitations +;; under the License. +;; + # Documentation The documentation on this page is for our http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/download.md ---------------------------------------------------------------------- diff --git a/input/download.md b/input/download.md index e9e7039..3c8e893 100644 --- a/input/download.md +++ b/input/download.md @@ -64,6 +64,11 @@ and [MD5](http://www.apache.org/dist/qpid/java/{{current_java_release}}/qpid-java-{{current_java_release}}.tar.gz.md5), [SHA1](http://www.apache.org/dist/qpid/java/{{current_java_release}}/qpid-java-{{current_java_release}}.tar.gz.sha1)\]. +;; ## Other components +;; +;; | Content | Download | Verify | +;; | ------- | -------- | ------ | +;; | [Interop Test]({{site_url}}/components/interop-test/index.html) | [qpid-interop-test-{{current_interop_test_release}}.tar.gz](http://www.apache.org/dyn/closer.lua/qpid/interop-test/{{current_interop_test_release}}/qpid-interop-test-{{current_interop_test_release}}.tar.gz) | [ASC](http://www.apache.org/dist/qpid/interop-test/{{current_interop_test_release}}/qpid-interop-test-{{current_interop_test_release}}.tar.gz.asc), [SHA](http://www.apache.org/dist/qpid/interop-test/{{current_interop_test_release}}/qpid-interop-test-{{current_interop_test_release}}.tar.gz.sha) | ## Verify what you download http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/input/releases/index.md ---------------------------------------------------------------------- diff --git a/input/releases/index.md b/input/releases/index.md index 5bccb36..65b0a25 100644 --- a/input/releases/index.md +++ b/input/releases/index.md @@ -26,6 +26,8 @@ the ## Current releases +<div class="two-column" markdown="1"> + - [Qpid Proton-J 0.18.0](qpid-proton-j-0.18.0/index.html), March 2017 - [Qpid Proton 0.17.0](qpid-proton-0.17.0/index.html), February 2017 - [Qpid JMS 0.20.0](qpid-jms-0.20.0/index.html), January 2017 @@ -34,6 +36,8 @@ the - [Qpid Dispatch 0.7.0](qpid-dispatch-0.7.0/index.html), November 2016 - [Qpid Python 1.35.0](qpid-python-1.35.0/index.html), August 2016 +</div> + ## Past releases <div class="two-column" markdown="1"> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/python/generate.py ---------------------------------------------------------------------- diff --git a/python/generate.py b/python/generate.py index 014e8fe..33c9841 100644 --- a/python/generate.py +++ b/python/generate.py @@ -399,13 +399,14 @@ def render_release_notes(project, release): def _fetch_issues(project, release): query = list() - fix_version=release + fix_version = release if project in ("qpid-cpp", "qpid-java", "qpid-python"): project = "qpid" - if project in ["proton-j"]: + + if project == "proton-j": project = "proton" - fix_version="proton-j-{}".format(release) + fix_version = "proton-j-{}".format(release) query.append("project = '{}'".format(project)) query.append("fixVersion = '{}'".format(fix_version)) http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/scripts/gen-interop-test-release-notes ---------------------------------------------------------------------- diff --git a/scripts/gen-interop-test-release-notes b/scripts/gen-interop-test-release-notes new file mode 100755 index 0000000..88da8ce --- /dev/null +++ b/scripts/gen-interop-test-release-notes @@ -0,0 +1,74 @@ +#!/usr/bin/python +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +from generate import * + +template = \ +""" +;; +;; Licensed to the Apache Software Foundation (ASF) under one +;; or more contributor license agreements. See the NOTICE file +;; distributed with this work for additional information +;; regarding copyright ownership. The ASF licenses this file +;; to you under the Apache License, Version 2.0 (the +;; "License"); you may not use this file except in compliance +;; with the License. You may obtain a copy of the License at +;; +;; http://www.apache.org/licenses/LICENSE-2.0 +;; +;; Unless required by applicable law or agreed to in writing, +;; software distributed under the License is distributed on an +;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +;; KIND, either express or implied. See the License for the +;; specific language governing permissions and limitations +;; under the License. +;; + +# Qpid Interop Test {release} Release Notes + +Qpid Interop Test is a suite of AMQP interoperability tests. More +about [Qpid Interop +Test]({{{{site_url}}}}/components/interop-test/index.html). + +For more information about this release, including download links and +documentation, see the [release overview](index.html). + +{release_notes} +""" + +def gen_release_notes(release, issues_release, release_dir): + output_path = join(release_dir, "release-notes.md") + + release_notes = render_release_notes("qpid-interop-test", issues_release) + + output = template.format(**locals()) + output = output.strip() + + write(output_path, output) + +release, issues_release, source_release, release_dir, checkout_dir = setup_release_script() + +if release == "master": + notice("Skipping generation for master branch") + exit() + +gen_release_notes(release, issues_release, release_dir) + +notice("Release notes generated") http://git-wip-us.apache.org/repos/asf/qpid-site/blob/80510a54/scripts/gen-interop-test-release-page ---------------------------------------------------------------------- diff --git a/scripts/gen-interop-test-release-page b/scripts/gen-interop-test-release-page new file mode 100755 index 0000000..fbeb9ee --- /dev/null +++ b/scripts/gen-interop-test-release-page @@ -0,0 +1,201 @@ +#!/usr/bin/python +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +from generate import * + +from datetime import datetime + +download_records = ( + ("qpid-interop-test-{}.tar.gz", "Interop Test"), +) + +component_records = ( + ("qpid-interop-test", "Interop Test", "-", "Linux", "1.0"), +) + +documentation = \ +""" + + - XXX + +""" + +template = \ +""" +;; +;; Licensed to the Apache Software Foundation (ASF) under one +;; or more contributor license agreements. See the NOTICE file +;; distributed with this work for additional information +;; regarding copyright ownership. The ASF licenses this file +;; to you under the Apache License, Version 2.0 (the +;; "License"); you may not use this file except in compliance +;; with the License. You may obtain a copy of the License at +;; +;; http://www.apache.org/licenses/LICENSE-2.0 +;; +;; Unless required by applicable law or agreed to in writing, +;; software distributed under the License is distributed on an +;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +;; KIND, either express or implied. See the License for the +;; specific language governing permissions and limitations +;; under the License. +;; + +# Qpid Interop Test {release} + +Qpid Interop Test is a suite of AMQP interoperability tests. More +about [Qpid Interop +Test]({{{{site_url}}}}/components/interop-test/index.html). + +For a detailed list of the changes in this release, see the [release +notes](release-notes.html). + +## Downloads + +It's important to [verify the +integrity]({{{{site_url}}}}/download.html#verify-what-you-download) of +the files you download. + +| Content | Download | Verify | +|---------|----------|--------| +{downloads} + +## Documentation + +{documentation} + +## More information + + - [All release artefacts](http://archive.apache.org/dist/qpid/interop-test/{release}) + - [Resolved issues in JIRA]({issues_url}) + - [Source repository tag](https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git/tree/refs/tags/{release}) + +<script type="text/javascript"> + _deferredFunctions.push(function() {{ + if ("{release}" === "{{{{current_interop_test_release}}}}") {{ + _modifyCurrentReleaseLinks(); + }} + }}); +</script> +""" + +def gen_release_page(release, issues_release, source_release, release_dir): + output_path = join(release_dir, "index.md") + + downloads = list() + components = list() + + source_artifact_url = "http://archive.apache.org/dist/qpid/interop-test/{}/{}" + + for artifact, summary in download_records: + artifact = artifact.format(release) + artifact_url = source_artifact_url.format(release, artifact) + sig_url = "http://archive.apache.org/dist/qpid/interop-test/{}/{}.asc".format(release, artifact) + + args = summary, artifact, artifact_url, sig_url + downloads.append("| {} | [{}]({}) | [PGP]({}) |".format(*args)) + + for key, name, languages, platforms, amqp_versions in component_records: + link = "[{}]({{{{site_url}}}}/components/{}/index.html)".format(name, key) + args = link, languages, platforms, amqp_versions + components.append("| {} | {} | {} | {} |".format(*args)) + + downloads = "\n".join(downloads) + components = "\n".join(components) + + jql = "project = QPIDIT AND fixVersion = '{}' AND resolution = 'fixed' ORDER BY priority DESC".format(issues_release) + issues_url = "https://issues.apache.org/jira/issues/?jql={}".format(urllib.quote_plus(jql)) + + vars = locals() + vars["documentation"] = documentation.format(release=release, source_release=source_release) + + output = template.format(**vars) + output = output.strip() + + write(output_path, output) + +master_template = """ +;; +;; Licensed to the Apache Software Foundation (ASF) under one +;; or more contributor license agreements. See the NOTICE file +;; distributed with this work for additional information +;; regarding copyright ownership. The ASF licenses this file +;; to you under the Apache License, Version 2.0 (the +;; "License"); you may not use this file except in compliance +;; with the License. You may obtain a copy of the License at +;; +;; http://www.apache.org/licenses/LICENSE-2.0 +;; +;; Unless required by applicable law or agreed to in writing, +;; software distributed under the License is distributed on an +;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +;; KIND, either express or implied. See the License for the +;; specific language governing permissions and limitations +;; under the License. +;; + +# Qpid Interop Test documentation snapshot + +<div class="feature" markdown="1"> + +## Warning! This is a snapshot of work in progress + +Documentation found here may be incorrect or incomplete. For a +smoother experience, see the [current stable +release]({{{{current_interop_test_release_url}}}}/index.html). + +This content was generated at {time} on {day}, {date}. + +</div> + +## Documentation + +{documentation} + +## More information + + - [Source repository](https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git) +""" + +def gen_master_release_page(release_dir): + output_path = join(release_dir, "index.md") + + now = datetime.now() + + day = now.strftime("%A") + date = now.strftime("%d %B %Y") + time = now.strftime("%H:%M %Z") + + vars = locals() + vars["documentation"] = documentation.format(release="master", source_release="master") + + output = master_template.format(**vars) + output = output.strip() + + write(output_path, output) + +release, issues_release, source_release, release_dir, checkout_dir = setup_release_script() + +if release == "master": + gen_master_release_page(release_dir) +else: + gen_release_page(release, issues_release, source_release, release_dir) + +notice("Release page generated") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org