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 2016/08/01 13:18:08 UTC
svn commit: r1754747 [2/3] - in /qpid/java/branches/6.0.x: ./ bdbstore/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/systests/ broker-codegen/ broker-core/
broker-core/src/main/java/org/apache/qpid/server/security/ broker-pl...
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml Mon Aug 1 13:18:07 2016
@@ -21,13 +21,13 @@
-->
<book xmlns="http://docbook.org/ns/docbook" version="5.0">
- <title>Qpid AMQP 0-10 JMS Client</title>
+ <title>Apache Qpid JMS Client for AMQP 0-10</title>
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-10-Example">
<title>HelloWorld Example</title>
<para>The following program shows how to send and receive a
- message using the Qpid AMQP 0-10 JMS client. JMS programs typically use
+ message using the Apache Qpid JMS client for AMQP 0-10 . JMS programs typically use
JNDI to obtain connection factory and destination objects which
the application needs. In this way the configuration is kept
separate from the application code itself.</para>
@@ -38,7 +38,7 @@
destination from the JNDI context. Then we create a producer and
a consumer, send a message with the producer and receive it with
the consumer. This code should be straightforward for anyone
- familiar with Java JMS.</para>
+ familiar with JMS.</para>
<example>
<title>"Hello world!" in Java</title>
@@ -173,11 +173,11 @@ destination.topicExchange = amq.topic <c
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-10-Configuring">
- <title>Configuring the JMS Client</title>
+ <title>Configuring the Client</title>
<section xml:id="JMS-Client-0-10-Configuring-Overview">
<title>Overview</title>
- <para>This chapter covers various configuration details for the Qpid AMQP 0-10 JMS client, from the basics of setting up the client
+ <para>This chapter covers various configuration details for the Apache Qpid JMS Client for AMQP 0-10, from the basics of setting up the client
using JNDI in <xref linkend="JMS-Client-0-10-Configuring-JNDI"/>, to the various configuration options avilable to
customize it's behaviour at different levels of granualarity, e.g:</para>
@@ -220,7 +220,7 @@ destination.topicExchange = amq.topic <c
<section>
<title>Properties File Format</title>
<para>
- Apache Qpid defines JNDI properties that can be used to specify JMS Connections and Destinations. Here is a typical JNDI properties file:
+ The Client defines JNDI properties that can be used to specify JMS Connections and Destinations. Here is a typical JNDI properties file:
</para>
<example>
@@ -293,7 +293,7 @@ destination.topicExchange = amq.topic</p
address string.
<footnote><para>Binding URLs, which were used in
- earlier versions of the Qpid Java JMS client, can
+ earlier versions of the Client, can
still be used instead of address
strings.</para></footnote>
</para>
@@ -2078,8 +2078,8 @@ spout - -content "$(cat rdu.xml | sed -e
<entry>
The delay (in milliseconds) between the time a message is sent by a MessageProducer, and
the earliest time it becomes visible to consumers on any queue onto which it has been placed. Note that
- this value only has an affect on brokers which support the feature (currently only the Qpid Java
- Broker), and only on queues where delivery delay has been enabled.
+ this value only has an affect on brokers which support the feature (currently only the Apache Qpid
+ Broker for Java), and only on queues where delivery delay has been enabled.
</entry>
</row>
</tbody>
@@ -2220,7 +2220,7 @@ spout - -content "$(cat rdu.xml | sed -e
<chapter xml:id="JMS-Client-0-10-Miscellaneous">
<title>Miscellaneous</title>
<section xml:id="JMS-Client-0-10-Miscellaneous-Message-Properties">
- <title>Java JMS Message Properties</title>
+ <title>JMS Message Properties</title>
<para>The following table shows how Qpid Messaging API message
properties are mapped to AMQP 0-10 message properties and
@@ -2232,11 +2232,11 @@ spout - -content "$(cat rdu.xml | sed -e
<varname>delivery-properties</varname> struct.</para>
<table>
- <title>Java JMS Mapping to AMQP 0-10 Message Properties</title>
+ <title>JMS Mapping to AMQP 0-10 Message Properties</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Java JMS Message Property</entry>
+ <entry>JMS Message Property</entry>
<entry>AMQP 0-10 Property<footnote><para>In these entries, <literal>mp</literal> refers to an AMQP message property, and <literal>dp</literal> refers to an AMQP delivery property.</para></footnote></entry>
</row>
@@ -2246,7 +2246,7 @@ spout - -content "$(cat rdu.xml | sed -e
<entry>JMSMessageID</entry><entry>mp.message_id</entry>
</row>
<row>
- <entry>qpid.subject<footnote><para>This is a custom JMS property, set automatically by the Java JMS client implementation.</para></footnote></entry><entry>mp.application_headers["qpid.subject"]</entry>
+ <entry>qpid.subject<footnote><para>This is a custom JMS property, set automatically by the JMS client implementation.</para></footnote></entry><entry>mp.application_headers["qpid.subject"]</entry>
</row>
<row>
<entry>JMSXUserID</entry><entry>mp.user_id</entry>
@@ -2284,10 +2284,10 @@ spout - -content "$(cat rdu.xml | sed -e
<section xml:id="JMS-Client-0-10-Miscellaneous-MapMessages">
<title>JMS MapMessage Types</title>
- <para>Qpid supports the Java JMS <classname>MapMessage</classname> interface, which provides support for maps in messages. The following code shows how to send a <classname>MapMessage</classname> in Java JMS.</para>
+ <para>Qpid supports the JMS <classname>MapMessage</classname> interface, which provides support for maps in messages. The following code shows how to send a <classname>MapMessage</classname> in JMS.</para>
<example>
- <title>Sending a Java JMS MapMessage</title>
+ <title>Sending a JMS MapMessage</title>
<programlisting>
import java.util.ArrayList;
import java.util.HashMap;
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml Mon Aug 1 13:18:07 2016
@@ -30,8 +30,8 @@
</parent>
<artifactId>qpid-java-doc-jms-client-0-8</artifactId>
- <name>Qpid Java Jms Client 0-8 Docbook</name>
- <description>Qpid Java Jms Client 0-8 Documentation</description>
+ <name>Apache Qpid JMS Client for AMQP 0-8, 0-9 and 0-9-1 Docbook</name>
+ <description>Apache Qpid JMS client for AMQP 0-8, 0-9 and 0-9-1 Documentation</description>
<profiles>
<profile>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Exceptions.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Exceptions.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Exceptions.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Exceptions.xml Mon Aug 1 13:18:07 2016
@@ -23,7 +23,7 @@
<appendix xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-Appendix-Exceptions">
<title>Exceptions</title>
- <para>The methods of Qpid JMS Client throw <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/JMSException.html">JMSExceptions</link> in response to error
+ <para>The methods of the Client throw <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/JMSException.html">JMSExceptions</link> in response to error
conditions. Typically the exception's message (#getMessage()) summarises the error condition,
with contextual information being provided by the messages of linked exception(s). To understand
the problem, it is important to read the messages associated with <emphasis>all</emphasis> the
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml Mon Aug 1 13:18:07 2016
@@ -144,8 +144,8 @@
<entry><para>long </para></entry>
<entry><para>The delay (in milliseconds) between the time a message is sent by a MessageProducer, and
the earliest time it becomes visible to consumers on any queue onto which it has been placed. Note that
- this value only has an affect on brokers which support the feature (currently only the Qpid Java
- Broker), and only on queues where delivery delay has been enabled.</para></entry>
+ this value only has an affect on brokers which support the feature (currently only the Apache Qpid
+ Broker for Java), and only on queues where delivery delay has been enabled.</para></entry>
</row>
</tbody>
</tgroup>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml Mon Aug 1 13:18:07 2016
@@ -21,7 +21,7 @@
-->
<book xmlns="http://docbook.org/ns/docbook" version="5.0">
- <title>Qpid JMS Client for AMQP protocols 0-8, 0-9 and 0-9-1</title>
+ <title>Apache Qpid JMS Client for AMQP protocols 0-8, 0-9 and 0-9-1</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="JMS-Client-Introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="JMS-Client-Document-Scope-And-Intended-Audience.xml"/>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Document-Scope-And-Intended-Audience.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Document-Scope-And-Intended-Audience.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Document-Scope-And-Intended-Audience.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Document-Scope-And-Intended-Audience.xml Mon Aug 1 13:18:07 2016
@@ -27,29 +27,31 @@
specification. Readers are not required to know all the details of AMQP protocols. However, some
knowledge of AMQP basic concepts would be advantageous for reading of this document. </para>
- <para> This document only covers the usage of 0-8, 0-9 and 0-9-1 AMQP protocols with Qpid JMS
- client. The specifications for these protocols are available from the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${amqpSrc}">AMQP web site</link>. </para>
+ <para> This document only covers the usage of 0-8, 0-9 and 0-9-1 AMQP protocols with Apache Qpid JMS
+ client for AMQP 0-9-1/0-10. The specifications for these protocols are available from the
+ <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${amqpSrc}">AMQP web site</link>. </para>
<para> The document covers some specific implementation details of JMS connections, sessions,
consumers and producers in <xref linkend="JMS-Client-0-8-Client-Understanding"/>. It also
demonstrates how to write a simple point to point and simple publish/subscribe application using
- Qpid JMS Client in <xref linkend="JMS-Client-0-8-Examples"/>. </para>
+ the Client in <xref linkend="JMS-Client-0-8-Examples"/>. </para>
- <para>The Qpid JMS Client supports various configuration options which can be set via JVM system
+ <para>The Client supports various configuration options which can be set via JVM system
properties, connection URLs and JNDI configuration file. The setting of system properties is
described in <xref linkend="JMS-Client-0-8-System-Properties"/>. The details of supported
options within the connection URLs are given in <xref linkend="JMS-Client-0-8-Connection-URL"/>.
- The details of Qpid JMS client JNDI properties format is provided in <xref linkend="JMS-Client-0-8-JNDI-Properties-Format"/>. The Qpid destination URL format is covered
+ The details of JNDI properties format for the Apache Qpid JMS client for AMQP 0-9-1/0-10 is provided in
+ <xref linkend="JMS-Client-0-8-JNDI-Properties-Format"/>. The Qpid destination URL format is covered
in <xref linkend="JMS-Client-0-8-Binding-URL"/>. </para>
- <para>The Qpid JMS Client can be used for writing of JMS vendor neutral messaging applications.
- However, in some cases it might be required to use specific AMQP features. Thus, the Qpid client
+ <para>The Client can be used for writing of JMS vendor neutral messaging applications.
+ However, in some cases it might be required to use specific AMQP features. Thus, the Client
provides the extended operation set to invoke those features. </para>
<para>
<xref linkend="JMS-Client-0-8-Logging"/> provides the details about turning on client logging
which can help in debugging of various issues while developing the messaging applications. </para>
- <para>The details about Qpid JMS Client Exceptions are provided in <xref linkend="JMS-Client-0-8-Appendix-Exceptions"/></para>
+ <para>The details about Client Exceptions are provided in <xref linkend="JMS-Client-0-8-Appendix-Exceptions"/></para>
</chapter>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Examples.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Examples.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Examples.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Examples.xml Mon Aug 1 13:18:07 2016
@@ -23,13 +23,13 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-Examples">
<title>Examples</title>
- <para>The following programs shows how to send and receive messages using the Qpid JMS client.
+ <para>The following programs shows how to send and receive messages using the Client.
The first program illustrates a <emphasis>point to point</emphasis> example, the second, a
pubish/subscribe example. </para>
<para>Both examples show the use JNDI to obtain connection factory and destination objects which
the application needs. In this way the configuration is kept separate from the application
code itself.</para>
- <para>The example code will be straightforward for anyone familiar with Java JMS. Readers in
+ <para>The example code will be straightforward for anyone familiar with JMS. Readers in
need of an introduction are directed towards <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJmsTutorial}">Oracle's JMS
tutorial</link>.</para>
<section xml:id="JMS-Client-0-8-Examples-PTP">
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml Mon Aug 1 13:18:07 2016
@@ -24,12 +24,12 @@
<title>Getting the Client And Dependencies</title>
<section xml:id="JMS-Client-0-8-JMS-Getting-And-Dependencies-Getting">
<title>Getting the Client</title>
- <para>The Qpid JMS client is available as a bundle or from ${qpidMavenRepoDesc}.</para>
- <para>The bundle (a .tar.gz) includes the Qpid JMS client itself (formed by two JAR: qpid-client
+ <para>The Apache Qpid JMS client for AMQP 0-9-1/0-10 is available as a bundle or from ${qpidMavenRepoDesc}.</para>
+ <para>The bundle (a .tar.gz) includes the Client itself (formed by two JAR: qpid-client
and qpid-common) together with slf4j-api, and geronimo-jms_1.1_spec. There is also a qpid-all
JAR artifact that, for convenience, includes a manifest classpath that references the other
JARs. The bundle is available from <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidDownloadUrl}">${qpidDownloadUrlDesc}</link>.</para>
- <para>The Qpid JMS client is also available from ${qpidMavenRepoDesc}. Add the following
+ <para>The Client is also available from ${qpidMavenRepoDesc}. Add the following
dependency:</para>
<screen>
<dependency>
@@ -42,7 +42,7 @@
</section>
<section xml:id="JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies">
<title>Dependencies</title>
- <para>The Qpid JMS client has minimal set of external dependencies. </para>
+ <para>The Client has minimal set of external dependencies. </para>
<para> It requires: <itemizedlist>
<listitem>
<para>JDK 1.7 or higher.</para>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml Mon Aug 1 13:18:07 2016
@@ -22,20 +22,20 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-Introduction">
<title>Introduction</title>
- <para>Qpid JMS client is an implementation of <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJmsSpec}">JMS specification
+ <para>Apache Qpid JMS client for AMQP 0-9-1/0-10 is an implementation of <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJmsSpec}">JMS specification
1.1</link>. It utilises an <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${amqpSrc}">AMQP</link> transport layer for the performing of messaging operations.
- The client is intended to be used for the writing of JMS compatible messaging applications. Such
- applications can send and receive messages via any AMQP-compatible brokers like RabbitMQ, Qpid
- Java Broker which support the AMQP protocols 0-8, 0-9, or 0-9-1.</para>
- <para>The Qpid JMS client hides the details of AMQP transport implementation behind the JMS API.
+ The client is intended to be used for writing of JMS compatible messaging applications. Such
+ applications can send and receive messages via any AMQP-compatible brokers like RabbitMQ,
+ Apache Qpid Broker for Java which supports AMQP protocols 0-8, 0-9, or 0-9-1.</para>
+ <para>The Client hides the details of AMQP transport implementation behind the JMS API.
Thus, the developers need only to be familiar with JMS API in order to use the client. However,
the knowledge of the basic concepts of AMQP protocols can help developers in writing reliable
and high-performant messaging application. </para>
<important>
- <title>Using the Qpid JMS client with 0-10</title>
- <para>This book documents the behaviour of the Qpid JMS client when used with the AMQP
- protocols <emphasis>0-8, 0-9, and 0-9-1</emphasis> only. For behaviour when using the client
- with AMQP 0-10 protocol, please refer to <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient010Book}">Using the Qpid AMQP 0-10 JMS Client</link>.</para>
+ <title>Using the Client with 0-10</title>
+ <para>This book documents the behaviour of the Apache Qpid JMS client for AMQP 0-9-1/0-10 when used with the AMQP
+ protocols <emphasis>0-8, 0-9, and 0-9-1</emphasis> only. For behaviour when using the Client
+ with AMQP 0-10 protocol, please refer to <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient010Book}">Using AMQP 0-10 with the Apache Qpid JMS client for AMQP 0-9-1/0-10</link>.</para>
</important>
</chapter>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml Mon Aug 1 13:18:07 2016
@@ -23,7 +23,7 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-JNDI-Properties-Format">
<title>JNDI Properties Format</title>
- <para>The Qpid JMS Client comes with own JNDI context factory
+ <para>The Client comes with own JNDI context factory
<literal>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</literal> which utilises a
Java properties file for declaring the JMS administered objects: connection factories, queues,
topics and destinations. It uses the following syntax:</para>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml Mon Aug 1 13:18:07 2016
@@ -22,10 +22,10 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-Logging">
<title>Logging</title>
- <para>The Qpid JMS client uses the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.slf4j.org">Apache SLF4J</link> logging
+ <para>The Client uses the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.slf4j.org">Apache SLF4J</link> logging
framework. All logging activity created by the client is directed through the SLF4J API. SLF4J
is a is a façade for other common logging frameworks. This makes it easy for application authors
- to use their prefered logging framework in their application stack, and have the Qpid JMS Client
+ to use their prefered logging framework in their application stack, and have the Client
use it too. </para>
<para>SLF4J suppplies bindings for many common logging frameworks (<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJdkDocUrl}java/util/logging/package-summary.html">JUL</link>, <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://logging.apache.org/log4j/1.2/">Apache Log4J</link>, <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://logback.qos.ch">Logback</link>.</para>
<para>Include the SLF4J binding corresponding to the logging framework of your choosen logging
@@ -47,7 +47,7 @@
<section xml:id="JMS-Client-0-8-Logging-EnablingDebugLogging">
<title>Enabling Debug</title>
<para>If you are experiencing a problem, it can be informative to enable debug logging to allow
- the behaviour of the Qpid JMS client to be understood at a deeper level.</para>
+ the behaviour of the Client to be understood at a deeper level.</para>
<para>To do this, set the <literal>org.apache.qpid</literal> logger to
<literal>DEBUG</literal>.</para>
<para>If you are using Apache Log4j with a log4j.properties file, this simply means adding (or
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml Mon Aug 1 13:18:07 2016
@@ -22,7 +22,7 @@
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-System-Properties">
<title>System Properties</title>
- <para>The following system properties affect the behaviour of the Qpid JMS client. System
+ <para>The following system properties affect the behaviour of the Client. System
properties are global in nature so affect all Qpid interactions made from within the same
JVM. For many options, there are equivalent <link linkend="JMS-Client-0-8-Connection-URL">Connection URL</link> options allowing the option to be controlled at the level of the
Connection.</para>
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml Mon Aug 1 13:18:07 2016
@@ -21,16 +21,16 @@
-->
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="JMS-Client-0-8-Client-Understanding">
- <title>Understanding the Qpid JMS client</title>
+ <title>Understanding the Client</title>
<section xml:id="JMS-Client-0-8-Client-Understanding-Overview">
<title>Overview</title>
- <para>The Qpid JMS client provides a JMS 1.1 compliant implementation. As such, the primary
+ <para>The Client provides a JMS 1.1 compliant implementation. As such, the primary
source of documentation is the <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJmsSpec}">JMS specification</link> and the
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}/javax/jms/package-summary.html">JMS javadocs</link>. This
documentation assumes the reader has familiarity with these resources.</para>
- <para>The remainder of this section describes how the Qpid JMS client behaves and the effect(s)
+ <para>The remainder of this section describes how the Client behaves and the effect(s)
making JMS method calls will have on the Broker. </para>
- <para>There areas where the Qpid JMS client provides features beyond those required for JMS
+ <para>There areas where the Client provides features beyond those required for JMS
compliance. These are described in the sections that follow.</para>
<para>These sections are also used to bring out differences that may surprise those moving from
JMS implementations provided by other vendors.</para>
@@ -49,12 +49,12 @@
allows an application to create a <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/Connection.html">Connection</link>.</para>
<para>The application obtains the ConnectionFactory from an <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/naming/InitialContext.html">InitialContext</link>. The
InitialContext is itself obtained from an InitialContextFactory. </para>
- <para>The Qpid JMS client provides a single implementation of the InitialContextFactory in class
+ <para>The Client provides a single implementation of the InitialContextFactory in class
<literal>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</literal>. This
implementation is backed by a <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}java/util/Properties.html">Properties</link> object which can of course be loaded from an external properties file,
or created programatically.</para>
<para>The examples in the previous chapter illustrated the Java code required to <link linkend="JMS-Client-0-8-Examples-PTP">create the InitialContext</link> and an <link linkend="JMS-Client-0-8-Examples-PTP-PropertiesFile">example properties file</link>.</para>
- <para>The Qpid JMS client also provides an alternate connection factory implementation providing a
+ <para>The Client also provides an alternate connection factory implementation providing a
connection pool. This can be useful when utilsing frameworks such as Spring.
<xref linkend="JMS-Client-0-8-Appendix-PooledConnecytionFactory"/>.</para>
<figure>
@@ -65,7 +65,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Note that the Qpid Broker does not present a JNDI interface to the application.</para>
+ <para>Note that the Apache Qpid Broker for Java does not present a JNDI interface to the application.</para>
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Connection">
<title>Connection</title>
@@ -132,7 +132,7 @@ amqp://username:password@clientid/test
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Connection-Heartbeating">
<title>Heartbeating</title>
- <para>Qpid connections support heartbeating. When enabled, the Qpid JMS client and Broker
+ <para>Qpid connections support heartbeating. When enabled, the Client and Broker
exchange a heartbeat during periods of inactivity. This allows both peers to discover if the
TCP/IP connection becomes inoperable in a timely manner.</para>
<para>This feature is sometimes useful in applications that must traverse firewalls as the
@@ -156,7 +156,7 @@ amqp://guest:guest@clientid/?brokerlist=
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Connection-SSL">
<title>SSL</title>
- <para>The Qpid JMS client supports connections encrypted using Secure Socket Layer (SSL) and
+ <para>The Client supports connections encrypted using Secure Socket Layer (SSL) and
SSL-Client Authentication. SSL is configured using Connection URL. To use SSL, SSL must be
be configured on the Broker.</para>
<para>Some example Connection URLs using SSL follow:</para>
@@ -329,7 +329,7 @@ amqp://guest:guest@clientid/?brokerlist=
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Session-CreateQueue">
<title>CreateQueue</title>
- <para>In the Qpid JMS client, <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/Session.html#createQueue(java.lang.String)">Session#createQueue()</link> accepts either a queue name, or a Binding URL. If only name
+ <para>In the Client, <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/Session.html#createQueue(java.lang.String)">Session#createQueue()</link> accepts either a queue name, or a Binding URL. If only name
is specified the destination will be resolved into binding URL:
direct://amq.direct//<queue name>?routingkey='<queue name>'&durable='true'. </para>
<para>Calling Session#createQueue() has no effect on the Broker.</para>
@@ -338,7 +338,7 @@ amqp://guest:guest@clientid/?brokerlist=
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Session-CreateTopic">
<title>CreateTopic</title>
- <para>In the Qpid JMS client, <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/Session.html#createTopic(java.lang.String)">Session#createTopic()</link> accepts either a topic name, or a Binding URL. If only name
+ <para>In the Client, <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/Session.html#createTopic(java.lang.String)">Session#createTopic()</link> accepts either a topic name, or a Binding URL. If only name
is specified the destination will be resolved into binding URL: topic://amq.topic//<topic
name>?routingkey='<topic name>'.</para>
<para>Calling Session#createTopic() has no effect on the Broker.</para>
@@ -354,11 +354,11 @@ amqp://guest:guest@clientid/?brokerlist=
and a <emphasis>routing key</emphasis> included with each message.</para>
<para>To understand how this mechanism is used to deliver messages to queues and topics, see
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Concepts-Exchanges.html">Exchanges</link>
- within the Java Broker book.</para>
+ within the Apache Qpid Broker for Java book.</para>
<para>It is important to understand that when synchronous publish is not exlicitly enabled,
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/MessageProducer.html#send(javax.jms.Message)">MessageProducer#send()</link> is <emphasis>asynchronous</emphasis> in nature. When #send()
returns to the application, the application cannot be certain if the Broker has received the
- message. The Qpid JMS client may not have yet started to send the message, the message could
+ message. The Client may not have yet started to send the message, the message could
residing in a TCP/IP buffer, or the messages could be in some intermediate buffer within the
Broker. If the application requires certainty the message has been received by the Broker, a
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeeDocUrl}javax/jms/Session.html#SESSION_TRANSACTED">transactional
@@ -398,7 +398,7 @@ amqp://guest:guest@clientid/?brokerlist=
requires support for the corresponding feature by the Broker.</para>
<para>To enable or disable from the client, use the Connection URL option <link linkend="JMS-Client-0-8-Connection-URL-ConnectionOptions-CloseWhenNoRoute"><literal>closeWhenNoRoute</literal></link>.</para>
<para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Close-Connection-When-No-Route.html">
- Closing client connections on unroutable mandatory messages</link> within the Java Broker
+ Closing client connections on unroutable mandatory messages</link> within the Apache Qpid Broker for Java
book for full details of the functioning of this feature.</para>
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-MessageProducer-ImmediateMessage">
@@ -425,7 +425,7 @@ amqp://guest:guest@clientid/?brokerlist=
feature requires support for the corresponding feature by the Broker.</para>
<para>To control the timeout use System property <link linkend="JMS-Client-0-8-System-Properties-FlowControlWaitFailure"><literal>qpid.flow_control_wait_failure</literal></link>. To control the frequency with
which warnings are logged whilst a Session is blocked, use System property <link linkend="JMS-Client-0-8-System-Properties-FlowControlWaitNotifyPeriod"><literal>qpid.flow_control_wait_notify_period</literal></link></para>
- <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control"> Producer Flow Control</link> within the Java Broker book for full details of the
+ <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control"> Producer Flow Control</link> within the Apache Qpid Broker for Java book for full details of the
functioning of this feature.</para>
</section>
</section>
@@ -458,7 +458,7 @@ amqp://guest:guest@clientid/?brokerlist=
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-MessageConsumer-TopicSubscriptions">
<title>Topic Subscriptions</title>
- <para>The Qpid JMS client implements each subscription to a Topic as separate queue on the
+ <para>The Client implements each subscription to a Topic as separate queue on the
Broker. From the perspective of the JMS application this implementational detail is
irrelevant: the application never needs to directly address these queues. However, these
details are important when considering Management and Operational concerns.</para>
@@ -491,7 +491,7 @@ amqp://guest:guest@clientid/?brokerlist=
<para>When using this feature, the application must either set system property <link linkend="JMS-Client-0-8-System-Properties-RejectBehaviour">qpid.reject.behaviour</link> or
the Binding URL option <link linkend="JMS-Client-0-8-Binding-URL-Options-RejectBehaviour"><literal>rejectbehaviour</literal></link> to the value
<literal>server</literal>.</para>
- <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"> Handling Undeliverable Messages</link> within the Java Broker book for full details of
+ <para>See <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJavaBrokerBook}Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"> Handling Undeliverable Messages</link> within the Apache Qpid Broker for Java book for full details of
the functioning of this feature.</para>
<note>
<para>The optional JMS message header <literal>JMSXDeliveryCount</literal> is
@@ -501,7 +501,7 @@ amqp://guest:guest@clientid/?brokerlist=
</section>
<section xml:id="JMS-Client-0-8-Client-Understanding-Destinations">
<title>Destinations</title>
- <para>A Destination is either a Queue or Topic. In the Qpid JMS client a Destination
+ <para>A Destination is either a Queue or Topic. In the Client a Destination
encapsulates a Binding URL. In simple terms, the Binding URL comprises of an exchange, queue
and a routing key. Binding URLs are described fully by <xref linkend="JMS-Client-0-8-Binding-URL"/>. </para>
<para>In many cases, applications do not need to deal directly with Binding URLs, instead they
Modified: qpid/java/branches/6.0.x/doc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/pom.xml Mon Aug 1 13:18:07 2016
@@ -30,7 +30,7 @@
</parent>
<artifactId>qpid-java-doc</artifactId>
- <name>Qpid Java Docbook</name>
+ <name>Apache Qpid for Java Docbook</name>
<description>Java Qpid Docbook</description>
<packaging>pom</packaging>
Modified: qpid/java/branches/6.0.x/jca/README-JBOSS.txt
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/jca/README-JBOSS.txt?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/jca/README-JBOSS.txt (original)
+++ qpid/java/branches/6.0.x/jca/README-JBOSS.txt Mon Aug 1 13:18:07 2016
@@ -130,7 +130,7 @@ The above XML defines a JMS Queue which
queue/HelloQueue
This destination can be retrieved from JNDI and be used for the consumption or production of messages. The desinationAddress property
-can be customized for your environment. Please see the Qpid Java Client documentation for specific configuration options.
+can be customized for your environment. For specific configuration options please see documentation for the Apache Qpid JMS Client for AMQP 0-9-1/0-10.
<mbean code="org.jboss.resource.deployment.AdminObject"
name="qpid.jca:name=HelloTopic">
@@ -148,7 +148,7 @@ The above XML defines a JMS Topic which
HelloTopic
This destination can be retrieved from JNDI and be used for the consumption or production of messages. The desinationAddress property
-can be customized for your environment. Please see the Qpid Java Client documentation for specific configuration options.
+can be customized for your environment. For specific configuration options please see documentation for Apache Qpid JMS Client for AMQP 0-9-1/0-10.
<mbean code="org.jboss.resource.deployment.AdminObject"
@@ -173,8 +173,7 @@ The standard method for inbound communic
via the ActivationSpec mechanism. Please see the general README.tx file for an explanation of the
QpidActivationSpec, as well as general inbound connectivity options.
-An ActivationSpec can either be configured via the Java Annotation mechanism, or in the ejb-jar.xml deployment
-descriptor.
+An ActivationSpec can either be configured via the Java Annotation mechanism, or in the ejb-jar.xml deployment descriptor.
Summary
=======
Modified: qpid/java/branches/6.0.x/jca/README.txt
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/jca/README.txt?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/jca/README.txt (original)
+++ qpid/java/branches/6.0.x/jca/README.txt Mon Aug 1 13:18:07 2016
@@ -51,7 +51,7 @@ the configuration properties from the Re
the defaults.
While some of the properties from the three components are specific to the JCA adapter, a majority of the
-properties directly correspond the the Qpid JMS client. As such, familiarity with the Qpid JMS Client is strongly
+properties directly correspond the the Apache Qpid JMS client for AMQP 0-9-1/0-10. As such, familiarity with it is strongly
encouraged. Similarly, familiarity with the JCA 1.5 specification is encouraged though not strictly required.
The ResourceAdapter JavaBean
@@ -201,7 +201,8 @@ The QpidQueue and QpidTopic AdminObjects
objects support one property:
DestinationAddress
- The address string of the destination. Please see the Qpid JMS client documentation for valid values.
+ The address string of the destination. For valid values please see documentation for
+ the Apache Qpid JMS client for AMQP 0-9-1/0-10.
Example:
DestinationAddress=hello.Queue;{create:always, node:{type:queue, x-declare:{auto-delete:true}}}
@@ -218,7 +219,8 @@ this sort is used by Swing or other non-
provides one property
ConnectionURL
- This is the url used to configure the connection factory. Please see the Qpid JMS client documentation for
+ This is the url used to configure the connection factory. Please see documentation for
+ the Apache Qpid JMS client for AMQP 0-9-1/0-10.
The QpidConnectionFactoryProxy allows for a non-JCA ConnectionFactory to be bound into the JNDI tree. This
ConnectionFactory can in turn be used outside of the application server. Typically a ConnectionFactory of
this sort is used by Java Swing or other non-managed clients not requiring JCA. One one property is
Modified: qpid/java/branches/6.0.x/jca/example/README-EXAMPLE.txt
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/jca/example/README-EXAMPLE.txt?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/jca/example/README-EXAMPLE.txt (original)
+++ qpid/java/branches/6.0.x/jca/example/README-EXAMPLE.txt Mon Aug 1 13:18:07 2016
@@ -122,7 +122,7 @@ The provided clients and supported optio
QpidTestClient
==============
-As previously mentioned, the Qpid JCA example provides an RMI/JMS Java client to test
+As previously mentioned, the Qpid JCA example provides an RMI/JMS client to test
the application. Executing the command
ant-run client
Modified: qpid/java/branches/6.0.x/jca/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/jca/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/jca/pom.xml (original)
+++ qpid/java/branches/6.0.x/jca/pom.xml Mon Aug 1 13:18:07 2016
@@ -25,7 +25,7 @@
</parent>
<artifactId>qpid-jca</artifactId>
- <name>Qpid JCA</name>
+ <name>Apache Qpid JCA</name>
<description>J2EE Connector Architecture code</description>
<dependencies>
Modified: qpid/java/branches/6.0.x/jca/rar/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/jca/rar/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/jca/rar/pom.xml (original)
+++ qpid/java/branches/6.0.x/jca/rar/pom.xml Mon Aug 1 13:18:07 2016
@@ -27,7 +27,7 @@
<artifactId>qpid-ra</artifactId>
<packaging>rar</packaging>
- <name>Qpid Resource Adaptor</name>
+ <name>Apache Qpid Resource Adaptor</name>
<description>Resource Adaptor</description>
<dependencies>
Modified: qpid/java/branches/6.0.x/joramtests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/joramtests/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/joramtests/pom.xml (original)
+++ qpid/java/branches/6.0.x/joramtests/pom.xml Mon Aug 1 13:18:07 2016
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>joramtests</artifactId>
- <name>Qpid Joram JMS Tests</name>
+ <name>Apache Qpid Joram JMS Tests</name>
<description>Integration test suite utilising the Joram JMS test suite.</description>
<properties>
Modified: qpid/java/branches/6.0.x/perftests/etc/json_config_tool.py
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/perftests/etc/json_config_tool.py?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/perftests/etc/json_config_tool.py (original)
+++ qpid/java/branches/6.0.x/perftests/etc/json_config_tool.py Mon Aug 1 13:18:07 2016
@@ -30,7 +30,7 @@ attrvalue = None
try:
import argparse
- parser = argparse.ArgumentParser(description='Adds (or updates) a attribute name/value pair of an existing object within a Java Broker config.json')
+ parser = argparse.ArgumentParser(description='Adds (or updates) a attribute name/value pair of an existing object within an Apache Qpid Broker for Java config.json')
parser.add_argument("objectname", help='Name of the object e.g. httpManagement')
parser.add_argument("attrname", help='Name of the attribute to add or update e.g. httpBasicAuthenticationEnabled')
parser.add_argument("attrvalue", help='Value of the attribute e.g. true')
Modified: qpid/java/branches/6.0.x/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/perftests/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/perftests/pom.xml (original)
+++ qpid/java/branches/6.0.x/perftests/pom.xml Mon Aug 1 13:18:07 2016
@@ -25,7 +25,7 @@
</parent>
<artifactId>qpid-perftests</artifactId>
- <name>Qpid Performance Tests</name>
+ <name>Apache Qpid Performance Tests</name>
<description>Performance testing configuration, code and tests</description>
<properties>
Modified: qpid/java/branches/6.0.x/perftests/src/main/assembly/NOTICE
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/perftests/src/main/assembly/NOTICE?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/perftests/src/main/assembly/NOTICE (original)
+++ qpid/java/branches/6.0.x/perftests/src/main/assembly/NOTICE Mon Aug 1 13:18:07 2016
@@ -1,4 +1,4 @@
-Qpid Java Perftests
+Apache Qpid Performance Tests
Copyright 2006-2016 The Apache Software Foundation
This product includes software developed at
Modified: qpid/java/branches/6.0.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/branches/6.0.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Aug 1 13:18:07 2016
@@ -44,9 +44,9 @@ From: 'QOS.ch' (http://www.qos.ch)
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (http://www.apache.org/)
- - Qpid AMQP 0-x JMS Client (http://qpid.apache.org/components/qpid-client) org.apache.qpid:qpid-client:jar
+ - Apache Qpid JMS Client for AMQP 0-9-1/0-10 (http://qpid.apache.org/components/qpid-client) org.apache.qpid:qpid-client:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Qpid Common (http://qpid.apache.org/components/management/qpid-common) org.apache.qpid:qpid-common:jar
+ - Apache Qpid Common (http://qpid.apache.org/components/management/qpid-common) org.apache.qpid:qpid-common:jar
License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
Modified: qpid/java/branches/6.0.x/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/perftests/visualisation-jfc/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/java/branches/6.0.x/perftests/visualisation-jfc/pom.xml Mon Aug 1 13:18:07 2016
@@ -26,7 +26,7 @@
</parent>
<artifactId>qpid-perftests-visualisation-jfc</artifactId>
- <name>Qpid Performance Tests Visualisation JFC</name>
+ <name>Apache Qpid Performance Tests Visualisation JFC</name>
<description>Performance testing visualisation using JFreeChart</description>
<dependencies>
Modified: qpid/java/branches/6.0.x/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/pom.xml (original)
+++ qpid/java/branches/6.0.x/pom.xml Mon Aug 1 13:18:07 2016
@@ -29,9 +29,9 @@
<version>6.0.5-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Qpid Java Build</name>
+ <name>Apache Qpid for Java</name>
<url>http://qpid.apache.org/components</url>
- <description>Apache Qpid Java Components</description>
+ <description>Apache Qpid for Java</description>
<inceptionYear>2006</inceptionYear>
<issueManagement>
Modified: qpid/java/branches/6.0.x/qpid-perftests-systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/qpid-perftests-systests/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/qpid-perftests-systests/pom.xml (original)
+++ qpid/java/branches/6.0.x/qpid-perftests-systests/pom.xml Mon Aug 1 13:18:07 2016
@@ -26,7 +26,7 @@
</parent>
<artifactId>qpid-perftests-systests</artifactId>
- <name>Qpid Performance Test System Tests</name>
+ <name>Apache Qpid Performance Test System Tests</name>
<description>System testing using the performance testing module</description>
<properties>
Modified: qpid/java/branches/6.0.x/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/qpid-systests-parent/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/qpid-systests-parent/pom.xml (original)
+++ qpid/java/branches/6.0.x/qpid-systests-parent/pom.xml Mon Aug 1 13:18:07 2016
@@ -27,7 +27,7 @@
<artifactId>qpid-systests-parent</artifactId>
<version>6.0.5-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Qpid Java System Test Parent</name>
+ <name>Apache Qpid System Test Parent</name>
<description>Parent POM for Qpid system testing modules</description>
<properties>
Modified: qpid/java/branches/6.0.x/qpid-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/qpid-test-utils/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/qpid-test-utils/pom.xml (original)
+++ qpid/java/branches/6.0.x/qpid-test-utils/pom.xml Mon Aug 1 13:18:07 2016
@@ -25,7 +25,7 @@
</parent>
<artifactId>qpid-test-utils</artifactId>
- <name>Qpid Test Utilities</name>
+ <name>Apache Qpid Test Utilities</name>
<description>Testing utilities</description>
<dependencies>
Modified: qpid/java/branches/6.0.x/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/pom.xml?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/pom.xml (original)
+++ qpid/java/branches/6.0.x/systests/pom.xml Mon Aug 1 13:18:07 2016
@@ -26,7 +26,7 @@
</parent>
<artifactId>qpid-systests</artifactId>
- <name>Qpid System Tests</name>
+ <name>Apache Qpid System Tests</name>
<description>System testing configuration, code and tests</description>
<dependencies>
Propchange: qpid/java/branches/6.0.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 1 13:18:07 2016
@@ -8,4 +8,5 @@
/qpid/branches/java-broker-vhost-refactor/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1061302-1072333
+/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1754429
/qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Mon Aug 1 13:18:07 2016
@@ -959,7 +959,7 @@ public class FailoverBehaviourTest exten
* Tests that the producer flow control flag is reset when failover occurs while
* the producers are being blocked by the broker.
*
- * Uses Java broker specific queue configuration to enabled PSFC.
+ * Uses Apache Qpid Broker for Java specific queue configuration to enabled PSFC.
*/
public void testFlowControlFlagResetOnFailover() throws Exception
{
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java Mon Aug 1 13:18:07 2016
@@ -525,7 +525,7 @@ public class SSLTest extends QpidBrokerT
}
private boolean shouldPerformTest()
{
- // We run the SSL tests on all the Java broker profiles
+ // We run the SSL tests on all profiles for the Apache Qpid Broker for Java
if(isJavaBroker())
{
setTestClientSystemProperty(PROFILE_USE_SSL, "true");
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java Mon Aug 1 13:18:07 2016
@@ -30,7 +30,7 @@ import org.apache.qpid.server.logging.Ab
import org.apache.qpid.util.FileUtils;
/**
- * Series of tests to validate the external Java broker starts up as expected.
+ * Series of tests to validate the external Apache Qpid Broker for Java starts up as expected.
*/
public class BrokerStartupTest extends AbstractTestLogging
{
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java Mon Aug 1 13:18:07 2016
@@ -158,7 +158,7 @@ public class BrokerLoggingTest extends A
*/
public void testBrokerStartupStartup() throws Exception
{
- // This logging startup code only occurs when you run a Java broker,
+ // This logging startup code only occurs when you run a Apache Qpid Broker for Java,
// that broker must be started via Main so not an InVM broker.
if (isJavaBroker())
{
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java Mon Aug 1 13:18:07 2016
@@ -113,7 +113,7 @@ public class ChannelLoggingTest extends
/**
* Description:
- * The Java Broker implements consumer flow control for all ack modes except
+ * The Apache Qpid Broker for Java implements consumer flow control for all ack modes except
* No-Ack. When a client connects the session's flow is initially set to
* Stopped. Verify this message appears
*
@@ -170,7 +170,7 @@ public class ChannelLoggingTest extends
/**
* Description:
- * The Java Broker implements consumer flow control for all ack modes except
+ * The Apache Qpid Broker for Java implements consumer flow control for all ack modes except
* No-Ack. When the client first attempts to receive a message then the Flow
* status of the Session is set to Started.
*
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java Mon Aug 1 13:18:07 2016
@@ -226,7 +226,7 @@ public class DynamicQueueExchangeCreateT
consumer.close();
// Temporarily workaround the fact that exchange deletion is not completely atomic
- // in the Java Broker.
+ // in the Apache Qpid Broker for Java.
long timeout = System.currentTimeMillis() + 10000;
boolean exchangeExists = true;
while (timeout > System.currentTimeMillis() && exchangeExists)
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Mon Aug 1 13:18:07 2016
@@ -709,7 +709,7 @@ public class DurableSubscriptionTest ext
producer.close();
// should be 5 or 10 messages on queue now
- // (5 for the java broker due to use of server side selectors, and 10 for the cpp broker due to client side selectors only)
+ // (5 for the Apache Qpid Broker for Java due to use of server side selectors, and 10 for the cpp broker due to client side selectors only)
AMQQueue queue = new AMQQueue("amq.topic", "clientid" + ":" + "sameMessageSelector");
assertEquals("Queue depth is wrong", isJavaBroker() ? 5 : 10, ((AMQSession<?, ?>) session).getQueueDepth(queue, true));
@@ -799,7 +799,7 @@ public class DurableSubscriptionTest ext
producer.send(msg);
// should be 1 or 2 messages on queue now
- // (1 for the java broker due to use of server side selectors, and 2 for the cpp broker due to client side selectors only)
+ // (1 for the Apache Qpid Broker for Java due to use of server side selectors, and 2 for the cpp broker due to client side selectors only)
AMQQueue queue = new AMQQueue("amq.topic", "clientid" + ":" + "testResubscribeWithChangedSelectorNoClose");
assertEquals("Queue depth is wrong", isJavaBroker() ? 1 : 2, ((AMQSession<?, ?>) session).getQueueDepth(queue, true));
@@ -867,7 +867,7 @@ public class DurableSubscriptionTest ext
producer.send(msg);
// should be 1 or 2 messages on queue now
- // (1 for the java broker due to use of server side selectors, and 2 for the cpp broker due to client side selectors only)
+ // (1 for the Apache Qpid Broker for Java due to use of server side selectors, and 2 for the cpp broker due to client side selectors only)
AMQQueue queue = new AMQQueue("amq.topic", "clientid" + ":" + "subscriptionName");
assertEquals("Queue depth is wrong", isJavaBroker() ? 1 : 2, ((AMQSession<?, ?>) session).getQueueDepth(queue, true));
@@ -980,7 +980,7 @@ public class DurableSubscriptionTest ext
* Tests that if no-local is in use, that the messages are delivered when
* the client reconnects.
*
- * Currently fails on the Java Broker due to QPID-3605.
+ * Currently fails on the Apache Qpid Broker for Java due to QPID-3605.
*/
public void testNoLocalMessagesNotDeliveredAfterReconnection() throws Exception
{
Modified: qpid/java/branches/6.0.x/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/CPPExcludes?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/CPPExcludes (original)
+++ qpid/java/branches/6.0.x/test-profiles/CPPExcludes Mon Aug 1 13:18:07 2016
@@ -20,7 +20,7 @@
// QPID-3391: the C++ broker does not currently validate the exchange creation arguments
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithNonsenseArgs
-// QPID-3576: Java client issue. MessageConsumer#close() time-out.
+// QPID-3576: JMS client issue. MessageConsumer#close() time-out.
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testDeleteOptions
// Those tests are testing 0.8 specific semantics
@@ -30,11 +30,11 @@ org.apache.qpid.test.client.CloseOnNoRou
// the 0.10 c++ broker does not implement forget
org.apache.qpid.test.unit.xa.FaultTest#testForget
-// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation
+// the 0-10 c++ broker does not implement priority / this test depends on extension for queue creation from Broker for Java
org.apache.qpid.server.queue.PriorityTest#*
org.apache.qpid.server.queue.AMQPriorityQueueTest#*
-// the 0-10 c++ broker does not implement the extended LVQ semantics which the Java Broker does
+// the 0-10 c++ broker does not implement the extended LVQ semantics which the Broker for Java does
org.apache.qpid.server.queue.ConflationQueueTest#*
// the 0-10 c++ broker does not implement sorted queues
@@ -84,7 +84,7 @@ org.apache.qpid.server.AlertingTest#*
org.apache.qpid.server.store.PersistentStoreTest#*
org.apache.qpid.server.store.SplitStoreTest#*
-// These tests are for the Java broker persistent store modules
+// These tests are for persistent store modules from Broker for Java
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessagePersistence
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testMessageRemoval
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testBindingPersistence
@@ -96,7 +96,7 @@ org.apache.qpid.server.store.VirtualHost
org.apache.qpid.server.store.VirtualHostMessageStoreTest#testQueueExchangeAndBindingCreation
org.apache.qpid.server.store.DurableConfigurationStoreTest#*
-// CPP Broker does not follow the same Logging convention as the Java broker
+// CPP Broker does not follow the same Logging convention as the Broker for Java
org.apache.qpid.server.BrokerStartupTest#*
org.apache.qpid.server.logging.*
org.apache.qpid.server.logging.messages.*
@@ -117,14 +117,14 @@ org.apache.qpid.test.unit.close.JavaServ
// QPID-2084 : this test needs more work for 0-10
org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#*
-// QPID-2118 : 0-10 Java client has differrent error handling to 0-8 code path
+// QPID-2118 : JMS client for AMQP 0-10 has differrent error handling then 0-8 code path
org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
-//QPID-942 : Implemented Channel.Flow based Producer Side flow control to the Java Broker (not in CPP Broker)
+//QPID-942 : Implemented Channel.Flow based Producer Side flow control to the Broker for Java (not in CPP Broker)
org.apache.qpid.server.queue.ProducerFlowControlTest#*
//QPID-3986 : Flow control invoked on total store disk usage
org.apache.qpid.server.store.StoreOverfullTest#*
-// 0-8/0-9/0-9-1 and/or Java broker specific failover tests related to the above Producer Flow Control mechanisms
+// 0-8/0-9/0-9-1 and/or Broker for Java specific failover tests related to the above Producer Flow Control mechanisms
org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutExpires
org.apache.qpid.client.failover.FailoverBehaviourTest#testFlowControlFlagResetOnFailover
org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFailoverHandlerTimeoutExpires
@@ -132,7 +132,7 @@ org.apache.qpid.client.failover.AddressB
org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#*
-// Excluded because Java plugins not used in CPP broker
+// Excluded because plugins from Broker for Java are not used in CPP broker
org.apache.qpid.server.virtualhost.plugin.*
org.apache.qpid.info.test.*
org.apache.qpid.server.security.access.*
@@ -150,7 +150,7 @@ org.apache.qpid.test.unit.transacted.Tra
org.apache.qpid.test.unit.transacted.TransactionTimeoutConfigurationTest#*
org.apache.qpid.test.unit.transacted.TransactionTimeoutTest#*
-// Java broker only
+// Broker for Java only
org.apache.qpid.server.SupportedProtocolVersionsTest#*
org.apache.qpid.server.stats.StatisticsReportingTest#*
@@ -166,45 +166,45 @@ org.apache.qpid.server.queue.MessageGrou
// CPP Broker does not implement message conversion from 0-9-1
org.apache.qpid.server.message.MessageProtocolConversionTest#*
-// passwd script is a Java Broker specific command line tool
+// passwd script is a Broker for Java specific command line tool
org.apache.qpid.scripts.QpidPasswdTest#*
// QPID-3604: Immediate Prefetch no longer supported by 0-10
org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
-// Java Broker has an extenstion to allow it to influence the prefix of temporary queue names
+// Broker for Java has an extenstion to allow it to influence the prefix of temporary queue names
org.apache.qpid.client.TemporaryQueuePrefixTest#*
// QPID-3936: Exclude Performance Test Framework tests
org.apache.qpid.systest.disttest.*
org.apache.qpid.disttest.*
-// Exclude java broker REST API tests
+// Exclude REST API tests for Broker for Java
org.apache.qpid.systest.rest.*
org.apache.qpid.systest.rest.acl.*
// Exclude failover tests requiring virtual host functionality
org.apache.qpid.client.failover.MultipleBrokersFailoverTest#*
-// Uses Java broker specific configuration
+// Uses Broker for Java specific configuration
org.apache.qpid.client.ssl.SSLTest#testClientCertMissingWhilstWanting
org.apache.qpid.client.ssl.SSLTest#testCreateSSLandTCPonSamePort
-// QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based
+// QPID-2796 : JMS client for AMQP 0-10 only sends heartbeats in response to heartbeats from the server, not timeout based
org.apache.qpid.client.HeartbeatTest#testUnidirectionalHeartbeating
org.apache.qpid.client.HeartbeatTest#testHeartbeatsEnabledBrokerSide
-// Exclude java broker specific behavior allowing queue re-bind to topic exchanges on 0.8/0-10 paths
+// Exclude Broker for Java specific behavior allowing queue re-bind to topic exchanges on 0.8/0-10 paths
org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange
-// Tests queue message durability settings which are a Java Broker specific feature
+// Tests queue message durability settings which are a Broker for Java specific feature
org.apache.qpid.server.queue.QueueMessageDurabilityTest#*
// QPID-4429 : C++ Broker does not enforce max frame size negotiation rules as per the spec
org.apache.qpid.transport.MaxFrameSizeTest#*
-// CPP Broker does not timeout connections with no activity like the Java Broker
+// CPP Broker does not timeout connections with no activity like the Broker for Java
org.apache.qpid.transport.ProtocolNegotiationTest#testNoProtocolHeaderSent_BrokerClosesConnection
org.apache.qpid.transport.ProtocolNegotiationTest#testNoConnectionOpenSent_BrokerClosesConnection
@@ -223,7 +223,7 @@ org.apache.qpid.server.queue.DefaultFilt
org.apache.qpid.server.queue.EnsureNondestructiveConsumersTest#*
org.apache.qpid.server.protocol.v0_8.*
-//Java Broker BDB System Tests
+//Broker for Java BDB System Tests
org.apache.qpid.server.store.berkeleydb.*
org.apache.qpid.server.store.berkeleydb.replication.*
Propchange: qpid/java/branches/6.0.x/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 1 13:18:07 2016
@@ -6,4 +6,4 @@
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/CPPExcludes:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/010Excludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/CPPExcludes:1061302-1072333
-/qpid/java/trunk/test-profiles/CPPExcludes:1715446,1732812,1736751,1736838,1737804
+/qpid/java/trunk/test-profiles/CPPExcludes:1715446,1732812,1736751,1736838,1737804,1754429
Modified: qpid/java/branches/6.0.x/test-profiles/Java010Excludes
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/Java010Excludes?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/Java010Excludes (original)
+++ qpid/java/branches/6.0.x/test-profiles/Java010Excludes Mon Aug 1 13:18:07 2016
@@ -40,13 +40,13 @@ org.apache.qpid.test.unit.close.JavaServ
//QPID-1864: rollback with subscriptions does not work in 0-10 yet
org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage
-//QPID-3422: test fails because ring queue is not implemented on java broker
+//QPID-3422: test fails because ring queue is not implemented on Broker for Java
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode
// QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs.
org.apache.qpid.server.failover.FailoverMethodTest#*
-// QPID-3392: the Java broker does not yet implement exchange creation arguments
+// QPID-3392: the Broker for Java does not yet implement exchange creation arguments
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithArgs
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testSessionCreateTopicWithExchangeArgs
@@ -65,7 +65,7 @@ org.apache.qpid.client.failover.AddressB
// QPID-3604: Immediate Prefetch no longer supported by 0-10
org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener
-// Java 0-10 client does not support re-binding the queue to the same exchange
+// JMS 0-10 client does not support re-binding the queue to the same exchange
org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange
// Java 0-10 exclusive queues are owned by sessions not by the client-id, so the owner is not meaningful from JMX
@@ -81,7 +81,7 @@ org.apache.qpid.client.SyncPublishTest#*
org.apache.qpid.client.failover.FailoverBehaviourTest#testConnectionCloseInterruptsFailover
org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testConnectionCloseInterruptsFailover
-// This test does not make sense because on 0-10 maxFrameSize is 64kB and the Java Broker sets the networkBufferSize to a minimum of 64kB.
+// This test does not make sense because on 0-10 maxFrameSize is 64kB and the Broker for Java sets the networkBufferSize to a minimum of 64kB.
org.apache.qpid.transport.MaxFrameSizeTest#testTooLargeFrameSize
org.apache.qpid.test.unit.basic.PropertyValueTest#testLargeHeader_08091_HeadersFillContentHeaderFrame
Modified: qpid/java/branches/6.0.x/test-profiles/JavaExcludes
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/JavaExcludes?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/JavaExcludes (original)
+++ qpid/java/branches/6.0.x/test-profiles/JavaExcludes Mon Aug 1 13:18:07 2016
@@ -20,7 +20,7 @@
// QPID-1823: this takes ages to run
org.apache.qpid.client.SessionCreateTest#*
-//QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Java broker
+//QPID-2845: The queue policy types used by the C++ broker are not currently supported by the Apache Qpid Broker for Java
org.apache.qpid.test.client.queue.QueuePolicyTest#testRingPolicy
org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy
Propchange: qpid/java/branches/6.0.x/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 1 13:18:07 2016
@@ -4,3 +4,4 @@
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaExcludes:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/JavaExcludes:1061302-1072333
+/qpid/java/trunk/test-profiles/JavaExcludes:1754429
Modified: qpid/java/branches/6.0.x/test-profiles/JavaPre010Excludes
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/JavaPre010Excludes?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/JavaPre010Excludes (original)
+++ qpid/java/branches/6.0.x/test-profiles/JavaPre010Excludes Mon Aug 1 13:18:07 2016
@@ -25,9 +25,9 @@
org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend
org.apache.qpid.server.message.MessageProtocolConversionTest#*
-//QPID-3422: test fails because ring queue is not implemented on java broker
+//QPID-3422: test fails because ring queue is not implemented on Apache Qpid Broker for Java
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testBrowseMode
-//QPID-3392: the Java broker does not yet implement exchange creation arguments
+//QPID-3392: the Apache Qpid Broker for Java does not yet implement exchange creation arguments
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testCreateExchangeWithArgs
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#testSessionCreateTopicWithExchangeArgs
//QPID-3678: zero capacity not supported in 0-9-1
Propchange: qpid/java/branches/6.0.x/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 1 13:18:07 2016
@@ -4,3 +4,4 @@
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaPre010Excludes:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/08StandaloneExcludes:1061302-1072333
+/qpid/java/trunk/test-profiles/JavaPre010Excludes:1754429
Modified: qpid/java/branches/6.0.x/test-profiles/python_tests/Java010PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/python_tests/Java010PythonExcludes?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/python_tests/Java010PythonExcludes (original)
+++ qpid/java/branches/6.0.x/test-profiles/python_tests/Java010PythonExcludes Mon Aug 1 13:18:07 2016
@@ -17,7 +17,7 @@
# under the License.
#
-###### Feature not supported in Java Broker ######
+###### Feature not supported in Broker for Java ######
#The broker does not have the appropriate QMF support
qpid_tests.broker_0_10.management.*
@@ -56,20 +56,20 @@ qpid_tests.broker_0_10.priority.Priority
#QPID-6299 broker does not support ring queue on lvq
qpid_tests.broker_0_10.lvq.LVQTests.test_ring_lvq2
-#QPID-6572 These tests pass a empty binding key argument, which won't match with the Java Broker's stricter impl.
+#QPID-6572 These tests pass a empty binding key argument, which won't match with the Broker for Java's stricter impl.
qpid_tests.broker_0_10.exchange.AutodeleteTests.testAutodeleteFanout
qpid_tests.broker_0_10.exchange.AutodeleteTests.testAutodeleteHeaders
-# QPID-5531 : Changes to the C++ behaviour in having a default timeout for every transaction not implemented in Java Broker
+# QPID-5531 : Changes to the C++ behaviour in having a default timeout for every transaction not implemented in Broker for Java
qpid_tests.broker_0_10.dtx.DtxTests.test_get_timeout
-###### Behavioural differences between Java & CPP Broker ######
+###### Behavioural differences between Broker for Java & CPP Broker ######
#Tests changed/added in QPID-5280 and QPID-5283
qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive
qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive_alreadyinuse
-#QPID-3587 Java broker does not alter queue counts until msgs are accepted.
+#QPID-3587 Broker for Java does not alter queue counts until msgs are accepted.
qpid_tests.broker_0_10.message.MessageTests.test_ack
qpid_tests.broker_0_10.message.MessageTests.test_acquire
qpid_tests.broker_0_10.message.MessageTests.test_acquire_with_no_accept_and_credit_flow
@@ -83,7 +83,7 @@ qpid_tests.broker_0_10.dtx.DtxTests.test
qpid_tests.broker_0_10.new_api.GeneralTests.test_qpid_3481_acquired_to_alt_exchange_2_consumers
-###### Java Broker defects ######
+###### Broker for Java defects ######
#QPID-3591 Fails due to bytes credit issue
qpid_tests.broker_0_10.message.MessageTests.test_credit_flow_bytes
@@ -92,10 +92,10 @@ qpid_tests.broker_0_10.message.MessageTe
#QPID-3605 Durable subscriber with no-local true receives messages on re-connection
qpid_tests.broker_0_10.message.MessageTests.test_no_local_awkward
-#QPID-6122 TimeoutTests occasionally fail against the Java Broker
+#QPID-6122 TimeoutTests occasionally fail against the Broker for Java
qpid.tests.messaging.endpoints.TimeoutTests.*
-# QPID-6673 Java Broker cannot discriminate between null and empty messages
+# QPID-6673 Broker for Java cannot discriminate between null and empty messages
qpid.tests.messaging.message.MessageEchoTests.testApplicationProperties
qpid.tests.messaging.message.MessageEchoTests.testContentTypeUnknown
qpid.tests.messaging.message.MessageEchoTests.testProperties
Modified: qpid/java/branches/6.0.x/test-profiles/python_tests/JavaPre010PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/python_tests/JavaPre010PythonExcludes?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/python_tests/JavaPre010PythonExcludes (original)
+++ qpid/java/branches/6.0.x/test-profiles/python_tests/JavaPre010PythonExcludes Mon Aug 1 13:18:07 2016
@@ -33,7 +33,7 @@ qpid_tests.broker_0_9.query.QueryTests.t
qpid_tests.broker_0_9.queue.QueueTests.test_unbind_fanout
qpid_tests.broker_0_9.queue.QueueTests.test_unbind_headers
-#QPID-4832 Java Broker does not support an explicit bind to a default exchange
+#QPID-4832 Apache Qpid Broker for Java does not support an explicit bind to a default exchange
qpid_tests.broker_0_8.exchange.DefaultExchangeRuleTests.testDefaultExchangeExplicitBind
#QPID-5551 : We now throw a connection exception rather than a channel exception
Propchange: qpid/java/branches/6.0.x/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 1 13:18:07 2016
@@ -4,3 +4,4 @@
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/test_resources:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
/qpid/branches/qpid-2935/qpid/java/test-profiles/test_resources:1061302-1072333
+/qpid/java/trunk/test-profiles/test_resources:1754429,1754510
Modified: qpid/java/branches/6.0.x/test-profiles/test_resources/ssl/generate-java-keystores.sh
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/test-profiles/test_resources/ssl/generate-java-keystores.sh?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/test-profiles/test_resources/ssl/generate-java-keystores.sh (original)
+++ qpid/java/branches/6.0.x/test-profiles/test_resources/ssl/generate-java-keystores.sh Mon Aug 1 13:18:07 2016
@@ -18,9 +18,9 @@
# under the License.
#
-echo "Remove existing java broker keystore"
+echo "Remove existing keystore for Apache Qpid Broker for Java "
rm java_broker_keystore.jks
-echo "Re-create java broker keystore by importing RootCA certificate"
+echo "Re-create keystore for Apache Qpid Broker for Java by importing RootCA certificate"
keytool -import -v -keystore java_broker_keystore.jks -storepass password -alias RootCA -file CA_db/rootca.crt
echo "Generate certificate key 'java-broker'"
keytool -genkey -alias java-broker -keyalg RSA -sigalg SHA1withRSA -validity 720 -keystore java_broker_keystore.jks -storepass password -dname "CN=localhost, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown"
@@ -40,7 +40,7 @@ keytool --list --keystore java_broker_ke
read -p "Press [Enter] key to continue..."
echo "Remove existing client keystore"
rm java_client_keystore.jks
-echo "Re-create java client keystore by importing RootCA certificate"
+echo "Re-create client keystore by importing RootCA certificate"
keytool -import -v -keystore java_client_keystore.jks -storepass password -alias RootCA -file CA_db/rootca.crt
echo "Generate key for certificate 'app2'"
Modified: qpid/java/branches/6.0.x/tools/README.txt
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/tools/README.txt?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/tools/README.txt (original)
+++ qpid/java/branches/6.0.x/tools/README.txt Mon Aug 1 13:18:07 2016
@@ -1,7 +1,7 @@
Introduction
============
-The Test kit for the java client consists of 2 components.
+The Test kit for the Apache Qpid JMS Client for AMQP 0-9-1/0-10 consists of 2 components.
1) A Simple Perf Test that can be used to,
a) Run a predefined perf report consisting of 8 use cases (see below)
Modified: qpid/java/branches/6.0.x/tools/bin/memory-test
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/tools/bin/memory-test?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/tools/bin/memory-test (original)
+++ qpid/java/branches/6.0.x/tools/bin/memory-test Mon Aug 1 13:18:07 2016
@@ -18,7 +18,7 @@
# under the License.
#
-# This script is used to measure memory consumption by Qpid Java Broker running in Oracle JDK
+# This script is used to measure memory consumption by Apache Qpid Broker for Java running in Oracle JDK
# Use plot.py to plot graphs of memory usage from results collected by this test
function waitfor()
Modified: qpid/java/branches/6.0.x/tools/bin/testkit.py
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/tools/bin/testkit.py?rev=1754747&r1=1754746&r2=1754747&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/tools/bin/testkit.py (original)
+++ qpid/java/branches/6.0.x/tools/bin/testkit.py Mon Aug 1 13:18:07 2016
@@ -220,7 +220,7 @@ class SoakTest(JavaClientTest):
else:
"Print no error !"
- # grace period for java clients to get the failover properly setup.
+ # grace period for clients to get the failover properly setup.
time.sleep(30)
error_msg= None
# Kill original brokers, start new ones.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org