qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1754429 [2/2] - in /qpid/java/trunk: ./ bdbstore/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ bdbstore/systests/ broker-codegen/ broker-core/ broker-plugins/access-control/ broker-plugins/amqp-0-10-protocol/ broker-plug...
Date Thu, 28 Jul 2016 16:29:02 GMT
Modified: qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml Thu Jul 28 16:29:01 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/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml Thu Jul 28 16:29:01 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/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml Thu Jul 28 16:29:01 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/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Message-Encryption.xml Thu Jul 28 16:29:01 2016
@@ -33,9 +33,9 @@
     </para>
     <para>
         Neither JMS nor AMQP provide any defined mechanism for message encryption, however it is possible for any
-        application to build a message encryption scheme on top of a JMS API. For convenience the Qpid JMS client
+        application to build a message encryption scheme on top of a JMS API. For convenience the Client
         provides a built in mechanism for encryption and decrypting messages. This mechanism is currently only
-        implemented in the Qpid JMS client for AMQP 0-8/0-9/0-9-1/0-10.  If you use a different client you will be
+        implemented in the Client for AMQP 0-8/0-9/0-9-1/0-10. If you use a different client you will be
         unable to read encrypted messages.
     </para>
 
@@ -53,7 +53,7 @@
         </para>
         <para>
             In order to send an encrypted message it is necessary to know the Certificates of the intended recipients.
-            Certificates can be distributed either through out-of-band mechanisms, or the Qpid Java Broker can be used
+            Certificates can be distributed either through out-of-band mechanisms, or the Apache Qpid Broker for Java can be used
             to distribute them to clients.
         </para>
         <para>
@@ -83,7 +83,7 @@
             <programlisting>amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672?encryption_trust_store='/home/qpid/certificates.jks'&amp;encryption_trust_store_password='password''</programlisting>
             <para>
                 Alternatively, where available, you can configure the broker to distribute certificates from a trust
-                store (this is currently only available in the Java Broker). In order to use this method, the broker
+                store (this is currently only available in the Apache Qpid Broker for Java). In order to use this method, the broker
                 details in the connection url must contain the correctly configured
                 <link linkend="JMS-Client-0-8-Connection-URL-BrokerOptions-EncryptionRemoteTrustStore">encryption_remote_trust_store</link>
                 option. Such a connection URL might look somthing like:

Modified: qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml Thu Jul 28 16:29:01 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/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml Thu Jul 28 16:29:01 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>
@@ -318,7 +318,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//&lt;queue name&gt;?routingkey=&apos;&lt;queue name&gt;&apos;&amp;durable=&apos;true&apos;. </para>
       <para>Calling Session#createQueue() has no effect on the Broker.</para>
@@ -327,7 +327,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//&lt;topic
         name&gt;?routingkey=&apos;&lt;topic name&gt;&apos;.</para>
       <para>Calling Session#createTopic() has no effect on the Broker.</para>
@@ -343,11 +343,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
@@ -387,7 +387,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">
@@ -414,7 +414,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>
@@ -447,7 +447,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>
@@ -480,7 +480,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
@@ -490,7 +490,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/trunk/doc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/doc/pom.xml (original)
+++ qpid/java/trunk/doc/pom.xml Thu Jul 28 16:29:01 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/trunk/jca/README.txt
URL: http://svn.apache.org/viewvc/qpid/java/trunk/jca/README.txt?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/jca/README.txt (original)
+++ qpid/java/trunk/jca/README.txt Thu Jul 28 16:29:01 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/trunk/jca/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/jca/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/jca/pom.xml (original)
+++ qpid/java/trunk/jca/pom.xml Thu Jul 28 16:29:01 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/trunk/jca/rar/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/jca/rar/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/jca/rar/pom.xml (original)
+++ qpid/java/trunk/jca/rar/pom.xml Thu Jul 28 16:29:01 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/trunk/joramtests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/joramtests/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/joramtests/pom.xml (original)
+++ qpid/java/trunk/joramtests/pom.xml Thu Jul 28 16:29:01 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/trunk/perftests/etc/json_config_tool.py
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/json_config_tool.py?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/perftests/etc/json_config_tool.py (original)
+++ qpid/java/trunk/perftests/etc/json_config_tool.py Thu Jul 28 16:29:01 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/trunk/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/perftests/pom.xml (original)
+++ qpid/java/trunk/perftests/pom.xml Thu Jul 28 16:29:01 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/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/trunk/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Thu Jul 28 16:29:01 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/trunk/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/visualisation-jfc/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/java/trunk/perftests/visualisation-jfc/pom.xml Thu Jul 28 16:29:01 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Thu Jul 28 16:29:01 2016
@@ -29,9 +29,9 @@
   <version>6.1.0-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/trunk/qpid-perftests-systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/pom.xml (original)
+++ qpid/java/trunk/qpid-perftests-systests/pom.xml Thu Jul 28 16:29:01 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/trunk/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-systests-parent/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/qpid-systests-parent/pom.xml (original)
+++ qpid/java/trunk/qpid-systests-parent/pom.xml Thu Jul 28 16:29:01 2016
@@ -27,7 +27,7 @@
   <artifactId>qpid-systests-parent</artifactId>
   <version>6.1.0-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/trunk/qpid-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-test-utils/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/qpid-test-utils/pom.xml (original)
+++ qpid/java/trunk/qpid-test-utils/pom.xml Thu Jul 28 16:29:01 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/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/pom.xml (original)
+++ qpid/java/trunk/systests/pom.xml Thu Jul 28 16:29:01 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>

Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Jul 28 16:29:01 2016
@@ -610,7 +610,7 @@ public class QpidBrokerTestCase extends
      * When the test run is complete the value will be reverted.
      * <p/>
      * The values set using this method will also be propagated to the external
-     * Java Broker via a -D value defined in QPID_OPTS.
+     * Apache Qpid Broker for Java via a -D value defined in QPID_OPTS.
      * <p/>
      * If the value should not be set on the broker then use
      * setTestClientSystemProperty().

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Thu Jul 28 16:29:01 2016
@@ -938,7 +938,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/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java Thu Jul 28 16:29:01 2016
@@ -526,7 +526,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/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java Thu Jul 28 16:29:01 2016
@@ -29,7 +29,7 @@ import org.apache.qpid.server.model.Port
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 /**
- * 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/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/BrokerLoggingTest.java Thu Jul 28 16:29:01 2016
@@ -152,7 +152,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/trunk/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java Thu Jul 28 16:29:01 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/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java Thu Jul 28 16:29:01 2016
@@ -208,7 +208,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/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Thu Jul 28 16:29:01 2016
@@ -647,7 +647,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));
 
@@ -737,7 +737,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));
 
@@ -805,7 +805,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));
         
@@ -918,7 +918,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/trunk/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/CPPExcludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/CPPExcludes (original)
+++ qpid/java/trunk/test-profiles/CPPExcludes Thu Jul 28 16:29:01 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.*
@@ -113,14 +113,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
@@ -128,7 +128,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.*
@@ -146,7 +146,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#*
 
@@ -162,49 +162,49 @@ 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
 
-// QPID-6000 : Tests Java specific message compression functionality, and uses the REST API to test it
+// QPID-6000 : Tests Broker for Java specific message compression functionality, and uses the REST API to test it
 org.apache.qpid.systest.MessageCompressionTest#*
 
 
@@ -219,11 +219,11 @@ 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.*
 
-// Java Broker Derby Tests
+// Broker for Java Derby Tests
 org.apache.qpid.server.store.derby.*
 
 // These tests are 0-8..0-91 specific
@@ -233,7 +233,7 @@ org.apache.qpid.test.unit.basic.Property
 // QPID-6786 Sending headers larger than [first] transfer/frame size (which is outside the spec) isn't supported against the C++ broker
 org.apache.qpid.test.unit.basic.PropertyValueTest#testLargeHeader_010_HeadersFillContentHeaderFrame
 
-// QPID-6703 Use of Java Broker specific queue creation arguments to properly fulfill JMS TemporaryQueue contract
+// QPID-6703 Use of Broker for Java specific queue creation arguments to properly fulfill JMS TemporaryQueue contract
 org.apache.qpid.test.unit.client.temporaryqueue.TemporaryQueueTest#testClosingSessionDoesNotDeleteQueue
 
 # QPID-7156: Test requires a Broker with a virtualhost
@@ -243,5 +243,5 @@ org.apache.qpid.test.unit.client.connect
 # the following test requires running broker with authentication enabled
 org.apache.qpid.transport.ConnectionEstablishmentTest#testAuthenticationBypass
 
-//Node Creation Policy Tests use Java Specific Config
+//Node Creation Policy Tests use Broker for Java Specific Config
 org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#*

Modified: qpid/java/trunk/test-profiles/Java010Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java010Excludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java010Excludes (original)
+++ qpid/java/trunk/test-profiles/Java010Excludes Thu Jul 28 16:29:01 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
 
 org.apache.qpid.test.unit.client.AMQSessionTest#testQueueDepthForQueueThatDoesNotExistLegacyBehaviour_08_091
@@ -78,7 +78,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/trunk/test-profiles/JavaExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/JavaExcludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/JavaExcludes (original)
+++ qpid/java/trunk/test-profiles/JavaExcludes Thu Jul 28 16:29:01 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
 

Modified: qpid/java/trunk/test-profiles/JavaPre010Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/JavaPre010Excludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/JavaPre010Excludes (original)
+++ qpid/java/trunk/test-profiles/JavaPre010Excludes Thu Jul 28 16:29:01 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

Modified: qpid/java/trunk/test-profiles/python_tests/Java010PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/python_tests/Java010PythonExcludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/python_tests/Java010PythonExcludes (original)
+++ qpid/java/trunk/test-profiles/python_tests/Java010PythonExcludes Thu Jul 28 16:29:01 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/trunk/test-profiles/python_tests/Java10PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/python_tests/Java10PythonExcludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/python_tests/Java10PythonExcludes (original)
+++ qpid/java/trunk/test-profiles/python_tests/Java10PythonExcludes Thu Jul 28 16:29:01 2016
@@ -20,10 +20,10 @@
 // QPID-7181 Causes a Broker crash
 qpid_tests.broker_1_0.selector.SelectorTests.test_special_fields
 
-// Java Broker currently fails to select messages matching JMSDestination = 'a'
+// Broker for Java currently fails to select messages matching JMSDestination = 'a'
 qpid_tests.broker_1_0.selector.SelectorTests.test_jms_header_names
 
-// Java Broker currently rejects the transfer. Don't think x-amqp-to is implemented.
+// Broker for Java currently rejects the transfer. Don't think x-amqp-to is implemented.
 qpid_tests.broker_1_0.general.GeneralTests.test_anonymous_relay
 
 

Modified: qpid/java/trunk/test-profiles/python_tests/JavaPre010PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/python_tests/JavaPre010PythonExcludes?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/python_tests/JavaPre010PythonExcludes (original)
+++ qpid/java/trunk/test-profiles/python_tests/JavaPre010PythonExcludes Thu Jul 28 16:29:01 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

Modified: qpid/java/trunk/test-profiles/test_resources/ssl/generate-java-keystores.sh
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/test_resources/ssl/generate-java-keystores.sh?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/test_resources/ssl/generate-java-keystores.sh (original)
+++ qpid/java/trunk/test-profiles/test_resources/ssl/generate-java-keystores.sh Thu Jul 28 16:29:01 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"

Modified: qpid/java/trunk/tools/bin/memory-test
URL: http://svn.apache.org/viewvc/qpid/java/trunk/tools/bin/memory-test?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/tools/bin/memory-test (original)
+++ qpid/java/trunk/tools/bin/memory-test Thu Jul 28 16:29:01 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/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/tools/pom.xml?rev=1754429&r1=1754428&r2=1754429&view=diff
==============================================================================
--- qpid/java/trunk/tools/pom.xml (original)
+++ qpid/java/trunk/tools/pom.xml Thu Jul 28 16:29:01 2016
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>qpid-tools</artifactId>
-  <name>Qpid Tools</name>
+  <name>Apache Qpid Tools</name>
   <description>Tools</description>
 
   <dependencies>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message