Author: aidan Date: Thu Jan 24 07:53:00 2008 New Revision: 614907 URL: http://svn.apache.org/viewvc?rev=614907&view=rev Log: 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. ................ Modified: incubator/qpid/branches/M2.1/ (props changed) Propchange: incubator/qpid/branches/M2.1/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
