Merged revisions 1-447993,447995-448007,448009-448141,448143-448157,448161-448194,448196-448210,448212-448218,448220-448223,448225-448233,448235,448237-448241,448243-448596,448598-448623,448625-448850,448852-448880,448882-448982,448984-449635,449637-449639,449641-449642,449644-449645,449647-449674,449676-449719,449721-449749,449751-449762,449764-449933,449935-449941,449943-450383,450385,450387-450400,450402-450433,450435-450503,450505-450555,450557-450860,450862-451024,451026-451149,451151-451316,451318-451931,451933-452139,452141-452162,452164-452320,452322,452324-452325,452327-452333,452335-452429,452431-452528,452530-452545,452547-453192,453194-453195,453197-453536,453538,453540-453656,453658-454676,454678-454735,454737,454739-454781,454783-462728,462730-462819,462821-462833,462835-462839,462841-463071,463073-463178,463180-463308,463310-463362,463364-463375,463377-463396,463398-463402,463404-463409,463411-463661,463663-463670,463672-463673,463675-464493,464495-464502,464504-464576,464578-464613,464615-464628,464630,464632-464866,464868-464899,464901-464942,464944-464949,464951-465004,465006-465016,465018-465053,465055-465165,465167-465321,465323-465406,465408-465427,465429-465431,465433-465548,465550-466044,466047-466075,466077,466079-466081,466083-466099,466101-466112,466114-466126,466128-466240,466242-466971,466973-466978,466980-467309,467311-467312,467316-467328,467330-467485,467487-467588,467590-467604,467606-467699,467701-467706,467708-467749,467751-468069,468071-468537,468539-469241,469244-469246,469248-469318,469320-469421,469423,469425-469429,469431-469435,469437-469462,469464-469469,469472-469477,469479-469490,469492-469503,469505-469529,469531-469598,469600-469624,469626-469737,469739-469752,469754-469806,469808-469928,469930-469953,469955-470011,470013-470109,470111-470335,470338-470339,470341-470379,470381,470383-470399,470401-470446,470448-470741,470743-470758,470760-470809,470811-470817,470819-470993,470995-471001,471003-471788,471790-471792,471794-472028,472030-472032,472034-472036,472038,472040,472043,472045-472059,472061,472063,472065-472066,472068,472070-472072,472074-472080,472082,472084-472092,472094-472107,472109-472123,472125-472158,472160-472165,472167-472172,472174-472457,472459-472460,472462-472464,472466-472470,472472-472483,472486-472491,472493-472494,472496-472497,472499,472501-472503,472505-472512,472514-472544,472546-472556,472558-472560,472562-472572,472574-472587,472589-472591,472593-472605,472607,472609-472731,472733-472786,472788-472843,472845-472849,472851-472859,472861-472878,472880-472903,472905,472907-472988,472990-472991,472993-473071,473073-473086,473088-473090,473093,473095-473096,473098-473106,473108-473110,473112-473185,473187-473260,473262,473268-473270,473275-473279,473281,473284-473287,473289-473295,473297-473306,473308-473330,473332-473335,473337,473339-473344,473346-473351,473353-473355,473357-473358,473361-473471,473473-473497,473499-473535,473537-473567,473569-473888,473890-474451,474454-474492,474494-474563,474565-474843,474845-474865,474867-474932,474934-475035,475037-475144,475146-475180,475182-475265,475267-475285,475287,475289-475293,475295-475296,475298-475302,475304-475631,475633-475649,475651-475748,475750-475752,475754-476107,476109-476302,476304-476413,476415-476430,476432-476700,476702-476868,476870-477147,477149-477213,477215-477263,477265-477340,477342-477635,477637-477789,477791-477825,477827-477841,477843,477846-477852,477854,477856,477858-477865,477867-477894,477896-478022,478024-478182,478184-478211,478213-478233,478235-478236,478238-478241,478243-478252,478254-478259,478261-478263,478265,478267-478269,478271-478286,478288-478342,478344-478379,478381-478412,478414-478443,478445-478636,478639-478658,478660-478821,478823-478853,478855-478922,478924-478962,478965-478974,478976-479029,479031-479049,479051-479210,479212-479214,479216-479407,479409-479415,479417-479425,479427-479559,479561-479639,479641-479676,479678-479685,479687-480030,480033-480086,480091-480093,480095-480118,480120-480139,480141,480143-480148,480150-480156,480158-480163,480165-480177,480179-480189,480191-480193,480195-480198,480200-480220,480222-480282,480284-480292,480294-480308,480310-480317,480320-480422,480424,480426-480581,480583-480656,480658-480692,480695-480702,480704,480706-480710,480712-480910,480913-480933,480935-480945,480947-480972,480974-480993,480995-481034,481036-481158,481161-481174,481176-481220,481222-481234,481236-481260,481263-481264,481266-481296,481298-481304,481306-481311,481313-481332,481334,481336-481380,481382-481441,481443-482144,482146-482180,482182-482193,482195-482232,482234-482236,482239,482241-482242,482244-482247,482250-482251,482253,482256-482261,482264-482288,482290-482364,482366,482368,482370-482554,482556,482558-482569,482572-482636,482638,482640-482696,482698-482722,482724-482732,482734-482771,482774-482957,482959-483045,483047-483105,483108,483110-483115,483117,483119-483127,483130-483134,483136-483148,483150-483158,483160-483164,483166-483178,483180-483391,483393-483400,483402-483403,483405-483418,483420-483421,483425-483436,483438-483470,483472-483502,483504-483558,483560-483599,483601-483637,483639-483644,483646-483659,483661-483670,483672-483878,483880-483910,483912-483915,483917-483940,483942,483944-483968,483970-483972,483974-483976,483978,483980-484612,484614-484657,484659-484693,484695-484718,484720-484842,484844-484847,484849-484986,484988-485019,485021-485489,485491-485544,485546-485591,485593,485595-485697,485699-485729,485731-485734,485736-485779,485781-485787,485789-485851,485853,485855-486007,486009,486011-486020,486022-486083,486085-486097,486099-486117,486120-486131,486133-486148,486150-486161,486163-486164,486166-486197,486199-486205,486208-486247,486249-486253,486256-486427,486429-486431,486433-486554,486556-486573,486575-486593,486595,486597-486609,486611-486619,486622,486625,486627-486641,486643-486645,486649-486687,486689-486721,486723-486730,486732-486746,486748-486759,486761,486763-486777,486779-486782,486784-486788,486790,486792,486794-486796,486798-487175,487178,487180-487213,487215,487217-487267,487269-487284,487286-487298,487300-487358,487360-487367,487369-487382,487384-487434,487436-487480,487482-487547,487549-487561,487563-487565,487567-487578,487580-487615,487617-487622,487624,487626,487628,487630-487635,487637-487703,487705-487777,487780-487781,487783-487800,487802-487803,487805-487820,487822-487848,487850-487902,487904-488103,488105-488133,488135-488158,488160-488163,488165-488187,488189-488216,488218-488248,488250-488278,488280,488282-488303,488305-488313,488315-488342,488344-488351,488353-488376,488378-488449,488451-488593,488595,488597-488623,488625-488700,488702-488704,488706-488710,488714,488716-488725,488727-488744,488746-488770,488772-488798,488800,488802-488807,488809,488811-488829,488831-488843,488845-488851,488853-489069,489071-489077,489079-489081,489084-489102,489104-489105,489107-489109,489111-489112,489114-489139,489141-489178,489181-489203,489205-489211,489213,489216-489329,489332-489402,489404-489417,489419-489421,489423-489643,489645-489690,489692-489703,489705-489714,489716-489747,489749-489753,489755-489803,489805-489904,489906-490372,490374-490504,490506-490604,490606-490707,490710-490733,490735-490871,490873-490984,490986-491028,491030,491032-491071,491073-491119,491121-491576,491578-491672,491674-491800,491802-491838,491840-491878,491880-492183,492185-492279,492281-492317,492319-492513,492515-492584,492586-492587,492589-492601,492603-492635,492637-492640,492642-492717,492719-492723,492725-492729,492731-492755,492757-492901,492903-492955,492957-492962,492964-492997,492999-493002,493004-493041,493043-493059,493062-493063,493065-493086,493088-493125,493127-493139,493141-493150,493152-493871,493873-494017,494019-494030,494032-494041,494043-494091,494093-494120,494122-494354,494356-494436,494438-494539,494541-494552,494554-494586,494588-494649,494651,494653-494654,494656-494657,494659-494764,494766-494768,494770-494796,494798-494799,494802,494804-494860,494862-494903,494905-494906,494908-495019,495021-495160,495162-495168,495171-495188,495190-495229,495231-495254,495256-495303,495305-495313,495315-495336,495338-495372,495374-495379,495381-495454,495457-495459,495462-495516,495518-495524,495526-495531,495533-495548,495551-495553,495555,495557-495558,495560,495562-495573,495575-495583,495585-495594,495596-495628,495630-495638,495640-495651,495653-495660,495662-495753,495755-496259,496261-496262,496264-496269,496271-496275,496277-496301,496303-496316,496318-496383,496385-496413,496415-496495,496497-496625,496627-496636,496638-496640,496642-496647,496650-496657,496659-496660,496663-496664,496666-496677,496679-496681,496683-496730,496732-496750,496752,496754-496784,496786-496832,496834-496840,496842-496990,496992-496995,496997-497340,497343-497351,497353-497403,497405-497424,497426-497438,497440-497481,497483-497497,497499-497765,497767-497769,497771-497775,497777-497778,497780,497782-497783,497785,497787-497812,497814-497871,497873-497877,497879-498573,498575-498588,498590,498592,498594-498636,498638-498669,498671-498686,498688-498689,498691-498719,498721-498964,498966-498969,498971-498973,498975-498982,498985-499035,499037-499040,499042,499044-499048,499050-499082,499084-499086,499088-499164,499167-499169,499171-499355,499357-499370,499372-499373,499375-499391,499393,499395-499425,499428,499430-499445,499447-499455,499457-499460,499462-499465,499467,499469-499489,499491-499492,499494-499531,499533-499562,499566-499627,499629-499715,499717-499732,499734-499755,499758-499763,499765-499780,499782-499795,499797-499802,499804-499844,499846,499848-499850,499852-499863,499865-499873,499875-499974,499976-499978,499980-500263,500265-500283,500285-500309,500311-501000,501002,501012-501057,501059-501095,501097-501390,501392-501410,501413-501447,501449-501454,501456,501458-501464,501466-501471,501473-501803,501805-501913,501915-501916,501918-501919,501921-501944,501946-502171,502173-502177,502181,502183-502247,502250-502252,502254-502260,502262-502267,502270,502272,502274-502575,502577-502609,502611-502619,502621-502626,502628-502654,502656-503592,503594-503603,503605-503608,503610-503636,503638-503645,503647-503705,503707-503789,503791-504024,504026-504111,504113-504506,504508-504735,504737-504863,504865-504867,504869-504914,504916-505241,505243-505254,505257-505267,505269-505354,505356-505891,505893-505971,505973-506400,506402-506404,506407-506438,506440-506516,506518-506541,506543-506966,506968-506971,506973-507095,507097-507108,507111-507454,507456,507459-507471,507473-507556,507558,507560-507581,507585-507594,507597,507599-507608,507610-507728,507730-507893,507895-507937,507940-508234,508236-508350,508352-508365,508367-508380,508383,508386-508415,508417-508648,508650-508941,508943-509146,509148-509171,509173-509175,509179-509201,509203-509207,509209-509215,509217-509222,509224-509477,509480-509627,509629-509634,509636-509641,509643-509736,509738-509931,509933-510059,510061-510075,510077-510158,510161-510896,510898-510938,510940-511388,511390-511922,511924-512287,512289-512698,512702-512813,512815-512817,512819-513359,513361-513370,513372-514702,514704-514886,514888-514902,514904-515126,515129-515141,515143-515516,515518-515534,515536-515538,515540-515648,515650-515651,515653-516070,516072-516411,516413-516448,516450,516452-517637,517639-517647,517649-517659,517661-517663,517665-517677,517679-517682,517684-517744,517746-518085,518087-518175,518177-518558,518560-518568,518571-518666,518668,518670-518699,518701-518987,518990-518992,518994-519908,519910-519932,519934-520414,520416-520842,520844-520937,520939-521362,521364-521681,521683-521704,521706-521709,521711-521714,521716-521781,521783-521792,521794-522462,522464-522527,522529-522534,522536-522566,522568-522958,522960,522962-522966,522968-522976,522978-522980,522982-522988,522992-522993,522995-523244,523246-523746,523748-524049,524051-524738,524741-524742,524744-524762,524764,524766,524768-525486,525488-525530,525532,525534,525537-525552,525554-525765,525767-525776,525778-525784,525789-525803,525805-525816,525818-525828,525830-525861,525863-525866,525868-526090,526092-526112,526114-526116,526119-526121,526123-526149,526151-526153,526155-526156,526160-526165,526167-526186,526188-526193,526196-526197,526200-526665,526667-526682,526686-526690,526693,526695-526708,526710-526713,526715-526775,526777-526802,526804-526806,526808-527048,527051-527052,527054-527181,527183-527486,527488-527492,527494-527498,527500-527508,527510-527517,527519-527536,527538-527555,527559-527802,527804-527842,527844-527847,527849-527875,527877-527940,527942-527958,527960-527971,527973-528002,528004,528006-528423,528425-529232,529234-529245,529247-529296,529298-529634,529636-529658,529660-529665,529667-529668,529670-530033,530035-530036,530038-530040,530045-530046,530050-530051,530053-530431,530433-530436,530439-530440,530443,530445-530446,530448,530450-530682,530684,530687-530696,530698-530733,530735-530776,530778-530795,530799,530801-530811,530813-530818,530820-530837,530839-531436,531438-531455,531457,531459-531511,531514,531516,531519-531523,531525,531528-531858,531860-531864,531866-531907,531909-531916,531918-531936,531938-531988,531990-532001,532003-532371,532373-532465,532467-532727,532729-532765,532767-532785,532788-532790,532792-532793,532795-533064,533066-533074,533076,533080-533130,533132-533139,533142-533703,533705-533720,533722-533763,533766-533818,533820-533839,533841-533859,533862-534035,534037-534112,534114-534116,534118-534472,534474-534477,534479-534762,534764-534896,534898-534902,534904-535253,535255-535308,535310-535808,535810-535873,535875-536007,536009-536140,536142-536162,536165-536242,536244-536252,536254-536278,536280-536338,536340-536448,536450-536479,536481-536482,536484-536485,536487-536495,536497,536500-536505,536507-536561,536563-536570,536572,536574-536583,536586-536823,536825-537014,537016-537018,537020-537025,537027-537028,537030-537160,537162-537170,537172-537672,537674-537781,537783-537833,537836-537840,537842-537844,537846-537953,537955-538034,538036-538078,538080-538083,538085-538097,538099-538108,538110-538239,538241-538881,538883-538906,538908-538911,538913-538921,538923-539177,539179-539190,539192-539469,539471-539475,539477-539480,539482-539483,539485-539500,539502-539593,539595-539782,539784-539787,539789-540106,540108-540168,540170-540510,540512-541246,541248-542483,542485-542788,542790-543495,543497-544108,544110-544421,544423-544507,544509-544865,544867-545145,545147-546095,546097-546189,546191-546440,546442-546457,546459-547177,547179-547626,547628-548275,548277-548278,548280-548301,548303-548307,548309-548311,548313-548314,548316,548318,548320-548380,548382-549010,549012-549529,549531-549848,549850-550508,550510-550747,550749-550772,550774-550848,550850-551116,551122-553446,553448-561282 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r541920 | tomasr | 2007-05-26 18:35:51 +0100 (Sat, 26 May 2007) | 1 line
  
  QPID-136 Initial Prefetch Implementation
........
  r549112 | arnaudsimon | 2007-06-20 15:11:03 +0100 (Wed, 20 Jun 2007) | 1 line
  
  changed setText to use UTF8 as default encoder 
........
  r551167 | arnaudsimon | 2007-06-27 15:08:50 +0100 (Wed, 27 Jun 2007) | 1 line
  
  added public void declareAndBind(AMQDestination amqd)
........
  r551174 | ritchiem | 2007-06-27 15:23:21 +0100 (Wed, 27 Jun 2007) | 3 lines
  
  Caused each of these tests to run 10 times to help identify any race conditions that were occuring.
  
  Updated the CommitRollbackTest to be more robust in the detection of failure.
........
  r551175 | ritchiem | 2007-06-27 15:23:52 +0100 (Wed, 27 Jun 2007) | 1 line
  
  Allowed more of the constants to be set via system properties.
........
  r551176 | ritchiem | 2007-06-27 15:25:13 +0100 (Wed, 27 Jun 2007) | 1 line
  
  renamed the passwd programme qpid-passwd to match the change in bin directory.
........
  r552441 | rupertlssmith | 2007-07-02 10:23:54 +0100 (Mon, 02 Jul 2007) | 1 line
  
  Added log4j as slfj logger for perftests.
........
  r552499 | rupertlssmith | 2007-07-02 15:17:45 +0100 (Mon, 02 Jul 2007) | 1 line
  
  Added some documentation.
........
  r553172 | rupertlssmith | 2007-07-04 12:11:04 +0100 (Wed, 04 Jul 2007) | 1 line
  
  Messages moved by management console now commited on the message store.
........
  r553248 | ritchiem | 2007-07-04 17:05:55 +0100 (Wed, 04 Jul 2007) | 6 lines
  
  Addition of the MessageStore Tool.
  Small changes to the Exchanges to allow the extraction of currently listed items.
  
  Extracted initial broker configuration mechanism to a reusable class. Have modified broker to use it.
  
  Move the Passwd.java to new tools package structure on the broker.
........
  r553265 | ritchiem | 2007-07-04 17:42:59 +0100 (Wed, 04 Jul 2007) | 1 line
  
  Tidied up some extranious logging.
........
  r553432 | rupertlssmith | 2007-07-05 10:28:33 +0100 (Thu, 05 Jul 2007) | 1 line
  
  Fixed test state carrying over to mandatory message test from immediate. Also added in-vm clean up to other tests.
........
  r553480 | ritchiem | 2007-07-05 13:40:50 +0100 (Thu, 05 Jul 2007) | 2 lines
  
  Minor changes and tidy up when running via command line.
  Added Copy command.
........
  r553482 | ritchiem | 2007-07-05 13:44:42 +0100 (Thu, 05 Jul 2007) | 2 lines
  
  Forgot to compile before committing. Missed a method change in the Select command.
........
  r554964 | rupertlssmith | 2007-07-10 15:40:04 +0100 (Tue, 10 Jul 2007) | 1 line
  
  Added message copy method.
........
  r555249 | rupertlssmith | 2007-07-11 12:52:39 +0100 (Wed, 11 Jul 2007) | 1 line
  
  Update perftests to center better around current performance.
........
  r556011 | rupertlssmith | 2007-07-13 15:24:03 +0100 (Fri, 13 Jul 2007) | 1 line
  
  Moved test framework into its own package and cleaned it up.
........
  r556024 | rupertlssmith | 2007-07-13 16:02:06 +0100 (Fri, 13 Jul 2007) | 1 line
  
  Completed javadoc for test framework.
........
  r556628 | rgodfrey | 2007-07-16 14:50:57 +0100 (Mon, 16 Jul 2007) | 1 line
  
  QPID-537 : Make AMQMessage.incrementReference public
........
  r556675 | cctrieloff | 2007-07-16 18:36:21 +0100 (Mon, 16 Jul 2007) | 2 lines
  
  added notice entries
........
  r556680 | cctrieloff | 2007-07-16 18:56:40 +0100 (Mon, 16 Jul 2007) | 2 lines
  
  clean up
........
  r556682 | cctrieloff | 2007-07-16 18:58:37 +0100 (Mon, 16 Jul 2007) | 2 lines
  
  removed optional cppunit as not in distributed packages
........
  r556845 | ritchiem | 2007-07-17 09:26:33 +0100 (Tue, 17 Jul 2007) | 3 lines
  
  Additional logging in case of broker failure at startup.
  
  Use broker logger at error level as well as System.out
........
  r556847 | ritchiem | 2007-07-17 09:35:35 +0100 (Tue, 17 Jul 2007) | 3 lines
  
  Update to the MessageStore Tool to provide Move and Purge functionality.
  
  Updated to remove the AMQExceptions that will be removed from the Exchange class.
........
  r556861 | ritchiem | 2007-07-17 10:26:47 +0100 (Tue, 17 Jul 2007) | 2 lines
  
  QPID-538 Check to ensure a duplicate binding is not created.
........
  r556868 | ritchiem | 2007-07-17 10:55:56 +0100 (Tue, 17 Jul 2007) | 1 line
  
  Addition of simple pub/sub examples.
........
  r556869 | ritchiem | 2007-07-17 10:56:17 +0100 (Tue, 17 Jul 2007) | 1 line
  
  QPID-540 Prevent NPE when purging message from the main _message queue in the ConcurrentSelectorDeliveryManager that have been delivered via a Subscribers _messageQueue. Ensuring that any expired messages are still correctly handled. i.e. the Queue size/depth is reduced and the message correctly dequeued from the underlying store.
........
  r556871 | ritchiem | 2007-07-17 10:57:35 +0100 (Tue, 17 Jul 2007) | 1 line
  
  White space & code formatting change
........
  r556872 | ritchiem | 2007-07-17 10:58:35 +0100 (Tue, 17 Jul 2007) | 3 lines
  
  Added additional information to hard-error logging in exceptionReceived.
  
  Fully expanded imports
........
  r556888 | ritchiem | 2007-07-17 12:33:08 +0100 (Tue, 17 Jul 2007) | 1 line
  
  Change to allow the management port to be specified on the command line, via -m or --mport
........
  r556890 | ritchiem | 2007-07-17 12:38:10 +0100 (Tue, 17 Jul 2007) | 4 lines
  
  QPID-541 A large portion of memory was being wasted in 32k ByteBuffers being held by the AMQShortStrings. 
  
  Patch submitted by Robert Godfrey to intern() the AMQSSs to reduce memory usage. Current implementation *will* impact performance due to the usage of a static Map for storage. However, a thread local implementation is in the works.
........
  r556898 | rgodfrey | 2007-07-17 13:00:57 +0100 (Tue, 17 Jul 2007) | 1 line
  
  QPID-541 : Change to use threadlocal maps for intern for the common case to avoid excessive synchronization.  In the uncommon case will require more lookup.
........
  r556958 | rupertlssmith | 2007-07-17 17:22:16 +0100 (Tue, 17 Jul 2007) | 1 line
  
  Refactored the distributed test clients and coordinator to support different distribution and sequencing engines.
........
  r556967 | rupertlssmith | 2007-07-17 17:40:14 +0100 (Tue, 17 Jul 2007) | 1 line
  
  Removed unused package.
........
  r556968 | rupertlssmith | 2007-07-17 17:42:00 +0100 (Tue, 17 Jul 2007) | 1 line
  
  Retired old interop tests.
........
  r556969 | rupertlssmith | 2007-07-17 17:43:49 +0100 (Tue, 17 Jul 2007) | 1 line
  
  Properties file not needed any more. Test properties all driven from MessagingTestConfigProperties.
........
  r557276 | ritchiem | 2007-07-18 15:36:11 +0100 (Wed, 18 Jul 2007) | 1 line
  
  Updates to pom files and Licensing/Notice files for M2 release.
........
  r557279 | ritchiem | 2007-07-18 15:51:42 +0100 (Wed, 18 Jul 2007) | 1 line
  
  This is left over from ANT
........
  r557281 | ritchiem | 2007-07-18 15:54:06 +0100 (Wed, 18 Jul 2007) | 1 line
  
  updated comment to refelect property values
........
  r557286 | ritchiem | 2007-07-18 16:02:22 +0100 (Wed, 18 Jul 2007) | 1 line
  
  Set default mvn build to assembly:assembly
........
  r557288 | ritchiem | 2007-07-18 16:09:07 +0100 (Wed, 18 Jul 2007) | 1 line
  
  Ensure the top level release-docs directory is included in the builds
........
  r557306 | ritchiem | 2007-07-18 17:01:58 +0100 (Wed, 18 Jul 2007) | 1 line
  
  Update fix incorrect license headers.
........
  r557312 | ritchiem | 2007-07-18 17:07:01 +0100 (Wed, 18 Jul 2007) | 1 line
  
  added license
........
  r557314 | ritchiem | 2007-07-18 17:11:17 +0100 (Wed, 18 Jul 2007) | 1 line
  
  added license
........
  r557452 | aconway | 2007-07-19 03:03:02 +0100 (Thu, 19 Jul 2007) | 14 lines
  
  
  	* lib/broker/Daemon.cpp, .h
  	 - Rewrote to remove libdaemon dependency.
  	 - PID file stored in /var/run if root, /tmp otherwise.
  
  	* src/qpidd.cpp: Use new Daemon.cpp.
  	 - lock files stored in /var/run (for root) or /tmp.
  	 - updated to trunk daemon flag behavior.
  
  	* lib/broker/Makefile.am (libqpidbroker_la_LIBADD): 
  	 - Daemon.cpp now needs -lboost_iostreams
  	 
  	* NOTICE, README: Removed mention of libdaemon.
........
  r558027 | ritchiem | 2007-07-20 17:08:05 +0100 (Fri, 20 Jul 2007) | 1 line
  
  Added a logger but only used to control the toString inclusion of password. If in debug mode it will include password otherwise the password is "********".
........
  r558072 | astitcher | 2007-07-20 18:49:41 +0100 (Fri, 20 Jul 2007) | 2 lines
  
  Fixed the license from the "old" apache copyright notice
........
  r558083 | aconway | 2007-07-20 19:29:08 +0100 (Fri, 20 Jul 2007) | 2 lines
  
  Remove -ldaemon, we no longer require libdaemon.
........
  r558099 | aconway | 2007-07-20 20:20:01 +0100 (Fri, 20 Jul 2007) | 2 lines
  
  Ignore QPID_ env variables that don't correspond to known options.
........
  r558108 | cctrieloff | 2007-07-20 20:55:40 +0100 (Fri, 20 Jul 2007) | 2 lines
  
  typo fix
........
  r558114 | rajith | 2007-07-20 21:11:03 +0100 (Fri, 20 Jul 2007) | 1 line
  
  added release notes
........
  r558115 | rajith | 2007-07-20 21:12:20 +0100 (Fri, 20 Jul 2007) | 1 line
  
  Checking in the release notes
........
  r558116 | aconway | 2007-07-20 21:16:20 +0100 (Fri, 20 Jul 2007) | 3 lines
  
  Removed .txt from RELEASE_NOTES
  Added RELEASE_NOTES to EXTRA_DIST in Makefile.am
........
  r558168 | rajith | 2007-07-20 23:03:42 +0100 (Fri, 20 Jul 2007) | 1 line
  
  added release notes
........
  r558170 | rajith | 2007-07-20 23:04:11 +0100 (Fri, 20 Jul 2007) | 1 line
  
  added release notes
........
  r558630 | gsim | 2007-07-23 08:21:49 +0100 (Mon, 23 Jul 2007) | 3 lines
  
  Revised release notes: removed bug fixed on this branch, removed outstanding feature lists as it is not terribly accurate or helpful.
........
  r559419 | rupertlssmith | 2007-07-25 13:17:59 +0100 (Wed, 25 Jul 2007) | 1 line
  
  Refactored interop tests into general distributed test framework. Moved framework under systests from integrationtests.
........
  r559427 | ritchiem | 2007-07-25 13:40:24 +0100 (Wed, 25 Jul 2007) | 2 lines
  
  AMQMessage - added //todo-s and removed unused parameter StoreContext from expired() method call.
  ConcurrentSelectorDeliveryManager - Update to reflect expired() call change. Created new _reaperContextStore to be used when performing reaper operations such as message dequeue due to expiration. Removed old commented code.
........
  r559455 | rupertlssmith | 2007-07-25 14:40:16 +0100 (Wed, 25 Jul 2007) | 1 line
  
  Added to comments.
........
  r559456 | rupertlssmith | 2007-07-25 14:41:21 +0100 (Wed, 25 Jul 2007) | 1 line
  
  Removed redundant method.
........
  r559458 | rupertlssmith | 2007-07-25 14:57:21 +0100 (Wed, 25 Jul 2007) | 1 line
  
  Refactored packaging of test framework.
........
  r559461 | rupertlssmith | 2007-07-25 15:00:16 +0100 (Wed, 25 Jul 2007) | 1 line
  
  Removed redundant packages.
........
  r559943 | rhs | 2007-07-26 20:15:17 +0100 (Thu, 26 Jul 2007) | 1 line
  
  adding missing ack
........
  r559944 | rhs | 2007-07-26 20:15:44 +0100 (Thu, 26 Jul 2007) | 1 line
  
  removed old script
........
  r560198 | ritchiem | 2007-07-27 12:30:34 +0100 (Fri, 27 Jul 2007) | 1 line
  
  Added files to ignore list
........
  r560225 | ritchiem | 2007-07-27 14:33:50 +0100 (Fri, 27 Jul 2007) | 1 line
  
  Converted namespaces from Qpid.* to Apache.Qpid.*
........
  r560471 | tomasr | 2007-07-28 03:35:41 +0100 (Sat, 28 Jul 2007) | 1 line
  
  Removed using directives causing compilation failure in .NET 1.1
........
  r561278 | ritchiem | 2007-07-31 10:07:57 +0100 (Tue, 31 Jul 2007) | 8 lines
  
  Changes to POMs.
  Client pom now builds a single jar with all dependancies included in the single bundle.
  systests/pom.xml adjusted to include only *Test.class items. This will fix the current Error on OptOutTestCase
  management/eclipse-plugin/pom.xml - editied to include there required MANIFEST.MF to identify plugin to eclipse
  distribution/src/main/assembly/management-eclipse-plugin.xml editied to include there required MANIFEST.MF to identify the plugin
  distribution/pom.xml - white space
  
  Also updated log4j.xml default to create an alert.log file from the AMQQueue alerting. Added a debug.log4j.xml that gives example of debugging the broker via log4j.
........


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

25 files changed, 53 insertions, 39 deletions

diff --git a/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
index efd9e8493c..4896b64f68 100644
--- a/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
+++ b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public enum AcknowledgeMode
     {
diff --git a/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
index 0cfd2f24bc..8b43422f5c 100644
--- a/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
+++ b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class ChannelLimitReachedException : ResourceAllocationException
diff --git a/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
index af706260a5..3c4713ee2a 100644
--- a/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
+++ b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public enum DeliveryMode
     {
diff --git a/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
index 2e36a7b920..984e8b0f17 100644
--- a/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
+++ b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class ExchangeClassConstants
     {
@@ -26,4 +26,4 @@ namespace Qpid.Messaging
         public readonly static string DIRECT = "direct";
         public readonly static string HEADERS = "headers";
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
index 13d0d73f84..cda92d6b55 100644
--- a/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
+++ b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class ExchangeNameDefaults
     {
@@ -26,4 +26,4 @@ namespace Qpid.Messaging
         public readonly static string DIRECT = "amq.direct";
         public readonly static string HEADERS = "amq.match";        
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
index 0d19e9c523..5be942423d 100644
--- a/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
+++ b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IBytesMessage : IMessage
     {
diff --git a/qpid/dotnet/Qpid.Messaging/IChannel.cs b/qpid/dotnet/Qpid.Messaging/IChannel.cs
index 7ff1e4b82d..4da41a773d 100644
--- a/qpid/dotnet/Qpid.Messaging/IChannel.cs
+++ b/qpid/dotnet/Qpid.Messaging/IChannel.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public delegate void MessageReceivedDelegate(IMessage msg);
     
@@ -43,10 +43,23 @@ namespace Qpid.Messaging
         bool Transacted { get; }
 
         /// <summary>
-        /// Prefetch value to be used as the default for consumers created on this channel.
+        /// Prefetch value to be used as the default for 
+        /// consumers created on this channel.
         /// </summary>
-        int DefaultPrefetch { get; set; }
-        
+        int DefaultPrefetch { get; }
+
+        /// <summary>
+        /// Prefetch low value to be used as the default for 
+        /// consumers created on this channel.
+        /// </summary>
+        int DefaultPrefetchLow { get; }
+
+        /// <summary>
+        /// Prefetch high value to be used as the default for 
+        /// consumers created on this channel.
+        /// </summary>
+        int DefaultPrefetchHigh { get; }
+
         /// <summary>
         /// Declare a new exchange
         /// </summary>
diff --git a/qpid/dotnet/Qpid.Messaging/IConnection.cs b/qpid/dotnet/Qpid.Messaging/IConnection.cs
index 25c3ae968d..420228fa8e 100644
--- a/qpid/dotnet/Qpid.Messaging/IConnection.cs
+++ b/qpid/dotnet/Qpid.Messaging/IConnection.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public delegate void ExceptionListenerDelegate(Exception ex);
 
@@ -47,6 +47,7 @@ namespace Qpid.Messaging
 
         IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode);
         IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch);
+        IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow);
 
         void Start();
         void Stop();
diff --git a/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
index 682bd9eb54..f141d509be 100644
--- a/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
+++ b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IConnectionFactory
     {
diff --git a/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
index a8112bd8e9..02d9eb38da 100644
--- a/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
+++ b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IConnectionListener
     {
diff --git a/qpid/dotnet/Qpid.Messaging/IFieldTable.cs b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
index 50d47e6769..730ce399d4 100644
--- a/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
+++ b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
@@ -20,7 +20,7 @@
  */
 using System.Collections;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface IFieldTable : IEnumerable
     {
diff --git a/qpid/dotnet/Qpid.Messaging/IHeaders.cs b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
index edd0ef989b..7fdf26ebda 100644
--- a/qpid/dotnet/Qpid.Messaging/IHeaders.cs
+++ b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     /// <summary>
     /// IHeaders represents the header fields of an AMQ message and provides methods to access those fields. There are accessor methods to
diff --git a/qpid/dotnet/Qpid.Messaging/IMessage.cs b/qpid/dotnet/Qpid.Messaging/IMessage.cs
index d63662f7e3..20ae5ee130 100644
--- a/qpid/dotnet/Qpid.Messaging/IMessage.cs
+++ b/qpid/dotnet/Qpid.Messaging/IMessage.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {   
     public interface IMessage
     {
diff --git a/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
index 7767fae995..82d697bf61 100644
--- a/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
+++ b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
    /// <summary>
    /// Describes an object that can be used to receive (consume)
diff --git a/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
index edba868539..fab0df0c2b 100644
--- a/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
+++ b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
@@ -20,7 +20,7 @@
  */
 using System;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
    /// <summary>
    /// Defines an object capable of publishing messages
diff --git a/qpid/dotnet/Qpid.Messaging/ITextMessage.cs b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
index 7b3b5305a6..902beb70f8 100644
--- a/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
+++ b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public interface ITextMessage : IMessage
     {
diff --git a/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
index 4166dd0137..2d6f76d639 100644
--- a/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
@@ -18,25 +18,25 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class MessageConsumerBuilder
     {
-        public const int DEFAULT_PREFETCH_HIGH = 5000;
-
         private bool _noLocal = false;
         private bool _exclusive = false;
         private bool _durable = false;
         private string _subscriptionName = null;
         private IChannel _channel;
         private readonly string _queueName;
-        private int _prefetchLow = 2500;
-        private int _prefetchHigh = DEFAULT_PREFETCH_HIGH;
+        private int _prefetchLow;
+        private int _prefetchHigh;
 
         public MessageConsumerBuilder(IChannel channel, string queueName)
         {
             _channel = channel;
             _queueName = queueName;
+            _prefetchHigh = _channel.DefaultPrefetchHigh;
+            _prefetchLow = _channel.DefaultPrefetchLow;
         }
 
         public MessageConsumerBuilder WithPrefetchLow(int prefetchLow)
diff --git a/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
index 5a919c2ced..2afcffd531 100644
--- a/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class MessageNotReadableException : QpidException
diff --git a/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
index 6d4068c8c4..9b00f01948 100644
--- a/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class MessageNotWriteableException : QpidException
diff --git a/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
index ba843049ef..79c7575d0a 100644
--- a/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
+++ b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     public class MessagePublisherBuilder
     {
@@ -88,4 +88,4 @@ namespace Qpid.Messaging
             return _channel.CreatePublisher(_exchangeName, _routingKey, _deliveryMode, _timeToLive, _immediate, _mandatory, _priority);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
index 8b37576c42..8683ad08b2 100644
--- a/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
@@ -24,11 +24,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Qpid.Messaging")]
+[assembly: AssemblyTitle("Apache.Qpid.Messaging")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Qpid.Messaging")]
+[assembly: AssemblyProduct("Apache.Qpid.Messaging")]
 [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -53,4 +53,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
diff --git a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
index 207abe994e..90354bece6 100644
--- a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
+++ b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</ProjectGuid>

     <OutputType>Library</OutputType>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Qpid.Messaging</RootNamespace>

-    <AssemblyName>Qpid.Messaging</AssemblyName>

+    <RootNamespace>Apache.Qpid.Messaging</RootNamespace>

+    <AssemblyName>Apache.Qpid.Messaging</AssemblyName>

     <SignAssembly>true</SignAssembly>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

@@ -66,4 +66,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>
\ No newline at end of file
+</Project>

diff --git a/qpid/dotnet/Qpid.Messaging/QpidException.cs b/qpid/dotnet/Qpid.Messaging/QpidException.cs
index dc3391898b..3e39f2293d 100644
--- a/qpid/dotnet/Qpid.Messaging/QpidException.cs
+++ b/qpid/dotnet/Qpid.Messaging/QpidException.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {   
     [Serializable]
     public class QpidException : Exception
diff --git a/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
index a208b3cbbb..954dcdd94c 100644
--- a/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
+++ b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
@@ -22,7 +22,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Qpid.Messaging
+namespace Apache.Qpid.Messaging
 {
     [Serializable]
     public class ResourceAllocationException : QpidException
diff --git a/qpid/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build
index 6a1433ac76..789258bfad 100644
--- a/qpid/dotnet/Qpid.Messaging/default.build
+++ b/qpid/dotnet/Qpid.Messaging/default.build
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>

-<project name="Qpid.Messaging" default="build">

+<project name="Apache.Qpid.Messaging" default="build">

     <!--

 		Properties that come from master build file

 		- build.dir: root directory for build