qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ai...@apache.org
Subject svn commit: r619823 [1/19] - in /incubator/qpid/branches/thegreatmerge/qpid: ./ cpp/ dotnet/ dotnet/Qpid.Buffer.Tests/Properties/ dotnet/Qpid.Buffer/Properties/ dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/Channel/ dotnet/Qpid.Client.Tests/Common...
Date Fri, 08 Feb 2008 10:10:11 GMT
Author: aidan
Date: Fri Feb  8 02:09:37 2008
New Revision: 619823

URL: http://svn.apache.org/viewvc?rev=619823&view=rev
Log:
The Great Merge(tm), including some or all, but by no means limited too:


Merged revisions 597918,598105,598233,598287,598324,598337,598352,598357,598360,598371,598572,598586,599400,599407,599797,599806,605352,608497,608570,611128,611193,611212,611214,611758,611826,611828,611831,612164-612165,612171,612421,612517,612874-612875,613130,613151,613153,613177,613911,613917,614184,614243,614481-614482,614504,614555,614906-614907,614918-614919,614921-614922,614928,615853,615943,615960,616808-616809 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

................
  r597918 | rgodfrey | 2007-11-24 21:14:14 +0000 (Sat, 24 Nov 2007) | 2 lines
  
  QPID-567 : Add mutliversion support to Qpid/Java.
             
................
  r598105 | rgodfrey | 2007-11-26 01:41:31 +0000 (Mon, 26 Nov 2007) | 4 lines
  
  QPID-567 : Add mutliversion support to Qpid/Java, fixed client support when server returns Protocol header.
             Added QueueUnbind
             Added ability to select protocol version in ConnectionURL or with -Dorg.apache.qpid.amqp_version
             
................
  r598233 | rupertlssmith | 2007-11-26 11:38:27 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Updated test framework to seperate JMS and AMQP specific test cases. Added configurable test decorators so that in vm connection can be injected at run time.
................
  r598287 | rupertlssmith | 2007-11-26 14:28:46 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Added tk test runner invocation to run framework tests on every build.
................
  r598324 | ritchiem | 2007-11-26 15:57:46 +0000 (Mon, 26 Nov 2007) | 3 lines
  
  QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564
................
  r598337 | ritchiem | 2007-11-26 16:33:06 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Last commit accidentally caught my failover change that wasn't complete.
................
  r598352 | rupertlssmith | 2007-11-26 17:17:48 +0000 (Mon, 26 Nov 2007) | 1 line
  
  May have broken build with tktest plugin mojo, commented out until fixed.
................
  r598357 | rupertlssmith | 2007-11-26 17:33:14 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Fixed broken plugin.
................
  r598360 | ritchiem | 2007-11-26 17:49:05 +0000 (Mon, 26 Nov 2007) | 1 line
  
  QPID-690 : Missing Test and code update.
................
  r598371 | ritchiem | 2007-11-26 18:17:12 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Qpid-559 : OSGi Patch Provided by Aidan Skinner 
................
  r598572 | ritchiem | 2007-11-27 09:44:28 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Add Target to ignores list.
................
  r598586 | rupertlssmith | 2007-11-27 10:51:29 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Now outputs test results in xml format to the surefire reports directory.
................
  r599400 | rupertlssmith | 2007-11-29 12:07:25 +0000 (Thu, 29 Nov 2007) | 1 line
  
  Changed in vm broker creation so that it is an injected set task. This means the in vm broker is created on every test. Threaded tests can optionally do it on a per-thread basis instead using this approach.
................
  r599407 | rupertlssmith | 2007-11-29 12:16:03 +0000 (Thu, 29 Nov 2007) | 1 line
  
  Fixed licence headers.
................
  r599797 | rupertlssmith | 2007-11-30 12:26:06 +0000 (Fri, 30 Nov 2007) | 20 lines
  
  Blocked revisions 595695-595696,596351,596363 via svnmerge
  
  ........
    r595695 | rajith | 2007-11-16 15:16:03 +0000 (Fri, 16 Nov 2007) | 2 lines
    
    Creating the tag for M2 release
  ........
    r595696 | rajith | 2007-11-16 15:17:48 +0000 (Fri, 16 Nov 2007) | 1 line
    
    I moved the branch to a tag instead of copying by mistake,I am undoing the mistake by reversing it
  ........
    r596351 | rajith | 2007-11-19 16:17:15 +0000 (Mon, 19 Nov 2007) | 2 lines
    
    Creating a new tag for M2 final release
  ........
    r596363 | rajith | 2007-11-19 16:54:44 +0000 (Mon, 19 Nov 2007) | 1 line
    
    Undoing the accidental move instead of a copy
  ........
................
  r599806 | rupertlssmith | 2007-11-30 12:49:02 +0000 (Fri, 30 Nov 2007) | 54 lines
  
  Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
  
  ........
    r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line
    
    QPID-685 : Update to address dependency issues and update the NOTICE file.
  ........
    r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line
    
    moved the keys file to the parent folder
  ........
    r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line
    
    removed the KEYS file, as now it is in the parent folder
  ........
    r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line
    
    Fixed runtime dependency in the management console.
  ........
    r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line
    
    added eclipse license details to the NOTICE file
  ........
    r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line
    
    Added the full text of the additional licenses.
  ........
    r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines
    
    Added the full text of the additional licenses.
    Moved ICU licence text from NOTICE to LICENSE
  ........
    r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines
    
    Added boost license
  ........
    r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line
    
    Added source links for EPL and MPL libraries
  ........
    r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line
    
    Added incubator disclaimer.
  ........
    r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line
    
    Added AMQP licence information.
  ........
    r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line
    
    added disclaimers and AMP license to all languages
  ........
................
  r605352 | rgodfrey | 2007-12-18 23:00:40 +0000 (Tue, 18 Dec 2007) | 1 line
  
  QPID-711 : create a QueueEntry class and move message-on-queue functions (such as taken()) to this class
................
  r608497 | rgodfrey | 2008-01-03 14:24:34 +0000 (Thu, 03 Jan 2008) | 2 lines
  
  QPID-716 : pass in generated Queue Name
................
  r608570 | rgodfrey | 2008-01-03 17:29:02 +0000 (Thu, 03 Jan 2008) | 1 line
  
  QPID-718 : NPE when binding queue with null routing key
................
  r611128 | ritchiem | 2008-01-11 10:00:36 +0000 (Fri, 11 Jan 2008) | 1 line
  
  QPID-723 : Added exec to command line.
................
  r611193 | ritchiem | 2008-01-11 14:48:39 +0000 (Fri, 11 Jan 2008) | 1 line
  
  Quick scripts to run performance tests.
................
  r611212 | rupertlssmith | 2008-01-11 16:02:09 +0000 (Fri, 11 Jan 2008) | 1 line
  
  QPID-734. More TTL tests.
................
  r611214 | rupertlssmith | 2008-01-11 16:03:05 +0000 (Fri, 11 Jan 2008) | 1 line
  
  QPID-733. More fail over tests.
................
  r611758 | rupertlssmith | 2008-01-14 10:50:28 +0000 (Mon, 14 Jan 2008) | 1 line
  
  Qpid-725 missing config file with option for 0.7. Support for 0.7 option has been removed so the config file is no longer needed.
................
  r611826 | rupertlssmith | 2008-01-14 15:06:45 +0000 (Mon, 14 Jan 2008) | 1 line
  
  Qpid-731: Fixed assembly version to reflect M2.1 as 0.2.1. Also subversion revision number gets output into assembly comments during builds.
................
  r611828 | rupertlssmith | 2008-01-14 15:20:52 +0000 (Mon, 14 Jan 2008) | 1 line
  
  Qpid-731: Fixed assembly version to reflect M2.1 as 2.1.0.0.
................
  r611831 | rupertlssmith | 2008-01-14 15:31:35 +0000 (Mon, 14 Jan 2008) | 1 line
  
  Some white space tidying up of the build file.
................
  r612164 | rupertlssmith | 2008-01-15 17:28:33 +0000 (Tue, 15 Jan 2008) | 1 line
  
  Qpid-491 Integration and pure unit test types have been split into seperate modules. Executable for integration style tests not created, and may not be, but seperate target in the nant build has been created, so there is at least a way to run all integration style tests from one place.
................
  r612165 | rupertlssmith | 2008-01-15 17:29:41 +0000 (Tue, 15 Jan 2008) | 1 line
  
  Qpid-491 Integration and pure unit test types have been split into seperate modules. Executable for integration style tests not created, and may not be, but seperate target in the nant build has been created, so there is at least a way to run all integration style tests from one place.
................
  r612171 | rupertlssmith | 2008-01-15 17:37:47 +0000 (Tue, 15 Jan 2008) | 1 line
  
  Qpid-491 Integration and pure unit test types have been split into seperate modules. Executable for integration style tests not created, and may not be, but seperate target in the nant build has been created, so there is at least a way to run all integration style tests from one place.
................
  r612421 | rupertlssmith | 2008-01-16 11:20:38 +0000 (Wed, 16 Jan 2008) | 1 line
  
  Qpid-728 Mandatory message test handles returned messages with no problems.
................
  r612517 | rupertlssmith | 2008-01-16 17:02:05 +0000 (Wed, 16 Jan 2008) | 1 line
  
  Qpid-730 Added a durable subscription test.
................
  r612874 | rupertlssmith | 2008-01-17 17:13:11 +0000 (Thu, 17 Jan 2008) | 1 line
  
  Qpid-9 In preparation for adding missing field types, the test framework from the java is being ported onto the .Net. This will form the basis for writing more interop tests.
................
  r612875 | rupertlssmith | 2008-01-17 17:14:37 +0000 (Thu, 17 Jan 2008) | 1 line
  
  Qpid-9 In preparation for adding missing field types, the test framework from the java is being ported onto the .Net. This will form the basis for writing more interop tests.
................
  r613130 | rupertlssmith | 2008-01-18 10:56:22 +0000 (Fri, 18 Jan 2008) | 1 line
  
  Temporarily removed svn version stamping in assembly info, to avoid excessive check-ins of changed files. Need to implement solution that generates these files from templates instead.
................
  r613151 | ritchiem | 2008-01-18 13:06:19 +0000 (Fri, 18 Jan 2008) | 1 line
  
  QPID-576 : Added the Point2Point and Request/Response examples that do not use extends.
................
  r613153 | ritchiem | 2008-01-18 13:13:35 +0000 (Fri, 18 Jan 2008) | 1 line
  
  QPID-746 : Used the parameter pased to setRedelivered() : fixed as per JIRA
................
  r613177 | rupertlssmith | 2008-01-18 14:38:35 +0000 (Fri, 18 Jan 2008) | 1 line
  
  Qpid-9 In preparation for adding missing field types, the test framework from the java is being ported onto the .Net. This will form the basis for writing more interop tests.
................
  r613911 | rupertlssmith | 2008-01-21 14:53:17 +0000 (Mon, 21 Jan 2008) | 1 line
  
  Qpid-727. Added closeable interface to connections, channels, producers and consumers. Previously there was no way to close these things in their interfaces.
................
  r613917 | rupertlssmith | 2008-01-21 15:40:48 +0000 (Mon, 21 Jan 2008) | 1 line
  
  Qpid-727. Further test rationalization; pushed cut and paste code up into base case.
................
  r614184 | rupertlssmith | 2008-01-22 11:54:54 +0000 (Tue, 22 Jan 2008) | 1 line
  
  Qpid-730. Removed durable and subscription name from consumer builder, as they are not to do with consume but queue declaration. Durable subscribers must provide their own fixed queue names.
................
  r614243 | rupertlssmith | 2008-01-22 16:28:59 +0000 (Tue, 22 Jan 2008) | 1 line
  
  Qpid-755, Test reordered to actually test subscription durability.
................
  r614481 | rupertlssmith | 2008-01-23 10:21:10 +0000 (Wed, 23 Jan 2008) | 1 line
  
  Qpid-755, Added session per connection variant to test, to check that durable subscription can be picked up by a fresh connection.
................
  r614482 | rupertlssmith | 2008-01-23 10:24:30 +0000 (Wed, 23 Jan 2008) | 1 line
  
  Qpid-755, Corrected license header.
................
  r614504 | rupertlssmith | 2008-01-23 11:45:13 +0000 (Wed, 23 Jan 2008) | 1 line
  
  Qpid-756, client id is now set.
................
  r614555 | ritchiem | 2008-01-23 15:00:58 +0000 (Wed, 23 Jan 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-597917" from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1
................
  r614906 | aidan | 2008-01-24 15:43:23 +0000 (Thu, 24 Jan 2008) | 89 lines
  
  Merged revisions 598285,598619,598721,598834-598835,599375,599531,599533,599572,599805,602134,604151,604928,605536,605542,606015-606016 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1
  
  ........
    r598285 | ritchiem | 2007-11-26 14:16:01 +0000 (Mon, 26 Nov 2007) | 3 lines
    
    QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564
  ........
    r598619 | ritchiem | 2007-11-27 12:51:14 +0000 (Tue, 27 Nov 2007) | 1 line
    
    Renamed POMs to M2.1.1 Removed erroneous equals() in SpecificMethodFrameListenerTest
  ........
    r598721 | ritchiem | 2007-11-27 18:09:33 +0000 (Tue, 27 Nov 2007) | 1 line
    
    QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is closed.
  ........
    r598834 | ritchiem | 2007-11-28 00:45:32 +0000 (Wed, 28 Nov 2007) | 14 lines
    
    QPID-679 : Patch provided by Aidan Skinner and additional from odd problems during test runs.
    AMQChannel - Catch and log AMQException occuring when requeue()-ing. Previously exceptions wouldn't be caught at all. The requeue() is called during closure so there is nothing we can do protocol wise on error other than log the issue and continue with any other shutdown that is needed.
    AMQMinaProtocolSession & AMQPFastProtocolHandler . Additions to catch and log AMQExceptions. Changes to AMQMinaProtocolSession were done to ignore all input on a closing session other than the close-ok. Previously only Protocol frames were ignored this resulted in Content*Body-s still being processed. Additional checks were made for the MessageStoreClosedException to log and continue. As said else were we need to seperate protocol exceptoions(AMQException) from internal code exception handling. Further All AMQExceptions occuring in the frameReceived method are now caught and logged. Allowing them to propogate higher will only result in thread death.
    AMQPFastProtocolHandler Caught AMQExceptions occuring whilst closing the session. Again allowing these to continue will result in thread death. There is not a lot that can be done other than log the problem as the session is already closed by this point. Prevented the stacktrace associated with a session exception being printed in the exceptionCaught method when the problem was an IO Exception. This doesn't add anything useful and only adds to the log file sizes.
    ApplicationRegistry - Added removeAll option which ensures that all ARs are correctly purged so that we can attempt to clean up between Unit Tests.
    MemoryMessageStore - This was causing us real problems during the failover testing. Similar checks should probably be made to any other Message Store Impl. The issue was that when shutting down the broker the MS.close() method is called this sets all the storage to null. However, there may still be message processing going on as the close() does not attempt to stop connection processing. Hence we now check to see if the Store is close throwing a MSClosedException if required. This prevents NPEs that have been seen during Unit failover testing. In fact the close() is called as a request to shutdown the ApplicationRegistry, but this only occurs from tests and broker shutdown, no attempt to unbind or prevent further connections during this period is yet done.
    
    CLIENT CHANGES
    AMQConnection - Added method to check if failover is in progress.
    AMQClient - Upgraded acknowledge() exception to JMSException for errors due to failover. Also , added call to update consumers as a result of failover.
    BasicMessageConsumer - Changes to acquireReceiving to take in to consideration blocking for failover to occur. wrt receiveNoWait.. which previously blocked for failover to complete... not exactly noWait. acknowledge will now
    TransportConnection - Update to ensure all inVM brokers are correctly killed.
    
    FailoverTest - QPID-679 - Finder of all the above problems.
  ........
    r598835 | ritchiem | 2007-11-28 01:01:05 +0000 (Wed, 28 Nov 2007) | 1 line
    
    CommitRollbackTest - this one just was never right.. now we have something better.
  ........
    r599375 | ritchiem | 2007-11-29 10:58:08 +0000 (Thu, 29 Nov 2007) | 1 line
    
    Update to broker to address fanout python failure.
  ........
    r599531 | ritchiem | 2007-11-29 17:56:12 +0000 (Thu, 29 Nov 2007) | 1 line
    
    QPID-92 QPID-564 Forgot to upgrade mina to 1.0.1
  ........
    r599533 | ritchiem | 2007-11-29 18:25:21 +0000 (Thu, 29 Nov 2007) | 1 line
    
    QPID-564 QPID-92 Tidied up a few points and fixed infinite loop in Read IO Thread
  ........
    r599572 | ritchiem | 2007-11-29 20:56:22 +0000 (Thu, 29 Nov 2007) | 2 lines
    
    Mina Fix: Vm Pipe Starts Connection session before acceptor session. This results in protocol frames arriving before the protocol decoder has been configured on the InVM Broker. Verification of this could be done by adding a client side filter that delays the first message by a few seconds.
  ........
    r599805 | ritchiem | 2007-11-30 12:47:08 +0000 (Fri, 30 Nov 2007) | 1 line
    
    Added new simple Request/Repsonse code as my last commit here seems to have missed the actual code.
  ........
    r602134 | rupertlssmith | 2007-12-07 16:00:14 +0000 (Fri, 07 Dec 2007) | 1 line
    
    Added JDNI config for two broker, failover setup for failover tests. Also passed into FT tests config.
  ........
    r604151 | ritchiem | 2007-12-14 10:40:37 +0000 (Fri, 14 Dec 2007) | 2 lines
    
    QPID-707 : Added new test to check message count on broker as messages are consumed to ensure that an ack is sent at 5000 mgs. Added acks on message consumer closure.
    Augmented VMTestCase to have helper methods for accessing broker statistics.
  ........
    r604928 | rupertlssmith | 2007-12-17 17:00:10 +0000 (Mon, 17 Dec 2007) | 1 line
    
    DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test.
  ........
    r605536 | rupertlssmith | 2007-12-19 13:40:05 +0000 (Wed, 19 Dec 2007) | 1 line
    
    Messages were being sent mandatory by default, set to false.
  ........
    r605542 | rupertlssmith | 2007-12-19 13:53:44 +0000 (Wed, 19 Dec 2007) | 1 line
    
    Changed test configs to use colons instead of commas.
  ........
    r606015 | rgodfrey | 2007-12-20 20:08:01 +0000 (Thu, 20 Dec 2007) | 2 lines
    
    QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers
    Ack each individual message on commit, not use multiple acks
  ........
    r606016 | rgodfrey | 2007-12-20 20:12:25 +0000 (Thu, 20 Dec 2007) | 2 lines
    
    QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers
    Ack each individual message on commit, not use multiple acks
  ........
................
  r614907 | aidan | 2008-01-24 15:53:00 +0000 (Thu, 24 Jan 2008) | 187 lines
  
  Blocked revisions 598261,598321-598322,598328-598329,598363,599036,599066,599809,599814,602066,602082,605217 via svnmerge
  
  ................
    r598261 | ritchiem | 2007-11-26 13:09:12 +0000 (Mon, 26 Nov 2007) | 1 line
    
    Branch to test additional new without Multi Version Support.
  ................
    r598321 | ritchiem | 2007-11-26 15:53:20 +0000 (Mon, 26 Nov 2007) | 3 lines
    
    Initialized merge tracking via "svnmerge" with revisions "1-597918" from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
  ................
    r598322 | ritchiem | 2007-11-26 15:56:24 +0000 (Mon, 26 Nov 2007) | 11 lines
    
    Blocked revisions 598105 via svnmerge
    
    ........
      r598105 | rgodfrey | 2007-11-26 01:41:31 +0000 (Mon, 26 Nov 2007) | 4 lines
      
      QPID-567 : Add mutliversion support to Qpid/Java, fixed client support when server returns Protocol header.
                 Added QueueUnbind
                 Added ability to select protocol version in ConnectionURL or with -Dorg.apache.qpid.amqp_version
                 
    ........
  ................
    r598328 | ritchiem | 2007-11-26 16:09:16 +0000 (Mon, 26 Nov 2007) | 13 lines
    
    Merged revisions 597919-598104,598106-598323 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r598233 | rupertlssmith | 2007-11-26 11:38:27 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Updated test framework to seperate JMS and AMQP specific test cases. Added configurable test decorators so that in vm connection can be injected at run time.
    ........
      r598287 | rupertlssmith | 2007-11-26 14:28:46 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Added tk test runner invocation to run framework tests on every build.
    ........
  ................
    r598329 | ritchiem | 2007-11-26 16:12:13 +0000 (Mon, 26 Nov 2007) | 8 lines
    
    Blocked revisions 598324 via svnmerge
    
    ........
      r598324 | ritchiem | 2007-11-26 15:57:46 +0000 (Mon, 26 Nov 2007) | 3 lines
      
      QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564
    ........
  ................
    r598363 | ritchiem | 2007-11-26 18:03:37 +0000 (Mon, 26 Nov 2007) | 21 lines
    
    Merged revisions 598106-598232,598234-598286,598288-598323,598325-598361 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r598337 | ritchiem | 2007-11-26 16:33:06 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Last commit accidentally caught my failover change that wasn't complete.
    ........
      r598352 | rupertlssmith | 2007-11-26 17:17:48 +0000 (Mon, 26 Nov 2007) | 1 line
      
      May have broken build with tktest plugin mojo, commented out until fixed.
    ........
      r598357 | rupertlssmith | 2007-11-26 17:33:14 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Fixed broken plugin.
    ........
      r598360 | ritchiem | 2007-11-26 17:49:05 +0000 (Mon, 26 Nov 2007) | 1 line
      
      QPID-690 : Missing Test and code update.
    ........
  ................
    r599036 | rupertlssmith | 2007-11-28 15:52:11 +0000 (Wed, 28 Nov 2007) | 17 lines
    
    Merged revisions 598371-598586 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r598371 | ritchiem | 2007-11-26 18:17:12 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Qpid-559 : OSGi Patch Provided by Aidan Skinner 
    ........
      r598572 | ritchiem | 2007-11-27 09:44:28 +0000 (Tue, 27 Nov 2007) | 1 line
      
      Add Target to ignores list.
    ........
      r598586 | rupertlssmith | 2007-11-27 10:51:29 +0000 (Tue, 27 Nov 2007) | 1 line
      
      Now outputs test results in xml format to the surefire reports directory.
    ........
  ................
    r599066 | rupertlssmith | 2007-11-28 17:08:05 +0000 (Wed, 28 Nov 2007) | 1 line
    
    Updated pom to correct version.
  ................
    r599809 | rupertlssmith | 2007-11-30 12:52:39 +0000 (Fri, 30 Nov 2007) | 20 lines
    
    Blocked revisions 595695-595696,596351,596363 via svnmerge
    
    ........
      r595695 | rajith | 2007-11-16 15:16:03 +0000 (Fri, 16 Nov 2007) | 2 lines
      
      Creating the tag for M2 release
    ........
      r595696 | rajith | 2007-11-16 15:17:48 +0000 (Fri, 16 Nov 2007) | 1 line
      
      I moved the branch to a tag instead of copying by mistake,I am undoing the mistake by reversing it
    ........
      r596351 | rajith | 2007-11-19 16:17:15 +0000 (Mon, 19 Nov 2007) | 2 lines
      
      Creating a new tag for M2 final release
    ........
      r596363 | rajith | 2007-11-19 16:54:44 +0000 (Mon, 19 Nov 2007) | 1 line
      
      Undoing the accidental move instead of a copy
    ........
  ................
    r599814 | rupertlssmith | 2007-11-30 13:10:09 +0000 (Fri, 30 Nov 2007) | 54 lines
    
    Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
    
    ........
      r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line
      
      QPID-685 : Update to address dependency issues and update the NOTICE file.
    ........
      r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line
      
      moved the keys file to the parent folder
    ........
      r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line
      
      removed the KEYS file, as now it is in the parent folder
    ........
      r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line
      
      Fixed runtime dependency in the management console.
    ........
      r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line
      
      added eclipse license details to the NOTICE file
    ........
      r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line
      
      Added the full text of the additional licenses.
    ........
      r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines
      
      Added the full text of the additional licenses.
      Moved ICU licence text from NOTICE to LICENSE
    ........
      r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines
      
      Added boost license
    ........
      r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line
      
      Added source links for EPL and MPL libraries
    ........
      r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Added incubator disclaimer.
    ........
      r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line
      
      Added AMQP licence information.
    ........
      r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line
      
      added disclaimers and AMP license to all languages
    ........
  ................
    r602066 | ritchiem | 2007-12-07 10:50:41 +0000 (Fri, 07 Dec 2007) | 1 line
    
    Removed JMSXUserID as it appears the new mina is conflicting.
  ................
    r602082 | ritchiem | 2007-12-07 12:26:22 +0000 (Fri, 07 Dec 2007) | 1 line
    
    Update to disable ProtectIO by default.
  ................
    r605217 | rupertlssmith | 2007-12-18 14:52:25 +0000 (Tue, 18 Dec 2007) | 1 line
    
    Multi threaded io commented out until all issues with it are resolved.
  ................
................
  r614918 | rupertlssmith | 2008-01-24 16:32:53 +0000 (Thu, 24 Jan 2008) | 1 line
  
  Qpid-727, Commit rollback test adjusted as some tests were wrong. Now passes.
................
  r614919 | rupertlssmith | 2008-01-24 16:34:10 +0000 (Thu, 24 Jan 2008) | 1 line
  
  Qpid-727, Improved trace level logging.
................
  r614921 | rupertlssmith | 2008-01-24 16:44:37 +0000 (Thu, 24 Jan 2008) | 1 line
  
  Dropped test, as it does not do anything that other tests already do, particularly the ProducerMultiConsumer test.
................
  r614922 | rupertlssmith | 2008-01-24 16:51:25 +0000 (Thu, 24 Jan 2008) | 1 line
  
  Qpid-728, Set default of true for mandatory flag, as this is how it was previously. It was disabled because of this error handling bug, as a work around.
................
  r614928 | rupertlssmith | 2008-01-24 17:20:45 +0000 (Thu, 24 Jan 2008) | 1 line
  
  Qpid-726, Updated this test as it exhibits the behaviour described, of each channel only receiving one message.
................
  r615853 | rupertlssmith | 2008-01-28 11:13:47 +0000 (Mon, 28 Jan 2008) | 1 line
  
  QPID-763 : Created test case for this bug.
................
  r615943 | aidan | 2008-01-28 16:48:00 +0000 (Mon, 28 Jan 2008) | 30 lines
  
  Merged revisions 608477,609961,610475,610479,610806,611146 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
  
  ........
    r608477 | rgodfrey | 2008-01-03 13:23:04 +0000 (Thu, 03 Jan 2008) | 1 line
    
    QPID-499 : Added per-virtual host timed tasks to inspect queues (with no consumers) for expired messages
  ........
    r609961 | ritchiem | 2008-01-08 12:59:01 +0000 (Tue, 08 Jan 2008) | 2 lines
    
    QPID-499 : Patch to update the queue size statistics when the Active TTL process runs 
    Removed old single commented out code line from AMQSession.
  ........
    r610475 | ritchiem | 2008-01-09 17:32:43 +0000 (Wed, 09 Jan 2008) | 1 line
    
    Qpid-723 Added exec to qpid.start
  ........
    r610479 | ritchiem | 2008-01-09 17:39:54 +0000 (Wed, 09 Jan 2008) | 1 line
    
    Qpid-690 : Provide configurable delay between re-connecion attempts.
  ........
    r610806 | ritchiem | 2008-01-10 14:41:37 +0000 (Thu, 10 Jan 2008) | 1 line
    
    QPID-690 : Relaxed the timings on failover as Thread.sleep is accurate to 10ms so may finish the sleep 10ms early. Resulting in erratic failures as 9.9s < 10s.
  ........
    r611146 | ritchiem | 2008-01-11 11:33:31 +0000 (Fri, 11 Jan 2008) | 1 line
    
    Patch by Aidan Skinner to make third constructor public. This is done so that the BDBMessageStore tests can still run with the addition of the VirtualHost reaper thread.
  ........
................
  r615960 | rupertlssmith | 2008-01-28 17:22:09 +0000 (Mon, 28 Jan 2008) | 1 line
  
  QPID-763 : Client was not setting prefetch count and size the wrong way around. Also, size was too small to let messages through, as was set to 1. Messages now getting through.
................
  r616808 | aidan | 2008-01-30 16:35:30 +0000 (Wed, 30 Jan 2008) | 1 line
  
  QPID-766: shorten delay
................
  r616809 | aidan | 2008-01-30 16:37:06 +0000 (Wed, 30 Jan 2008) | 1 line
  
  QPID-766: shorten delay
................

Added:
    incubator/qpid/branches/thegreatmerge/qpid/KEYS
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/KEYS
    incubator/qpid/branches/thegreatmerge/qpid/cpp/DISCLAIMER
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/cpp/DISCLAIMER
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/DISCLAIMER
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/DISCLAIMER
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/Properties/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/Properties/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/README.txt
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/README.txt
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/default.build
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/default.build
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/README.txt
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/README.txt
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/alljava.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/alljava.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/clocksynch/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/localcircuit/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/sequencers/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interactive/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interactive/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/TestCases/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/log4net.config
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/log4net.config
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/old/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/old/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/
      - copied from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/ICloseable.cs
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/dotnet/Qpid.Messaging/ICloseable.cs
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/
      - copied from r616809, incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/
      - copied from r616809, incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/plugins/
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java   (with props)
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
      - copied, changed from r616809, incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/build.out
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/filter/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/codec/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/filter/codec/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/transport/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/transport/socket/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/transport/socket/nio/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/mina/transport/vmpipe/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/mina/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/mina/SocketIOTest/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/MethodBodyInterface.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/version/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/templates/method/version/
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodDispatcherInterface.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodRegistryClass.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ProtocolVersionListClass.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/
      - copied from r616809, incubator/qpid/branches/M2.1/java/common/templates/model/version/
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/jndi/failovertest.properties
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Connections.sh   (with props)
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/JobQueue.sh   (with props)
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Latency.sh   (with props)
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Reliability.sh   (with props)
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Throughput.sh   (with props)
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/src/main/java/org/apache/qpid/test/
      - copied from r616809, incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/test/
    incubator/qpid/branches/thegreatmerge/qpid/java/perftests/src/main/java/org/apache/qpid/test/testcases/
      - copied from r616809, incubator/qpid/branches/M2.1/java/perftests/src/main/java/org/apache/qpid/test/testcases/
    incubator/qpid/branches/thegreatmerge/qpid/java/plugins/src/main/java/org/apache/qpid/extras/
      - copied from r616809, incubator/qpid/branches/M2.1/java/plugins/src/main/java/org/apache/qpid/extras/
    incubator/qpid/branches/thegreatmerge/qpid/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/
      - copied from r616809, incubator/qpid/branches/M2.1/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/
    incubator/qpid/branches/thegreatmerge/qpid/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/
      - copied from r616809, incubator/qpid/branches/M2.1/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/
    incubator/qpid/branches/thegreatmerge/qpid/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/
      - copied from r616809, incubator/qpid/branches/M2.1/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/
      - copied from r616809, incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/failover/
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/
      - copied from r616809, incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/plugins/
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/
      - copied from r616809, incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/failover/
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/
      - copied from r616809, incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/
      - copied from r616809, incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/testcases/
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
    incubator/qpid/branches/thegreatmerge/qpid/python/DISCLAIMER
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/python/DISCLAIMER
    incubator/qpid/branches/thegreatmerge/qpid/ruby/DISCLAIMER
      - copied unchanged from r616809, incubator/qpid/branches/M2.1/ruby/DISCLAIMER
Removed:
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/Common/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/connection/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/failover/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/requestreply1/
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/undeliverable/
    incubator/qpid/branches/thegreatmerge/qpid/java/KEYS
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/MethodConverter_8_0.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/MethodBodyClass.tmpl
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/AmqpConstantsClass.tmpl
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodRegistryClass.tmpl
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ProtocolVersionListClass.tmpl
    incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
Modified:
    incubator/qpid/branches/thegreatmerge/qpid/   (props changed)
    incubator/qpid/branches/thegreatmerge/qpid/cpp/LICENSE
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Tests/default.build
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/Closeable.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IChannel.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IConnection.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Program.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/TestClient/default.build
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
    incubator/qpid/branches/thegreatmerge/qpid/dotnet/default.build
    incubator/qpid/branches/thegreatmerge/qpid/gentools/build.xml
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
    incubator/qpid/branches/thegreatmerge/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/bin/qpid.start
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/config.xml
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/pom.xml
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/python-test.xml
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestNameExchange.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DestWildExchange.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java   (contents, props changed)
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ExchangeInitialiser.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DeliveryManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DistributedTransactionalContext.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/EnqueueRecord.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NonTransactionalContext.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TransactionalContext.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/util/NullApplicationRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/pom.xml
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_8.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
    incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/ClientHandlerRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/pom.xml
    incubator/qpid/branches/thegreatmerge/qpid/java/common/protocol-version.xml
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/version/MethodBodyClass.vm
    incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/AmqpConstantsClass.vm

[... 70 lines stripped ...]


Mime
View raw message