Remerge of M2. All tests pass locally

Testing done in Intelij and mvn command line via windows/cygwin.
Python tests removed from auto build pending Jython-siztion. Tested running broker in intelij and python run-tests from cygwin.

All tests pass. (CombinedTest still exhibts a race condition. but that has always been so.)

Additional Race condition identified (around MsgReject/AutoDeleteQueues) during testing patch to follow.

systests are inconsistent Some use TestableMemoryMessageStore some use MemoryMessgaeStore.

Lets not roll back this change if issues are discovered. Lets work together to go forward and address any issues. I have spent a lot of time ensuring the tests work for me so I hope that they work for you.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@571129 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 154 insertions, 49 deletions

diff --git a/java/release-docs/RELEASE_NOTES.txt b/java/release-docs/RELEASE_NOTES.txt
index 638f4c6f61..1004ec62b4 100644
--- a/java/release-docs/RELEASE_NOTES.txt
+++ b/java/release-docs/RELEASE_NOTES.txt
@@ -1,8 +1,9 @@
-Apache Incubator Qpid Java M1 Release Notes
+Apache Incubator Qpid Java M2 Release Notes
 -------------------------------------------
 
-The Qpid M1 release is intended to serve as a useful baseline release
-for the project, allowing interested users to use the current featureset.
+The Qpid M2 release contains support the for AMQP 0-8 specification.
+You can access the 0-8 specification using the following link.
+http://www.amqp.org/tikiwiki/tiki-index.php?page=Download
 
 For full details of Qpid capabilities, as they currently stand, see our
 detailed project documentation at:
@@ -13,62 +14,92 @@ From the link above you can access our Getting Started Guide, FAQ, Build How To
 and detailed developer documentation.
 
 
-Known Issues/OUtstanding Work
+Known Issues/Outstanding Work
 -----------------------------
 
 You can view the outstanding task list for Qpid by visiting our JIRA:
-
 http://issues.apache.org/jira/browse/QPID
 
+These issues are moved to M3 release.
 
-M1 Tasks Completed
--------------------
-
-The set of JIRA tasks completed as part of the M1 effort is available at:
-
-http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+M1+Release+Notes
-
-This list is copied below for convenience:
-
-Bugs
-----
-http://issues.apache.org/jira/browse/QPID-4 - Remove '/' and ':' from generated queue names
-http://issues.apache.org/jira/browse/QPID-7 - Occasionally messages are ack'd more than once
-http://issues.apache.org/jira/browse/QPID-10- Broker throughput falls off with transactions
-http://issues.apache.org/jira/browse/QPID-56 - AMQQueueMBean - MessageCount on the management interface is not correct.
-http://issues.apache.org/jira/browse/QPID-58 - Creating a QueueReceiver results in ClassCastException
-http://issues.apache.org/jira/browse/QPID-66 - AMQSession implementation of TopicSession and QueueSession interfaces not JMS compliant
-http://issues.apache.org/jira/browse/QPID-68 - Ant build system fails if the project path contains a space
-http://issues.apache.org/jira/browse/QPID-69 - Race condition in Delivery Manager  
-
-Improvements
-------------
-http://issues.apache.org/jira/browse/QPID-36 - Add high and low watermark to flow control
-http://issues.apache.org/jira/browse/QPID-44 - Add high and low watermark to flow control
-http://issues.apache.org/jira/browse/QPID-57 - AMQQueueMBean - Message header attributes should be sent along with message content.
-
-    
-New Features
-------------
-http://issues.apache.org/jira/browse/QPID-13 - Add option to include prefix and suffix in log file name for broker
-http://issues.apache.org/jira/browse/QPID-23 - Extend JNDI support provided to include initial context factory
-http://issues.apache.org/jira/browse/QPID-29 - Provide support for using Qpid JMX with Tivoli for application monitoring
-http://issues.apache.org/jira/browse/QPID-30 - Allow configuration of working/log directories written to by broker
-http://issues.apache.org/jira/browse/QPID-40 - Implement tx.select, tx.commit & tx.rollback from AMQP
-
-            
-Tasks
------
-http://issues.apache.org/jira/browse/QPID-18 - Update Java client and broker to MINA 1.0 release
-http://issues.apache.org/jira/browse/QPID-73 - Create Build Artifacts for release process using ant/maven
-http://issues.apache.org/jira/browse/QPID-74 - Create source distribtuion using build system
-http://issues.apache.org/jira/browse/QPID-75 - Create Standard Binary distribution using build system
-
-
+Here is a filtered list for your convinience
+---------------------------------------
+New Feature	QPID-274 	add connection configuratble timeout on waituntilStateHasChanged
+New Feature	QPID-156 	Implement persistence to disk for Qpid
+New Feature	QPID-155 	Add ability to configure (on/off) queue creation on demand
+New Feature	QPID-43 	Multiple-AMQP version support in the broker
+New Feature	QPID-28 	Allow user to select policy for undeliverable message handling
+New Feature	QPID-27 	Introduce user configurable redlivery delay
+New Feature	QPID-22 	Provide run scripts for clustered broker
 
+Improvement	QPID-430 	Message Age Alerting should not depend upon queue activity
+Improvement	QPID-19 	Add protocol logging capability to client and broker
+Improvement	QPID-11 	Move protocol literals from code to AMQConstant
 
+Bug		QPID-539 	HeadersExchange doesnot correctly implement isBound
+Bug		QPID-517 	Broker doesn't return NO_CONSUMERS code for an immediate message, when the consumer is disconnected.
+Bug		QPID-469 	Redelivered information is currently recorded per message it should be per message per queue.
+Bug		QPID-463 	Java client doesn't close connection gracefully when faced with broker with unsuported protocol version
+Bug		QPID-462 	Exclusive queues and with subscription that 'filtersMessages' will build up messages it doesn't hasInterest() in.
 
+Bug		QPID-397 	Client closeure can be processed before final message ack.
+Bug		QPID-396 	Broker OutOfMemory Error handling
+Bug		QPID-377 	NumberFormatException thrown by broker when running one performance test
+Bug		QPID-293 	setting MessageListener after connection has started can cause messages to be "lost" on a internal delivery queue.
 
+Bug		QPID-185 	Amend Java Broker handling of ifUnused & ifEmpty flags
+Bug		QPID-168 	qpid-server.bat needs updated to support same arguments/features as qpid-server (via qpid-run) bash script
 
 
+M2 Tasks Completed
+-------------------
 
+The set of JIRA tasks completed as part of the M2 effort is available at:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310520&styleName=Html&version=12312116
+
+
+Here is a filtered (by Java components) version of the JIRA items
+
+Task		QPID-190 	refactoring the java broker mbean classes
+Task		QPID-125 	Moving eclipse plugin for broker management to Maven
+Task		QPID-93 	Delete the old management modules (trunk\qpid\java\management)
+
+New Feature	QPID-428 	Add login functionality for a qpid server from the management console
+New Feature	QPID-418 	Add ability to save user preferences to Java Management Console
+New Feature	QPID-170 	Enhance Management features to support moving a message from one queue to another
+
+Improvement	QPID-482 	[Java] Small performance tweaks
+Improvement	QPID-466 	Create STRICT_AMQP System property to disable JMS extensions in Java client
+Improvement	QPID-453 	AMQShortString should implement Comparable
+Improvement	QPID-422 	Consolidate notification view to display all user configured notifications on one view
+Improvement	QPID-421 	Provide enumerated description for static constants including delivery mode
+Improvement	QPID-420 	Add client id to information displayed about connections on management console
+Improvement	QPID-419 	Introduce read-only and modify authorisation for all objects in a virtual host
+Improvement	QPID-129 	improving Broker MBeans
+
+Bug		QPID-540 	Transient Broker throws NullPointerException and locks up.
+Bug		QPID-538 	[Memory Leak] Connecting lots of consumers causes the broker memory to leak
+Bug		QPID-537 	Make AMQMessage.incrementReference public
+Bug		QPID-531 	[Memory Leak] Broker retains messages that are consumed with NO_ACK
+Bug		QPID-527 	encoding issue
+Bug		QPID-508 	[Memory Leak] Broker does not return mandatory messages sent outside of a transaction.
+Bug		QPID-476 	AMQProtocolSession channelId2SessionMap does not have sessions removed
+Bug		QPID-472 	Creation of TemporaryQueues will not guarantee unqiue queue names if created rapidly.
+Bug		QPID-471 	UserManagement panel lists all users but only after a View Users has been executed and is not updated on Create/Delete User
+
+Bug		QPID-467 	Complete Interop Testing
+Bug		QPID-465 	Incorrect Exception thrown from send() method.
+Bug		QPID-459 	Broker doesn't correctly handle noLocal consumers when messages are pre-exisiting on queues.
+Bug		QPID-458 	Queue Browsing Broken
+Bug		QPID-454 	Message 'taken' notion is per message. But should be per message per queue
+Bug		QPID-443 	Abruptly disconnecting client on transaction publish causes error
+Bug		QPID-440 	Can create dangling transactions on unroutable messages.
+Bug		QPID-436 	topic exchange doesn't obey the mandatory flag
+Bug		QPID-414 	Authentication requires plain text passwords in password file
+Bug		QPID-408 	Queue Depth data incorrect
+Bug		QPID-290 	Java broker does not honor maximum number of channels threshold
+Bug		QPID-276 	Potential race condition in AMQChannel
+Bug		QPID-200 	set/get Destination not implemented in JMSMessage impl
+Bug		QPID-166 	Check for pre conditions to satisfy JMS spec requirments
+Bug		QPID-162 	over 600 warnings when building under Eclipse
+Bug		QPID-159 	The following Interface implementations do not throw Exceptions as required by the spec
diff --git a/java/release-docs/RELEASE_NOTES_M1.txt b/java/release-docs/RELEASE_NOTES_M1.txt
new file mode 100644
index 0000000000..638f4c6f61
--- /dev/null
+++ b/java/release-docs/RELEASE_NOTES_M1.txt
@@ -0,0 +1,74 @@
+Apache Incubator Qpid Java M1 Release Notes
+-------------------------------------------
+
+The Qpid M1 release is intended to serve as a useful baseline release
+for the project, allowing interested users to use the current featureset.
+
+For full details of Qpid capabilities, as they currently stand, see our
+detailed project documentation at:
+
+http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation
+
+From the link above you can access our Getting Started Guide, FAQ, Build How To
+and detailed developer documentation.
+
+
+Known Issues/OUtstanding Work
+-----------------------------
+
+You can view the outstanding task list for Qpid by visiting our JIRA:
+
+http://issues.apache.org/jira/browse/QPID
+
+
+M1 Tasks Completed
+-------------------
+
+The set of JIRA tasks completed as part of the M1 effort is available at:
+
+http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+M1+Release+Notes
+
+This list is copied below for convenience:
+
+Bugs
+----
+http://issues.apache.org/jira/browse/QPID-4 - Remove '/' and ':' from generated queue names
+http://issues.apache.org/jira/browse/QPID-7 - Occasionally messages are ack'd more than once
+http://issues.apache.org/jira/browse/QPID-10- Broker throughput falls off with transactions
+http://issues.apache.org/jira/browse/QPID-56 - AMQQueueMBean - MessageCount on the management interface is not correct.
+http://issues.apache.org/jira/browse/QPID-58 - Creating a QueueReceiver results in ClassCastException
+http://issues.apache.org/jira/browse/QPID-66 - AMQSession implementation of TopicSession and QueueSession interfaces not JMS compliant
+http://issues.apache.org/jira/browse/QPID-68 - Ant build system fails if the project path contains a space
+http://issues.apache.org/jira/browse/QPID-69 - Race condition in Delivery Manager  
+
+Improvements
+------------
+http://issues.apache.org/jira/browse/QPID-36 - Add high and low watermark to flow control
+http://issues.apache.org/jira/browse/QPID-44 - Add high and low watermark to flow control
+http://issues.apache.org/jira/browse/QPID-57 - AMQQueueMBean - Message header attributes should be sent along with message content.
+
+    
+New Features
+------------
+http://issues.apache.org/jira/browse/QPID-13 - Add option to include prefix and suffix in log file name for broker
+http://issues.apache.org/jira/browse/QPID-23 - Extend JNDI support provided to include initial context factory
+http://issues.apache.org/jira/browse/QPID-29 - Provide support for using Qpid JMX with Tivoli for application monitoring
+http://issues.apache.org/jira/browse/QPID-30 - Allow configuration of working/log directories written to by broker
+http://issues.apache.org/jira/browse/QPID-40 - Implement tx.select, tx.commit & tx.rollback from AMQP
+
+            
+Tasks
+-----
+http://issues.apache.org/jira/browse/QPID-18 - Update Java client and broker to MINA 1.0 release
+http://issues.apache.org/jira/browse/QPID-73 - Create Build Artifacts for release process using ant/maven
+http://issues.apache.org/jira/browse/QPID-74 - Create source distribtuion using build system
+http://issues.apache.org/jira/browse/QPID-75 - Create Standard Binary distribution using build system
+
+
+
+
+
+
+
+
+