diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-07-31 15:53:37 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-07-31 15:53:37 +0000 |
| commit | 4fbd28b6078d6b3fbfe528a99d6e27963c68f99b (patch) | |
| tree | d3bc0af887993b89b29e22bde800825cde255251 /qpid/dotnet | |
| parent | 0413e1028718321ec7f2dffd6bbeeb6646cd2006 (diff) | |
| download | qpid-python-4fbd28b6078d6b3fbfe528a99d6e27963c68f99b.tar.gz | |
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
Diffstat (limited to 'qpid/dotnet')
272 files changed, 953 insertions, 691 deletions
diff --git a/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs index d97f8278b5..1191d49954 100644 --- a/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,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.Buffer.Tests")]
+[assembly: AssemblyTitle("Apache.Qpid.Buffer.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Qpid.Buffer.Tests")]
+[assembly: AssemblyProduct("Apache.Qpid.Buffer.Tests")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj index e830782269..c3459aff29 100644 --- a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj +++ b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{74640962-99D0-4D06-B57A-9CD66517CF52}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Buffer.Tests</RootNamespace>
- <AssemblyName>Qpid.Buffer.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Buffer.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Buffer.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,4 +56,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs index aa675e3014..9af8801627 100644 --- a/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs +++ b/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs @@ -20,9 +20,9 @@ */
using NUnit.Framework;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Buffer.Tests
+namespace Apache.Qpid.Buffer.Tests
{
/// <summary>
/// Tests for the SimpleByteBuffer class
@@ -330,3 +330,4 @@ namespace Qpid.Buffer.Tests } // class SimpleByteBufferTests
}
+
diff --git a/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs index 07c7e14a48..071aa23830 100644 --- a/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs +++ b/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs @@ -21,9 +21,9 @@ using System;
using NUnit.Framework;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Buffer.Tests
+namespace Apache.Qpid.Buffer.Tests
{
/// <summary>
/// Tests for the SlicedByteBuffer class
diff --git a/qpid/dotnet/Qpid.Buffer.Tests/default.build b/qpid/dotnet/Qpid.Buffer.Tests/default.build index 829f052510..688633fc11 100644 --- a/qpid/dotnet/Qpid.Buffer.Tests/default.build +++ b/qpid/dotnet/Qpid.Buffer.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Buffer" default="test">
+<project name="Apache.Qpid.Buffer" default="test">
<target name="build">
<csc target="library"
diff --git a/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs index 2a7ad064d5..5a2fff74a7 100644 --- a/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs +++ b/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { [Serializable] public class BufferOverflowException : Exception @@ -38,3 +38,4 @@ namespace Qpid.Buffer } + diff --git a/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs index c0cb850e63..13939b77a8 100644 --- a/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs +++ b/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { [Serializable] public class BufferUnderflowException : Exception @@ -39,3 +39,4 @@ namespace Qpid.Buffer } + diff --git a/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs index b341fa7632..67f0edd440 100644 --- a/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs +++ b/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { /// <summary> /// Abstract class implementing a byte buffer diff --git a/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs index bf7c738041..4c2856c333 100644 --- a/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs +++ b/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs @@ -20,7 +20,7 @@ */ using System.Text; -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { public class ByteBufferHexDumper { @@ -76,3 +76,4 @@ namespace Qpid.Buffer } + diff --git a/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs index 0cc0811a5c..0f457df065 100644 --- a/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs +++ b/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs @@ -21,7 +21,7 @@ using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
/// <summary>
/// Allocates <see cref="ByteBuffer"/>'s and manages them. Please
@@ -47,3 +47,4 @@ namespace Qpid.Buffer }
+
diff --git a/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs index 971d78b27c..4dd92ccdc2 100644 --- a/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs @@ -23,11 +23,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.ByteBuffer")] +[assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.ByteBuffer")] +[assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj index 97346bd9fd..9320438f6f 100644 --- a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj +++ b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Buffer</RootNamespace>
- <AssemblyName>Qpid.Buffer</AssemblyName>
+ <RootNamespace>Apache.Qpid.Buffer</RootNamespace>
+ <AssemblyName>Apache.Qpid.Buffer</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
@@ -56,4 +56,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs index d91f7747d2..d3b7245cb1 100644 --- a/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs +++ b/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs @@ -20,7 +20,7 @@ */
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
internal sealed class SimpleByteBuffer : ByteBuffer
{
diff --git a/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs index 6933480c92..e772e59ae3 100644 --- a/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs +++ b/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs @@ -19,7 +19,7 @@ * */ -namespace Qpid.Buffer +namespace Apache.Qpid.Buffer { /// <summary> /// Allocates <see cref="ByteBuffer"/>'s and manages them. @@ -55,3 +55,4 @@ namespace Qpid.Buffer } + diff --git a/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs index 414da94a8d..c27b7949b6 100644 --- a/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs +++ b/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs @@ -20,7 +20,7 @@ */
using System;
-namespace Qpid.Buffer
+namespace Apache.Qpid.Buffer
{
internal sealed class SlicedByteBuffer : ByteBuffer
{
diff --git a/qpid/dotnet/Qpid.Buffer/default.build b/qpid/dotnet/Qpid.Buffer/default.build index e7002e7eb9..c2d36d15e6 100644 --- a/qpid/dotnet/Qpid.Buffer/default.build +++ b/qpid/dotnet/Qpid.Buffer/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Buffer" default="build">
+<project name="Apache.Qpid.Buffer" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
diff --git a/qpid/dotnet/Qpid.Client.Tests/App.config b/qpid/dotnet/Qpid.Client.Tests/App.config index 64c6def5fd..fd7c412a57 100644 --- a/qpid/dotnet/Qpid.Client.Tests/App.config +++ b/qpid/dotnet/Qpid.Client.Tests/App.config @@ -2,12 +2,12 @@ <configuration>
<configSections>
<sectionGroup name="qpid.client">
- <section name="authentication" type="Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Qpid.Client"/>
+ <section name="authentication" type="Apache.Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Apache.Qpid.Client"/>
</sectionGroup>
</configSections>
<qpid.client>
<authentication>
- <add key="TEST" value="Qpid.Client.Tests.Security.TestCallbackHandler, Qpid.Client.Tests"/>
+ <add key="TEST" value="Apache.Qpid.Client.Tests.Security.TestCallbackHandler, Apache.Qpid.Client.Tests"/>
</authentication>
</qpid.client>
</configuration>
diff --git a/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs b/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs index 8bc615bd20..8e8d8ced3b 100644 --- a/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs @@ -21,9 +21,9 @@ using System;
using System.Net;
using NUnit.Framework;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Tests.BrokerDetails
+namespace Apache.Qpid.Client.Tests.BrokerDetails
{
[TestFixture]
public class BrokerDetailsTest
diff --git a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs index 40ba1dd25a..c27aa9a503 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs +++ b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs @@ -23,11 +23,11 @@ using System; using log4net;
using NUnit.Framework;
-using Qpid.Client;
-using Qpid.Client.Message;
-using Qpid.Messaging;
+using Apache.Qpid.Client;
+using Apache.Qpid.Client.Message;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.Channel
+namespace Apache.Qpid.Client.Tests.Channel
{
/// <summary>
/// Test that channels can create messages correctly
@@ -74,5 +74,6 @@ namespace Qpid.Client.Tests.Channel Assert.IsInstanceOfType(typeof(ITextMessage), msg);
}
}
-} // namespace Qpid.Client.Tests.Channel
+} // namespace Apache.Qpid.Client.Tests.Channel
+
diff --git a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs index 92f30f8f4d..a9a39f87f8 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs @@ -22,11 +22,11 @@ using System; using System.Net;
using System.Threading;
using log4net;
-using Qpid.Client.Qms;
-using Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
using NUnit.Framework;
-namespace Qpid.Client.Tests.Channel
+namespace Apache.Qpid.Client.Tests.Channel
{
/// <summary>
/// Test the queue methods
diff --git a/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs b/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs index 69f8cc1406..9f91958028 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs +++ b/qpid/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs @@ -21,10 +21,10 @@ using System; using log4net; using NUnit.Framework; -using Qpid.Messaging; -using Qpid.Client.Qms; +using Apache.Qpid.Messaging; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { /// <summary> /// Provides a basis for writing Unit tests that communicate with an AMQ protocol broker. By default it creates a connection @@ -56,7 +56,7 @@ namespace Qpid.Client.Tests { IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri); _connection = new AMQConnection(connectionInfo); - _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 1); + _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 500, 300); } catch (QpidException e) { diff --git a/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs b/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs index 2ab8c00388..f3ce695de8 100644 --- a/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs @@ -22,10 +22,10 @@ using System; using System.Threading;
using log4net;
using NUnit.Framework;
-using Qpid.Framing;
-using Qpid.Messaging;
+using Apache.Qpid.Framing;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests
+namespace Apache.Qpid.Client.Tests
{
/// <summary>
/// Sets up a producer/consumer pair to send test messages through a header exchange. The header exchange matching pattern is tested to
diff --git a/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs index 421d0d4e02..1211196541 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs +++ b/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs @@ -23,10 +23,10 @@ using System; using log4net;
using NUnit.Framework;
-using Qpid.Messaging;
-using Qpid.Client.Message;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Message;
-namespace Qpid.Client.Tests.Messages
+namespace Apache.Qpid.Client.Tests.Messages
{
/// <summary>
/// Ensure a factory creates messages correctly
@@ -109,5 +109,6 @@ namespace Qpid.Client.Tests.Messages }
}
-} // namespace Qpid.Client.Tests.Messages
+} // namespace Apache.Qpid.Client.Tests.Messages
+
diff --git a/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs b/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs index fd1400d9d8..dc3b436a41 100644 --- a/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs +++ b/qpid/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs @@ -23,9 +23,9 @@ using System.Text; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { [TestFixture] public class ProducerMultiConsumer : BaseMessagingTestFixture diff --git a/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs index 3a2842c210..b3648391c1 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs @@ -26,11 +26,11 @@ using log4net.Config; // 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.Client.Tests")] +[assembly: AssemblyTitle("Apache.Qpid.Client.Tests")] [assembly: AssemblyDescription("Test Suite for Qpid Clients")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.Client.Tests")] +[assembly: AssemblyProduct("Apache.Qpid.Client.Tests")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj index d74337b42b..a1a34d480d 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj +++ b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Client.Tests</RootNamespace>
- <AssemblyName>Qpid.Client.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Client.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Client.Tests</AssemblyName>
<StartupObject>
</StartupObject>
</PropertyGroup>
@@ -71,6 +71,10 @@ <Compile Include="url\ConnectionUrlTest.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
+ <Project>{44384DF2-B0A4-4580-BDBC-EE4BAA87D995}</Project>
+ <Name>Qpid.Buffer</Name>
+ </ProjectReference>
<ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">
<Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>
<Name>Qpid.Messaging</Name>
@@ -107,4 +111,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs index 9dac69a483..1345511cbf 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs +++ b/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs @@ -20,10 +20,10 @@ */
using System;
using NUnit.Framework;
-using Qpid.Client.Security;
+using Apache.Qpid.Client.Security;
-namespace Qpid.Client.Tests.Security
+namespace Apache.Qpid.Client.Tests.Security
{
[TestFixture]
public class CallbackRegistryHandlerTests
@@ -63,4 +63,4 @@ namespace Qpid.Client.Tests.Security } // class TestCallbackHandler
-} // namespace Qpid.Client.Tests.Connection
+} // namespace Apache.Qpid.Client.Tests.Connection
diff --git a/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs b/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs index 622c7c17c7..f299812989 100644 --- a/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs +++ b/qpid/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs @@ -23,9 +23,9 @@ using System.Text; using System.Threading;
using log4net;
using NUnit.Framework;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests
+namespace Apache.Qpid.Client.Tests
{
[TestFixture]
public class TestSyncConsumer : BaseMessagingTestFixture
@@ -96,7 +96,7 @@ namespace Qpid.Client.Tests _publisher.Send(msg);
}
- _logger.Error("All messages sent");
+ _logger.Debug("All messages sent");
// receive all messages
for ( int i = 0; i < MESSAGE_COUNT; i++ )
{
diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs index 4204a42015..165da62828 100644 --- a/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs @@ -20,10 +20,10 @@ */ using System; using NUnit.Framework; -using Qpid.Client.Qms; -using Qpid.Messaging; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests.Connection +namespace Apache.Qpid.Client.Tests.Connection { [TestFixture] public class ConnectionTest diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs index 8994279da1..e1c61f9059 100644 --- a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs @@ -23,10 +23,10 @@ using System.IO; using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using NUnit.Framework;
-using Qpid.Client.Qms;
-using Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.Connection
+namespace Apache.Qpid.Client.Tests.Connection
{
/// <summary>
/// Test SSL/TLS connections to the broker
diff --git a/qpid/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build index 88d06284d7..e7fb81dae5 100644 --- a/qpid/dotnet/Qpid.Client.Tests/default.build +++ b/qpid/dotnet/Qpid.Client.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<project name="Qpid.Client" default="test"> +<project name="Apache.Qpid.Client" default="test"> <target name="build"> <csc target="library" @@ -14,9 +14,9 @@ <include name="${build.dir}/log4net.dll" /> <include name="${build.dir}/nunit.framework.dll" /> <include name="${build.dir}/${project::get-name()}.dll" /> - <include name="${build.dir}/Qpid.Common.dll" /> - <include name="${build.dir}/Qpid.Messaging.dll" /> - <include name="${build.dir}/Qpid.Sasl.dll" /> + <include name="${build.dir}/Apache.Qpid.Common.dll" /> + <include name="${build.dir}/Apache.Qpid.Messaging.dll" /> + <include name="${build.dir}/Apache.Qpid.Sasl.dll" /> </references> </csc> <copy diff --git a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs index 7d7426a6a5..1f1e2f726c 100644 --- a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs @@ -22,10 +22,10 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Client.Qms; -using Qpid.Messaging; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests.failover +namespace Apache.Qpid.Client.Tests.failover { [TestFixture, Category("Failover")] public class FailoverTest : IConnectionListener diff --git a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs index 9063149bad..a110891cfc 100644 --- a/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs @@ -23,10 +23,10 @@ using System.Runtime.InteropServices; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Client.Qms; -using Qpid.Messaging; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests.failover +namespace Apache.Qpid.Client.Tests.failover { [TestFixture, Category("Failover")] public class FailoverTxTest : IConnectionListener diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs b/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs index 8e93bd8fa6..a667265ba4 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs @@ -1,9 +1,8 @@ using System;
-using System.Collections.Generic;
using System.Text;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
/// <summary> Defines the possible test case roles that an interop test case can take on. </summary>
public enum Roles { SENDER, RECEIVER };
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs index 2001d14956..7ff686e1cb 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase1DummyRun.cs @@ -1,10 +1,9 @@ using System;
-using System.Collections.Generic;
using System.Text;
using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
{
/// <summary>
/// Implements tet case 1, dummy run. This test case sends no test messages, it exists to confirm that the test harness
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs index 46c644c243..bc4501dea4 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase2BasicP2P.cs @@ -1,10 +1,9 @@ using System;
-using System.Collections.Generic;
using System.Text;
using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
{
/// <summary>
/// Implements test case 2, basic P2P. Sends/receives a specified number of messages to a specified route on the
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs index 61c02f13d8..4e3dd6e53e 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestCases/TestCase3BasicPubSub.cs @@ -1,10 +1,9 @@ using System;
-using System.Collections.Generic;
using System.Text;
using log4net;
-using Qpid.Messaging;
+using Apache.Qpid.Messaging;
-namespace Qpid.Client.Tests.interop.TestCases
+namespace Apache.Qpid.Client.Tests.interop.TestCases
{
/// <summary>
/// Implements test case 3, basic pub/sub. Sends/received a specified number of messages to a specified route on the
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs index b502129325..b15f7fbda9 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/TestClient.cs @@ -1,13 +1,12 @@ using System;
-using System.Collections.Generic;
using System.Collections;
using System.Text;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
using log4net;
-using Qpid.Client.Tests.interop.TestCases;
+using Apache.Qpid.Client.Tests.interop.TestCases;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
/// <summary>
/// Implements a test client as described in the interop testing spec
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs index db9b1a4650..13141d52b8 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs @@ -20,10 +20,10 @@ */
using System;
using log4net;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
public class TopicListener
{
diff --git a/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs index 5004bb28d2..ef5d39f0bc 100644 --- a/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs +++ b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs @@ -1,10 +1,10 @@ using System;
using System.Threading;
using log4net;
-using Qpid.Messaging;
-using Qpid.Client.Qms;
+using Apache.Qpid.Messaging;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Tests.interop
+namespace Apache.Qpid.Client.Tests.interop
{
public class TopicPublisher
{
diff --git a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs b/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs index ad5981a5c5..cbc93ae2fe 100644 --- a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs +++ b/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs @@ -22,9 +22,9 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { [TestFixture] public class ServiceProvidingClient : BaseMessagingTestFixture diff --git a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs b/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs index 8264879c1f..f35fb2dac9 100644 --- a/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs +++ b/qpid/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs @@ -22,9 +22,9 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { public class ServiceRequestingClient : BaseMessagingTestFixture { diff --git a/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs b/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs index bae5b6d8f9..bcf57e586e 100644 --- a/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs @@ -22,9 +22,9 @@ using System; using System.Threading; using log4net; using NUnit.Framework; -using Qpid.Messaging; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Tests +namespace Apache.Qpid.Client.Tests { /// <summary> /// Tests that when sending undeliverable messages with the diff --git a/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs index b3ee0272b4..3c9f8dd4e2 100644 --- a/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs @@ -21,9 +21,9 @@ using System; using System.Net; using NUnit.Framework; -using Qpid.Client.Qms; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client.Tests.url +namespace Apache.Qpid.Client.Tests.url { [TestFixture] public class connectionUrlTests diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs index d65b5e9e6a..badaa48111 100644 --- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs +++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs @@ -22,10 +22,10 @@ using System; using System.Net; using System.Net.Sockets; using log4net; -using Qpid.Buffer; -using Qpid.Client.Protocol; +using Apache.Qpid.Buffer; +using Apache.Qpid.Client.Protocol; -namespace Qpid.Client.Transport.Socket.Blocking +namespace Apache.Qpid.Client.Transport.Socket.Blocking { class BlockingSocketProcessor : IConnectionCloser { @@ -114,3 +114,4 @@ namespace Qpid.Client.Transport.Socket.Blocking } } + diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs index e85e42e08c..17f911fb6d 100644 --- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs +++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs @@ -22,8 +22,8 @@ using System; using System.Collections; using System.Threading; using log4net; -using Qpid.Client.Protocol; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Framing; namespace Qpid.Client.Transport.Socket.Blocking { @@ -118,3 +118,4 @@ namespace Qpid.Client.Transport.Socket.Blocking } } + diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs index 07784b750c..19da2fceb9 100644 --- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs +++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs @@ -20,9 +20,9 @@ */ using System; using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Transport.Socket.Blocking +namespace Apache.Qpid.Client.Transport.Socket.Blocking { class ByteChannel : IByteChannel { @@ -60,4 +60,4 @@ namespace Qpid.Client.Transport.Socket.Blocking processor.Write(buffer); } } -}
\ No newline at end of file +} diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs index 54da92a22a..00f366b5a9 100644 --- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs @@ -23,11 +23,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("BlockingTransport")] +[assembly: AssemblyTitle("Apache.Qpid.Transport.Blocking")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("BlockingTransport")] +[assembly: AssemblyProduct("Apache.Qpid.Transport.Blocking")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj index a710ef998e..a12b6695e2 100644 --- a/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj +++ b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{52AC4940-2077-4104-A753-29A9C8C16957}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Client.Transport.Socket.Blocking</RootNamespace>
- <AssemblyName>Qpid.Client.Transport.Socket.Blocking</AssemblyName>
+ <RootNamespace>Apache.Qpid.Client.Transport.Socket.Blocking</RootNamespace>
+ <AssemblyName>Apache.Qpid.Client.Transport.Socket.Blocking</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs b/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs index 68cacad1ef..6382eaaf39 100644 --- a/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs +++ b/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs @@ -21,7 +21,7 @@ using System;
using System.Runtime.Serialization;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQAuthenticationException : AMQException
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs index 4498ba3a32..d74cf6b5e4 100644 --- a/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs +++ b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs @@ -24,17 +24,17 @@ using System.IO; using System.Reflection; using System.Threading; using log4net; -using Qpid.Client.Failover; -using Qpid.Client.Protocol; -using Qpid.Client.Qms; -using Qpid.Client.State; -using Qpid.Client.Transport; -using Qpid.Client.Transport.Socket.Blocking; -using Qpid.Collections; -using Qpid.Framing; -using Qpid.Messaging; - -namespace Qpid.Client +using Apache.Qpid.Client.Failover; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Client.State; +using Apache.Qpid.Client.Transport; +using Apache.Qpid.Client.Transport.Socket.Blocking; +using Apache.Qpid.Collections; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; + +namespace Apache.Qpid.Client { public class AMQConnection : Closeable, IConnection { @@ -273,15 +273,17 @@ namespace Qpid.Client private bool _transacted; private AcknowledgeMode _acknowledgeMode; - int _prefetch; + int _prefetchHigh; + int _prefetchLow; AMQConnection _connection; - public CreateChannelFailoverSupport(AMQConnection connection, bool transacted, AcknowledgeMode acknowledgeMode, int prefetch) + public CreateChannelFailoverSupport(AMQConnection connection, bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow) { _connection = connection; _transacted = transacted; _acknowledgeMode = acknowledgeMode; - _prefetch = prefetch; + _prefetchHigh = prefetchHigh; + _prefetchLow = prefetchLow; } protected override object operation() @@ -297,14 +299,14 @@ namespace Qpid.Client // open it, so that there is no window where we could receive data on the channel and not be set // up to handle it appropriately. AmqChannel channel = new AmqChannel(_connection, - channelId, _transacted, _acknowledgeMode, _prefetch); + channelId, _transacted, _acknowledgeMode, _prefetchHigh, _prefetchLow); _connection.ProtocolSession.AddSessionByChannel(channelId, channel); _connection.RegisterSession(channelId, channel); bool success = false; try { - _connection.createChannelOverWire(channelId, (ushort)_prefetch, _transacted); + _connection.CreateChannelOverWire(channelId, _prefetchHigh, _prefetchLow, _transacted); success = true; } catch (AMQException e) @@ -334,11 +336,16 @@ namespace Qpid.Client public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode) { - return CreateChannel(transacted, acknowledgeMode, AmqChannel.DEFAULT_PREFETCH); + return CreateChannel(transacted, acknowledgeMode, AmqChannel.DEFAULT_PREFETCH_HIGH_MARK); } public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetch) { + return CreateChannel(transacted, acknowledgeMode, prefetch, prefetch); + } + + public IChannel CreateChannel(bool transacted, AcknowledgeMode acknowledgeMode, int prefetchHigh, int prefetchLow) + { CheckNotClosed(); if (ChannelLimitReached()) { @@ -347,7 +354,7 @@ namespace Qpid.Client else { CreateChannelFailoverSupport operation = - new CreateChannelFailoverSupport(this, transacted, acknowledgeMode, prefetch); + new CreateChannelFailoverSupport(this, transacted, acknowledgeMode, prefetchHigh, prefetchLow); return (IChannel)operation.execute(this); } } @@ -704,8 +711,8 @@ namespace Qpid.Client /* // Currently there is only one transport option - BlockingSocket. - String assemblyName = "Qpid.Client.Transport.Socket.Blocking.dll"; - String transportType = "Qpid.Client.Transport.Socket.Blocking.BlockingSocketTransport"; + String assemblyName = "Apache.Qpid.Client.Transport.Socket.Blocking.dll"; + String transportType = "Apache.Qpid.Client.Transport.Socket.Blocking.BlockingSocketTransport"; // Load the transport assembly dynamically. _transport = LoadTransportFromAssembly(brokerDetail.getHost(), brokerDetail.getPort(), assemblyName, transportType); @@ -774,18 +781,23 @@ namespace Qpid.Client foreach (AmqChannel channel in channels) { _protocolSession.AddSessionByChannel(channel.ChannelId, channel); - ReopenChannel(channel.ChannelId, (ushort)channel.DefaultPrefetch, channel.Transacted); + ReopenChannel( + channel.ChannelId, + channel.DefaultPrefetchHigh, + channel.DefaultPrefetchLow, + channel.Transacted + ); channel.ReplayOnFailOver(); } } - private void ReopenChannel(ushort channelId, ushort prefetch, bool transacted) + private void ReopenChannel(ushort channelId, int prefetchHigh, int prefetchLow, bool transacted) { - _log.Debug(string.Format("Reopening channel id={0} prefetch={1} transacted={2}", - channelId, prefetch, transacted)); + _log.Debug(string.Format("Reopening channel id={0} prefetchHigh={1} prefetchLow={2} transacted={3}", + channelId, prefetchHigh, prefetchLow, transacted)); try { - createChannelOverWire(channelId, prefetch, transacted); + CreateChannelOverWire(channelId, prefetchHigh, prefetchLow, transacted); } catch (AMQException e) { @@ -795,7 +807,7 @@ namespace Qpid.Client } } - void createChannelOverWire(ushort channelId, ushort prefetch, bool transacted) + void CreateChannelOverWire(ushort channelId, int prefetchHigh, int prefetchLow, bool transacted) { _protocolWriter.SyncWrite(ChannelOpenBody.CreateAMQFrame(channelId, null), typeof (ChannelOpenOkBody)); @@ -805,7 +817,8 @@ namespace Qpid.Client { // Basic.Qos frame appears to not be supported by OpenAMQ 1.0d. _protocolWriter.SyncWrite( - BasicQosBody.CreateAMQFrame(channelId, 0, prefetch, false), + BasicQosBody.CreateAMQFrame( + channelId, (uint)prefetchHigh, 0, false), typeof (BasicQosOkBody)); } diff --git a/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs index a4caf02e2c..c8a48814bb 100644 --- a/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs +++ b/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Client +namespace Apache.Qpid.Client { [Serializable] public class AMQConnectionException : AMQException diff --git a/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs b/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs index e2c4778a28..07ce3c2354 100644 --- a/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs +++ b/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client +namespace Apache.Qpid.Client { public abstract class AMQDestination { diff --git a/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs index ec5944bdac..0d93176734 100644 --- a/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs +++ b/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs @@ -20,10 +20,10 @@ */
using System;
using System.Runtime.Serialization;
-using Qpid.Common;
-using Qpid.Protocol;
+using Apache.Qpid.Common;
+using Apache.Qpid.Protocol;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQNoConsumersException : AMQUndeliveredException
diff --git a/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs index 8f0db1c3d5..bde3cdd989 100644 --- a/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs +++ b/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs @@ -20,10 +20,10 @@ */
using System;
using System.Runtime.Serialization;
-using Qpid.Common;
-using Qpid.Protocol;
+using Apache.Qpid.Common;
+using Apache.Qpid.Protocol;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
[Serializable]
public class AMQNoRouteException : AMQUndeliveredException
diff --git a/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs index 90e3788f5a..591c5b941f 100644 --- a/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs +++ b/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs @@ -21,9 +21,9 @@ using System; using System.Collections; using System.Text; -using Qpid.Client.Qms; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class AmqBrokerInfo : IBrokerInfo { diff --git a/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs index 9a8b9f787a..84f08729dd 100644 --- a/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs +++ b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs @@ -23,14 +23,15 @@ using System.Collections; using System.Text.RegularExpressions; using System.Threading; using log4net; -using Qpid.Buffer; -using Qpid.Client.Message; -using Qpid.Collections; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Protocol; - -namespace Qpid.Client +using Apache.Qpid.Buffer; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Util; +using Apache.Qpid.Collections; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Protocol; + +namespace Apache.Qpid.Client { public class AmqChannel : Closeable, IChannel { @@ -41,11 +42,14 @@ namespace Qpid.Client private static int _nextSessionNumber = 0; private int _sessionNumber; + private bool _suspended; + private object _suspensionLock = new object(); // Used in the consume method. We generate the consume tag on the client so that we can use the nowait feature. private int _nextConsumerNumber = 1; - internal const int DEFAULT_PREFETCH = MessageConsumerBuilder.DEFAULT_PREFETCH_HIGH; + public const int DEFAULT_PREFETCH_HIGH_MARK = 5000; + public const int DEFAULT_PREFETCH_LOW_MARK = 2500; private AMQConnection _connection; @@ -55,9 +59,10 @@ namespace Qpid.Client private ushort _channelId; - private int _defaultPrefetch = DEFAULT_PREFETCH; + private int _defaultPrefetchHighMark = DEFAULT_PREFETCH_HIGH_MARK; + private int _defaultPrefetchLowMark = DEFAULT_PREFETCH_LOW_MARK; - private BlockingQueue _queue = new LinkedBlockingQueue(); + private FlowControlQueue _queue; private Dispatcher _dispatcher; @@ -105,7 +110,7 @@ namespace Qpid.Client { UnprocessedMessage message; - while (_stopped == 0 && (message = (UnprocessedMessage)_containingChannel._queue.DequeueBlocking()) != null) + while (_stopped == 0 && (message = (UnprocessedMessage)_containingChannel._queue.Dequeue()) != null) { //_queue.size() DispatchMessage(message); @@ -163,8 +168,9 @@ namespace Qpid.Client /// <param name="channelId">The channel id.</param> /// <param name="transacted">if set to <c>true</c> [transacted].</param> /// <param name="acknowledgeMode">The acknowledge mode.</param> - /// <param name="defaultPrefetch">Default prefetch value</param> - internal AmqChannel(AMQConnection con, ushort channelId, bool transacted, AcknowledgeMode acknowledgeMode, int defaultPrefetch) + /// <param name="defaultPrefetchHigh">Default prefetch high value</param> + /// <param name="defaultPrefetchLow">Default prefetch low value</param> + internal AmqChannel(AMQConnection con, ushort channelId, bool transacted, AcknowledgeMode acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow) : this() { _sessionNumber = Interlocked.Increment(ref _nextSessionNumber); @@ -178,8 +184,26 @@ namespace Qpid.Client _acknowledgeMode = acknowledgeMode; } _channelId = channelId; + _defaultPrefetchHighMark = defaultPrefetchHigh; + _defaultPrefetchLowMark = defaultPrefetchLow; + + if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge ) + { + _queue = new FlowControlQueue( + _defaultPrefetchLowMark, _defaultPrefetchHighMark, + new ThresholdMethod(OnPrefetchLowMark), + new ThresholdMethod(OnPrefetchHighMark) + ); + } else + { + // low and upper are the same + _queue = new FlowControlQueue( + _defaultPrefetchHighMark, _defaultPrefetchHighMark, + null, null + ); + } } - + private AmqChannel() { _messageFactoryRegistry = MessageFactoryRegistry.NewDefaultRegistry(); @@ -269,19 +293,30 @@ namespace Qpid.Client public void Rollback() { - // FIXME: Fail over safety. Needs FailoverSupport? - CheckNotClosed(); - CheckTransacted(); // throws IllegalOperationException if not a transacted session - - try - { - _connection.ConvenientProtocolWriter.SyncWrite( - TxRollbackBody.CreateAMQFrame(_channelId), typeof(TxRollbackOkBody)); - } - catch (AMQException e) - { - throw new QpidException("Failed to rollback", e); - } + lock ( _suspensionLock ) + { + CheckTransacted(); // throws IllegalOperationException if not a transacted session + + try + { + bool suspended = IsSuspended; + if ( !suspended ) + Suspend(true); + + // todo: rollback dispatcher when TX support is added + //if ( _dispatcher != null ) + // _dispatcher.Rollback(); + + _connection.ConvenientProtocolWriter.SyncWrite( + TxRollbackBody.CreateAMQFrame(_channelId), typeof(TxRollbackOkBody)); + + if ( !suspended ) + Suspend(false); + } catch ( AMQException e ) + { + throw new QpidException("Failed to rollback", e); + } + } } public override void Close() @@ -539,21 +574,26 @@ namespace Qpid.Client ReturnBouncedMessage(message); } else { - _queue.EnqueueBlocking(message); + _queue.Enqueue(message); } } public int DefaultPrefetch { - get - { - return _defaultPrefetch; - } - set - { - _defaultPrefetch = value; - } - } + get { return DefaultPrefetchHigh; } + } + public int DefaultPrefetchLow + { + get { return _defaultPrefetchLowMark; } + } + public int DefaultPrefetchHigh + { + get { return _defaultPrefetchHighMark; } + } + public bool IsSuspended + { + get { return _suspended; } + } public ushort ChannelId { @@ -581,6 +621,7 @@ namespace Qpid.Client internal void Stop() { + Suspend(true); if (_dispatcher != null) { _dispatcher.StopDispatcher(); @@ -883,7 +924,7 @@ namespace Qpid.Client * @param multiple if true will acknowledge all messages up to and including the one specified by the * delivery tag */ - public void AcknowledgeMessage(ulong deliveryTag, bool multiple) + internal void AcknowledgeMessage(ulong deliveryTag, bool multiple) { AMQFrame ackFrame = BasicAckBody.CreateAMQFrame(_channelId, deliveryTag, multiple); if (_logger.IsDebugEnabled) @@ -930,5 +971,39 @@ namespace Qpid.Client } } + + private void OnPrefetchLowMark(int count) + { + if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge ) + { + _logger.Warn("Below threshold(" + _defaultPrefetchLowMark + ") so unsuspending channel. Current value is " + count); + Suspend(false); + } + } + private void OnPrefetchHighMark(int count) + { + if ( _acknowledgeMode == AcknowledgeMode.NoAcknowledge ) + { + _logger.Warn("Above threshold(" + _defaultPrefetchHighMark + ") so suspending channel. Current value is " + count); + Suspend(true); + } + } + + private void Suspend(bool suspend) + { + lock ( _suspensionLock ) + { + if ( _logger.IsDebugEnabled ) + { + _logger.Debug("Setting channel flow : " + (suspend ? "suspended" : "unsuspended")); + } + + _suspended = suspend; + AMQFrame frame = ChannelFlowBody.CreateAMQFrame(_channelId, !suspend); + + Connection.ConvenientProtocolWriter.SyncWrite(frame, typeof(ChannelFlowOkBody)); + } + } + } } diff --git a/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs index 796a878eec..fd4ff79505 100644 --- a/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs +++ b/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs @@ -21,12 +21,12 @@ using System; using System.Threading; using log4net; -using Qpid.Client.Message; -using Qpid.Collections; -using Qpid.Framing; -using Qpid.Messaging; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Collections; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class BasicMessageConsumer : Closeable, IMessageConsumer { diff --git a/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs index c1af826102..ca6d2abee5 100644 --- a/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs +++ b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs @@ -21,12 +21,12 @@ using System; using System.Threading; using log4net; -using Qpid.Buffer; -using Qpid.Client.Message; -using Qpid.Messaging; -using Qpid.Framing; +using Apache.Qpid.Buffer; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Messaging; +using Apache.Qpid.Framing; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class BasicMessageProducer : Closeable, IMessagePublisher { diff --git a/qpid/dotnet/Qpid.Client/Client/Closeable.cs b/qpid/dotnet/Qpid.Client/Client/Closeable.cs index 159f71ac08..d70f75ee6b 100644 --- a/qpid/dotnet/Qpid.Client/Client/Closeable.cs +++ b/qpid/dotnet/Qpid.Client/Client/Closeable.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client +namespace Apache.Qpid.Client { public abstract class Closeable { diff --git a/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs index 0d1fb73c31..ae9225a53a 100644 --- a/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs @@ -25,10 +25,10 @@ using System.Collections.Specialized; using System.Configuration;
using System.Text;
-using Qpid.Client.Security;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Client.Security;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Client.Configuration
+namespace Apache.Qpid.Client.Configuration
{
public class AuthenticationConfigurationSectionHandler
: IConfigurationSectionHandler
@@ -81,4 +81,4 @@ namespace Qpid.Client.Configuration _keys.Remove(key);
}
}
-} // namespace Qpid.Client.Configuration
+} // namespace Apache.Qpid.Client.Configuration
diff --git a/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs b/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs index 20f158f0ea..b21486bfa8 100644 --- a/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs +++ b/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client +namespace Apache.Qpid.Client { public class ConnectionTuneParameters { @@ -80,3 +80,4 @@ namespace Qpid.Client } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs index e2bc5b8a71..7013746414 100644 --- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs +++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { /// <summary> /// This exception is thrown when failover is taking place and we need to let other diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs index dbd09da49c..83c69b7d25 100644 --- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs @@ -21,10 +21,10 @@ using System; using System.Threading; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { public class FailoverHandler { @@ -172,3 +172,4 @@ namespace Qpid.Client.Failover } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs index 04322eeed4..3058cdcd69 100644 --- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs +++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { /// <summary> /// Enumeration of failover states. Used to handle failover from within AMQProtocolHandler where MINA events need to be diff --git a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs index 591c0b1d4f..afa5301f39 100644 --- a/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs +++ b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs @@ -20,7 +20,7 @@ */ using log4net; -namespace Qpid.Client.Failover +namespace Apache.Qpid.Client.Failover { public abstract class FailoverSupport { diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs index d6e196c8dd..def1e78e8c 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs @@ -19,12 +19,12 @@ * */ using log4net; -using Qpid.Client.Message; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class BasicDeliverMethodHandler : IStateAwareMethodListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs index 0bd65a1ace..f413dfc9c6 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs @@ -19,12 +19,12 @@ * */ using log4net; -using Qpid.Client.Message; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class BasicReturnMethodHandler : IStateAwareMethodListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs index 7f88dd8219..9ed09a0d01 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs @@ -19,12 +19,12 @@ * */ using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Protocol; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Protocol; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ChannelCloseMethodHandler : IStateAwareMethodListener { @@ -65,3 +65,4 @@ namespace Qpid.Client.Handler } + diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs index dea5316d25..66cff3bc65 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs @@ -21,12 +21,12 @@ using System; using System.Threading; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; -using Qpid.Protocol; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; +using Apache.Qpid.Protocol; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionCloseMethodHandler : IStateAwareMethodListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs index bd8fac1127..038da15731 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs @@ -19,11 +19,11 @@ * */ using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionCloseOkHandler : IStateAwareMethodListener { @@ -38,3 +38,4 @@ namespace Qpid.Client.Handler } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs index b43e2700f6..a12e4ead60 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs @@ -18,10 +18,10 @@ * under the License. * */ -using Qpid.Client.Protocol; -using Qpid.Client.State; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionOpenOkMethodHandler : IStateAwareMethodListener { @@ -32,3 +32,4 @@ namespace Qpid.Client.Handler } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs index 0639d66028..08cc580b17 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs @@ -19,10 +19,10 @@ * */ using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionRedirectMethodHandler : IStateAwareMethodListener { @@ -65,3 +65,4 @@ namespace Qpid.Client.Handler } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs index fe123e6745..9333d4d0a6 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs @@ -18,12 +18,12 @@ * under the License. * */ -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; -using Qpid.Sasl; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; +using Apache.Qpid.Sasl; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionSecureMethodHandler : IStateAwareMethodListener { @@ -57,3 +57,4 @@ namespace Qpid.Client.Handler } + diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs index 3cb7c76e23..1710c19080 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs @@ -22,14 +22,14 @@ using System; using System.Collections; using System.Text; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.Security; -using Qpid.Client.State; -using Qpid.Framing; -using Qpid.Sasl; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.Security; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; +using Apache.Qpid.Sasl; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionStartMethodHandler : IStateAwareMethodListener { @@ -73,7 +73,7 @@ namespace Qpid.Client.Handler stateManager.ChangeState(AMQState.CONNECTION_NOT_TUNED); FieldTable clientProperties = new FieldTable(); - clientProperties["product"] = "Qpid.NET"; + clientProperties["product"] = "Apache.Qpid.NET"; clientProperties["version"] = "1.0"; clientProperties["platform"] = GetFullSystemInfo(); AMQFrame frame = ConnectionStartOkBody.CreateAMQFrame( diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs index afcbd26781..15a1d908b7 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs @@ -20,11 +20,11 @@ */ using System; using log4net; -using Qpid.Client.Protocol; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Handler +namespace Apache.Qpid.Client.Handler { public class ConnectionTuneMethodHandler : IStateAwareMethodListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs index 9a67b69834..7290d758f8 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs @@ -19,12 +19,12 @@ *
*/
using log4net;
-using Qpid.Client.Message;
-using Qpid.Client.Protocol;
-using Qpid.Client.State;
-using Qpid.Framing;
+using Apache.Qpid.Client.Message;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Client.State;
+using Apache.Qpid.Framing;
-namespace Qpid.Client.Handler
+namespace Apache.Qpid.Client.Handler
{
public class QueueDeleteOkMethodHandler : IStateAwareMethodListener
{
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs index 59e7db34ab..8bde707b00 100644 --- a/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs @@ -19,12 +19,12 @@ *
*/
using log4net;
-using Qpid.Client.Message;
-using Qpid.Client.Protocol;
-using Qpid.Client.State;
-using Qpid.Framing;
+using Apache.Qpid.Client.Message;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Client.State;
+using Apache.Qpid.Framing;
-namespace Qpid.Client.Handler
+namespace Apache.Qpid.Client.Handler
{
public class QueuePurgeOkMethodHandler : IStateAwareMethodListener
{
diff --git a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs index a43eb028df..e58de2ab96 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class AMQMessage { diff --git a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs index a7ee085a04..f352d62c11 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs @@ -19,11 +19,11 @@ * */ using System.Collections; -using Qpid.Framing; +using Apache.Qpid.Framing; using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public abstract class AbstractQmsMessageFactory : IMessageFactory { diff --git a/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs index 7a28d7a85f..19f59a4fc1 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs @@ -22,11 +22,11 @@ using System; using System.Collections; using System.Text; using log4net; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public abstract class AbstractQmsMessage : AMQMessage, IMessage { @@ -326,7 +326,7 @@ namespace Qpid.Client.Message // is not specified. In our case, we only set the session field where client acknowledge mode is specified. if (_channel != null) { - // we set multiple to true here since acknowledgement implies acknowledge of all previous messages + // we set multiple to true here since acknowledgement implies acknowledge of all count messages // received on the session _channel.AcknowledgeMessage((ulong)DeliveryTag, true); } diff --git a/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs index cffc585067..bed379290f 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs @@ -19,9 +19,9 @@ * */ using System.Collections; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public interface IMessageFactory { @@ -49,3 +49,4 @@ namespace Qpid.Client.Message } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs index f854a541fc..fdb5e14aa6 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs @@ -20,10 +20,10 @@ */ using System; using System.Collections; -using Qpid.Framing; -using Qpid.Messaging; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class MessageFactoryRegistry { @@ -126,3 +126,4 @@ namespace Qpid.Client.Message } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs index cb504d1378..fb3efb1b0f 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs @@ -22,11 +22,11 @@ using System; using System.IO; using System.Runtime.Serialization; using System.Text; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { [Serializable] class MessageEOFException : QpidException diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs index e96c38cbac..3cc96cbddc 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs @@ -20,10 +20,10 @@ */ using System; using System.Collections; -using Qpid.Framing; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class QpidBytesMessageFactory : AbstractQmsMessageFactory { @@ -72,3 +72,4 @@ namespace Qpid.Client.Message } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs index a258c82d15..d27c1df853 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs @@ -1,10 +1,10 @@ using System; using System.Collections; using System.Text; -using Qpid.Framing; -using Qpid.Messaging; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { internal class QpidHeaders : IHeaders { diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs index ae8bdb2074..24aef92aa5 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs @@ -20,11 +20,11 @@ */ using System; using System.Text; -using Qpid.Framing; -using Qpid.Messaging; -using Qpid.Buffer; +using Apache.Qpid.Framing; +using Apache.Qpid.Messaging; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class QpidTextMessage : AbstractQmsMessage, ITextMessage { diff --git a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs index 4730fa56ad..79871e85ca 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs @@ -18,10 +18,10 @@ * under the License. * */ -using Qpid.Buffer; -using Qpid.Framing; +using Apache.Qpid.Buffer; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class QpidTextMessageFactory : AbstractQmsMessageFactory { diff --git a/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs index a671f608d1..4317ef3474 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; using log4net; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { /// <summary> /// Raised when a message body is received unexpectedly by the client. This typically occurs when the @@ -54,3 +54,4 @@ namespace Qpid.Client.Message } + diff --git a/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs index b64c8e1c27..d329712334 100644 --- a/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs +++ b/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs @@ -19,9 +19,9 @@ * */ using System.Collections; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Message +namespace Apache.Qpid.Client.Message { public class UnprocessedMessage { @@ -54,3 +54,4 @@ namespace Qpid.Client.Message } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs index ab40a83b3e..a7ce808862 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs @@ -20,9 +20,9 @@ */ using System; using System.Text; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public class AMQMethodEvent { @@ -73,3 +73,4 @@ namespace Qpid.Client.Protocol } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs index 2bf9f9a4c1..326afbe613 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs @@ -22,12 +22,12 @@ using System; using System.Collections; using System.Threading; using log4net; -using Qpid.Client.Failover; -using Qpid.Client.Protocol.Listener; -using Qpid.Client.State; -using Qpid.Framing; +using Apache.Qpid.Client.Failover; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Client.State; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public class AMQProtocolListener : IProtocolListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs index 0ca443e3bb..e0fa22e7a3 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs @@ -21,12 +21,12 @@ using System; using System.Collections; using log4net; -using Qpid.Client.Message; -using Qpid.Client.Transport; -using Qpid.Framing; -using Qpid.Sasl; +using Apache.Qpid.Client.Message; +using Apache.Qpid.Client.Transport; +using Apache.Qpid.Framing; +using Apache.Qpid.Sasl; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public class AMQProtocolSession { diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs index 0638bf0704..6841b46f54 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Client.Protocol
+namespace Apache.Qpid.Client.Protocol
{
/// <summary>
/// Default timeout values for the protocol
diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs index be8a24a9f4..e3298200c4 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs @@ -18,10 +18,10 @@ * under the License. * */ -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public interface IConnectionCloser { void Close(); } -}
\ No newline at end of file +} diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs index 6ac8a7537e..3b53f015f8 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs @@ -19,10 +19,10 @@ * */ using System; -using Qpid.Client.Protocol.Listener; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { public interface IProtocolListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs index a020efbf21..9cc9f8cee5 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs @@ -20,9 +20,9 @@ */ using System; using System.Threading; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol.Listener +namespace Apache.Qpid.Client.Protocol.Listener { public abstract class BlockingMethodFrameListener : IAMQMethodListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs index db82eb1013..b5450d00f7 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Protocol.Listener +namespace Apache.Qpid.Client.Protocol.Listener { public interface IAMQMethodListener { @@ -43,3 +43,4 @@ namespace Qpid.Client.Protocol.Listener } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs index 65460a0c2e..8cdc1dbba9 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Protocol.Listener +namespace Apache.Qpid.Client.Protocol.Listener { public class SpecificMethodFrameListener : BlockingMethodFrameListener { @@ -39,3 +39,4 @@ namespace Qpid.Client.Protocol.Listener } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs index 0ef337501e..11918f1ea2 100644 --- a/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs +++ b/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs @@ -19,13 +19,13 @@ * */ using System; -using Qpid.Client.Protocol.Listener; -using Qpid.Client.Transport; -using Qpid.Framing; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Client.Transport; +using Apache.Qpid.Framing; using log4net; -namespace Qpid.Client.Protocol +namespace Apache.Qpid.Client.Protocol { /// <summary> /// A convenient interface to writing protocol frames. @@ -104,3 +104,4 @@ namespace Qpid.Client.Protocol } } + diff --git a/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs index d88683f7d5..ede8966f37 100644 --- a/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs +++ b/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs @@ -24,9 +24,9 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using log4net; -using Qpid.Client.Qms; +using Apache.Qpid.Client.Qms; -namespace Qpid.Client +namespace Apache.Qpid.Client { public class URLHelper diff --git a/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs index 546bcec35a..85be927ff4 100644 --- a/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs +++ b/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs @@ -23,12 +23,12 @@ using System; using System.Collections;
using System.Configuration;
using System.Text;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-using Qpid.Client.Configuration;
+using Apache.Qpid.Client.Configuration;
-namespace Qpid.Client.Security
+namespace Apache.Qpid.Client.Security
{
/// <summary>
@@ -55,12 +55,12 @@ namespace Qpid.Client.Security /// <configuration>
/// <configSections>
/// <sectionGroup name="qpid.client">
- /// <section name="authentication" type="Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Qpid.Client"/>
+ /// <section name="authentication" type="Apache.Qpid.Client.Configuration.AuthenticationConfigurationSectionHandler, Apache.Qpid.Client"/>
/// </sectionGroup>
/// </configSections>
/// <qpid.client>
/// <authentication>
- /// <add key="TEST" value="Qpid.Client.Tests.Security.TestCallbackHandler, Qpid.Client.Tests"/>
+ /// <add key="TEST" value="Apache.Qpid.Client.Tests.Security.TestCallbackHandler, Apache.Qpid.Client.Tests"/>
/// </authentication>
/// </qpid.client>
/// </configuration>
diff --git a/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs index 6802b90cee..2560c1d96b 100644 --- a/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs @@ -20,10 +20,10 @@ */
using System;
using System.Text;
-using Qpid.Client.Protocol;
-using Qpid.Sasl;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Sasl;
-namespace Qpid.Client.Security
+namespace Apache.Qpid.Client.Security
{
public interface IAMQCallbackHandler : ISaslCallbackHandler
{
@@ -32,3 +32,4 @@ namespace Qpid.Client.Security }
+
diff --git a/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs index a14139496c..489d4d1665 100644 --- a/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs @@ -22,10 +22,10 @@ using System;
using System.Collections;
using System.Text;
-using Qpid.Client.Protocol;
-using Qpid.Sasl;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Sasl;
-namespace Qpid.Client.Security
+namespace Apache.Qpid.Client.Security
{
internal class UsernamePasswordCallbackHandler : IAMQCallbackHandler
{
diff --git a/qpid/dotnet/Qpid.Client/Client/SslOptions.cs b/qpid/dotnet/Qpid.Client/Client/SslOptions.cs index a6488d99ea..d637101000 100644 --- a/qpid/dotnet/Qpid.Client/Client/SslOptions.cs +++ b/qpid/dotnet/Qpid.Client/Client/SslOptions.cs @@ -21,7 +21,7 @@ using System;
using System.Security.Cryptography.X509Certificates;
-namespace Qpid.Client
+namespace Apache.Qpid.Client
{
/// <summary>
/// Configures SSL-related options to connect to an AMQP broker.
diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs index fc71fe647c..67f8427fb2 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public enum AMQState { @@ -32,3 +32,4 @@ namespace Qpid.Client.State } } + diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs index 60d44da824..a464bbb6f5 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public class AMQStateChangedEvent { diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs index 9ce6d3c76a..881e01e697 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs @@ -21,12 +21,12 @@ using System; using System.Collections; using log4net; -using Qpid.Client.Handler; -using Qpid.Client.Protocol; -using Qpid.Client.Protocol.Listener; -using Qpid.Framing; +using Apache.Qpid.Client.Handler; +using Apache.Qpid.Client.Protocol; +using Apache.Qpid.Client.Protocol.Listener; +using Apache.Qpid.Framing; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public class AMQStateManager : IAMQMethodListener { diff --git a/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs index ff27cd841e..31e4b5046d 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public interface IAMQStateListener { @@ -26,3 +26,4 @@ namespace Qpid.Client.State } } + diff --git a/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs index 256fe1c3f3..0874f39665 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Client.Protocol; +using Apache.Qpid.Client.Protocol; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public interface IStateAwareMethodListener { @@ -28,3 +28,4 @@ namespace Qpid.Client.State } } + diff --git a/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs index 6073b2bb0c..edd7382f93 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public interface IStateListener { @@ -30,3 +30,4 @@ namespace Qpid.Client.State } } + diff --git a/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs b/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs index 86b625951e..81de622617 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { [Serializable] public class IllegalStateTransitionException : AMQException @@ -71,3 +71,4 @@ namespace Qpid.Client.State } + diff --git a/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs b/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs index 34667da744..e739d0cb44 100644 --- a/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs +++ b/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs @@ -20,10 +20,10 @@ */ using System; using System.Threading; -using Qpid.Client.Protocol; +using Apache.Qpid.Client.Protocol; using log4net; -namespace Qpid.Client.State +namespace Apache.Qpid.Client.State { public class StateWaiter : IStateListener { diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs index 1024fa5575..dd0bb404cb 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs @@ -18,11 +18,11 @@ * under the License. * */ -using Qpid.Codec; -using Qpid.Codec.Demux; -using Qpid.Framing; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Demux; +using Apache.Qpid.Framing; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public class AMQProtocolProvider { diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs index e23037d1de..dc72846bbe 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs @@ -21,12 +21,12 @@ using System; using System.Collections; using log4net; -using Qpid.Buffer; -using Qpid.Codec; -using Qpid.Codec.Support; -using Qpid.Framing; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Support; +using Apache.Qpid.Framing; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public class AmqpChannel : IProtocolChannel { @@ -108,3 +108,4 @@ namespace Qpid.Client.Transport } } + diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs index 0f8f341d48..35806f2a6e 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { /// <summary> /// Represents input/output channels that read diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs index e4d4d2ed29..0b59ee8799 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs @@ -21,7 +21,7 @@ using System; using System.Collections; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public interface IProtocolChannel : IProtocolWriter { diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs index ac19977927..592dff3a19 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs @@ -18,12 +18,12 @@ * under the License. * */ -using Qpid.Framing; +using Apache.Qpid.Framing; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public interface IProtocolWriter { void Write(IDataBlock o); } -}
\ No newline at end of file +} diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs index 409b428c01..7195b3ab04 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs @@ -20,7 +20,7 @@ */
using System.IO;
-namespace Qpid.Client.Transport
+namespace Apache.Qpid.Client.Transport
{
/// <summary>
/// Defines a way to introduce an arbitrary filtering
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs index 3d918693bc..693a9a9534 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs @@ -18,10 +18,10 @@ * under the License. * */ -using Qpid.Client.Qms; -using Qpid.Client.Protocol; +using Apache.Qpid.Client.Qms; +using Apache.Qpid.Client.Protocol; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public interface ITransport : IConnectionCloser { diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs index 8d1f04f662..556f9631b3 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs @@ -22,10 +22,10 @@ using System; using System.IO;
using System.Threading;
using log4net;
-using Qpid.Buffer;
-using Qpid.Client.Protocol;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Client.Protocol;
-namespace Qpid.Client.Transport
+namespace Apache.Qpid.Client.Transport
{
/// <summary>
/// Responsible for reading and writing
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs index 07df62ea84..357aab0f45 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs @@ -20,12 +20,12 @@ */
using System;
using System.Threading;
-using Qpid.Client.Protocol;
-using Qpid.Codec;
-using Qpid.Framing;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Framing;
using log4net;
-namespace Qpid.Client.Transport
+namespace Apache.Qpid.Client.Transport
{
/// <summary>
/// <see cref="IProtocolDecoderOutput"/> implementation that forwards
@@ -55,5 +55,6 @@ namespace Qpid.Client.Transport }
}
}
-} // namespace Qpid.Client.Transport
+} // namespace Apache.Qpid.Client.Transport
+
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs index 5b5392769a..a1aa889ba0 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs @@ -19,10 +19,10 @@ * */ using System; -using Qpid.Buffer; -using Qpid.Codec; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; -namespace Qpid.Client.Transport +namespace Apache.Qpid.Client.Transport { public class SingleProtocolEncoderOutput : IProtocolEncoderOutput { @@ -37,4 +37,4 @@ namespace Qpid.Client.Transport buffer = buf; } } -}
\ No newline at end of file +} diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs index 2895c75431..8a16f9a675 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs @@ -22,12 +22,12 @@ using System; using System.Collections;
using System.IO;
using System.Threading;
-using Qpid.Client.Qms;
-using Qpid.Client.Protocol;
-using Qpid.Codec;
-using Qpid.Framing;
+using Apache.Qpid.Client.Qms;
+using Apache.Qpid.Client.Protocol;
+using Apache.Qpid.Codec;
+using Apache.Qpid.Framing;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
/// <summary>
/// TCP Socket transport supporting both
@@ -147,3 +147,4 @@ namespace Qpid.Client.Transport.Socket.Blocking }
}
+
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs index ff2c301a91..077f69541f 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs @@ -20,9 +20,9 @@ */
using System;
using log4net;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
class ByteChannel : IByteChannel
{
@@ -89,4 +89,4 @@ namespace Qpid.Client.Transport.Socket.Blocking _lowerChannel.EndWrite(result);
}
}
-}
\ No newline at end of file +}
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs index ac0dc37a16..3d5d2898cf 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs @@ -20,9 +20,9 @@ */
using System;
using System.IO;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
interface ISocketConnector : IDisposable
{
@@ -31,3 +31,4 @@ namespace Qpid.Client.Transport.Socket.Blocking }
}
+
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs index a651413581..83f7287e9b 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs @@ -21,9 +21,9 @@ using System.IO;
using System.Net;
using System.Net.Sockets;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
/// <summary>
/// Implements a TCP connection over regular sockets.
@@ -68,3 +68,4 @@ namespace Qpid.Client.Transport.Socket.Blocking }
}
+
diff --git a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs index 24c3f5bcb8..708edde48c 100644 --- a/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs +++ b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs @@ -21,12 +21,12 @@ using System.IO;
using System.Net;
using log4net;
-using Qpid.Client.Qms;
+using Apache.Qpid.Client.Qms;
using Org.Mentalis.Security.Ssl;
using MCertificate = Org.Mentalis.Security.Certificates.Certificate;
using MCertificateChain = Org.Mentalis.Security.Certificates.CertificateChain;
-namespace Qpid.Client.Transport.Socket.Blocking
+namespace Apache.Qpid.Client.Transport.Socket.Blocking
{
/// <summary>
/// Implements a TLS v1.0 connection using the Mentalis.org library
diff --git a/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs b/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs new file mode 100644 index 0000000000..87bb2a2859 --- /dev/null +++ b/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs @@ -0,0 +1,98 @@ +/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+using System;
+using System.Collections;
+using System.Text;
+using System.Threading;
+using Apache.Qpid.Collections;
+using Apache.Qpid.Common;
+
+namespace Apache.Qpid.Client.Util
+{
+ internal delegate void ThresholdMethod(int currentCount);
+
+ /// <summary>
+ /// Basic bounded queue used to implement prefetching.
+ /// Notice we do the callbacks here asynchronously to
+ /// avoid adding more complexity to the channel impl.
+ /// </summary>
+ internal class FlowControlQueue
+ {
+ private BlockingQueue _queue = new LinkedBlockingQueue();
+ private int _itemCount;
+ private int _lowerBound;
+ private int _upperBound;
+ private ThresholdMethod _underThreshold;
+ private ThresholdMethod _overThreshold;
+
+ public FlowControlQueue(
+ int lowerBound,
+ int upperBound,
+ ThresholdMethod underThreshold,
+ ThresholdMethod overThreshold
+ )
+ {
+ _lowerBound = lowerBound;
+ _upperBound = upperBound;
+ _underThreshold = underThreshold;
+ _overThreshold = overThreshold;
+ }
+
+ public void Enqueue(object item)
+ {
+ _queue.EnqueueBlocking(item);
+ int count = Interlocked.Increment(ref _itemCount);
+ if ( _overThreshold != null )
+ {
+ if ( count == _upperBound )
+ {
+ _overThreshold.BeginInvoke(
+ count, new AsyncCallback(OnAsyncCallEnd),
+ _overThreshold
+ );
+ }
+ }
+ }
+
+ public object Dequeue()
+ {
+ object item = _queue.DequeueBlocking();
+ int count = Interlocked.Decrement(ref _itemCount);
+ if ( _underThreshold != null )
+ {
+ if ( count == _lowerBound )
+ {
+ _underThreshold.BeginInvoke(
+ count, new AsyncCallback(OnAsyncCallEnd),
+ _underThreshold
+ );
+ }
+ }
+ return item;
+ }
+
+ private void OnAsyncCallEnd(IAsyncResult res)
+ {
+ ThresholdMethod method = (ThresholdMethod)res.AsyncState;
+ method.EndInvoke(res);
+ }
+ }
+}
diff --git a/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs index 0c7da88839..8722a02db9 100644 --- a/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs @@ -23,11 +23,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.Client")] +[assembly: AssemblyTitle("Apache.Qpid.Client")] [assembly: AssemblyDescription("Qpid Client API implementation")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("")] +[assembly: AssemblyProduct("Apache.Qpid.Client")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj index e7c05ffebc..9294d76764 100644 --- a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj +++ b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{68987C05-3768-452C-A6FC-6BA1D372852F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Client</RootNamespace>
- <AssemblyName>Qpid.Client</AssemblyName>
+ <RootNamespace>Apache.Qpid.Client</RootNamespace>
+ <AssemblyName>Apache.Qpid.Client</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -120,6 +120,7 @@ <Compile Include="Client\Transport\Socket\Blocking\SslSocketConnector.cs" />
<Compile Include="Client\Transport\Socket\Blocking\SocketConnector.cs" />
<Compile Include="Client\Transport\Socket\Blocking\ISocketConnector.cs" />
+ <Compile Include="Client\Util\FlowControlQueue.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="qms\BrokerInfo.cs" />
<Compile Include="qms\ConnectionInfo.cs" />
@@ -159,4 +160,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Client/default.build b/qpid/dotnet/Qpid.Client/default.build index 5d09b3c011..14e457203e 100644 --- a/qpid/dotnet/Qpid.Client/default.build +++ b/qpid/dotnet/Qpid.Client/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<project name="Qpid.Client" default="build"> +<project name="Apache.Qpid.Client" default="build"> <!-- Properties that come from master build file - build.dir: root directory for build @@ -18,12 +18,12 @@ </sources> <references> <include name="${build.dir}/log4net.dll" /> - <include name="${build.dir}/Qpid.Buffer.dll" /> - <include name="${build.dir}/Qpid.Sasl.dll" /> - <include name="${build.dir}/Qpid.Codec.dll" /> - <include name="${build.dir}/Qpid.Common.dll" /> - <include name="${build.dir}/Qpid.Messaging.dll" /> - <include name="${build.dir}/Org.Mentalis.Security.dll" /> + <include name="${build.dir}/Apache.Qpid.Buffer.dll" /> + <include name="${build.dir}/Apache.Qpid.Sasl.dll" /> + <include name="${build.dir}/Apache.Qpid.Codec.dll" /> + <include name="${build.dir}/Apache.Qpid.Common.dll" /> + <include name="${build.dir}/Apache.Qpid.Messaging.dll" /> + <include name="${build.dir}/Org.Mentalis.Security.dll" /> </references> </csc> </target> diff --git a/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs b/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs index 3097e01149..93c00af6e0 100644 --- a/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs +++ b/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { /// <summary> /// Know URL option names. diff --git a/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs index 4bdf8f4d7c..4d3f7698b5 100644 --- a/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs +++ b/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs @@ -20,7 +20,7 @@ */ using System.Collections; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { class ConnectionUrlConstants { diff --git a/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs index 99ab3dc66e..d5d1e8d8ac 100644 --- a/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs +++ b/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs @@ -21,9 +21,9 @@ using System; using System.Text; using log4net; -using Qpid.Client.Qms.Failover; +using Apache.Qpid.Client.Qms.Failover; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { public class FailoverPolicy { diff --git a/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs index dc0c06c22f..ab3de325d4 100644 --- a/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs +++ b/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; using System.Text; -namespace Qpid.Client.Qms +namespace Apache.Qpid.Client.Qms { [Serializable] public class UrlSyntaxException : UriFormatException diff --git a/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs index 076c62a6d6..f32b275e84 100644 --- a/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs +++ b/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Qms.Failover +namespace Apache.Qpid.Client.Qms.Failover { public class FailoverMethodConstants { diff --git a/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs index 4e6b23ce86..8103940fb4 100644 --- a/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs +++ b/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs @@ -22,7 +22,7 @@ using System; using System.Text; using log4net; -namespace Qpid.Client.Qms.Failover +namespace Apache.Qpid.Client.Qms.Failover { public class FailoverRoundRobin : IFailoverMethod { diff --git a/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs index 18907df3c2..5e502b897e 100644 --- a/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs +++ b/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Client.Qms.Failover +namespace Apache.Qpid.Client.Qms.Failover { public class FailoverSingleServer : IFailoverMethod { diff --git a/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs index 3d454b284b..6cfd75c851 100644 --- a/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs +++ b/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs @@ -20,9 +20,9 @@ */ using System; using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public abstract class CumulativeProtocolDecoder : IProtocolDecoder { diff --git a/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs index 27095bd32d..78276202d6 100644 --- a/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs +++ b/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs @@ -20,9 +20,9 @@ */ using System; using System.Collections; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public class DemuxingProtocolCodecFactory : IProtocolCodecFactory { @@ -384,3 +384,4 @@ namespace Qpid.Codec.Demux } + diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs index 686544c78b..5892673440 100644 --- a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs +++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageDecoder { @@ -53,3 +53,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs index 418b5cf7e4..9e333d670f 100644 --- a/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs +++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageDecoderFactory { @@ -29,3 +29,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs index 7c1d117ad5..75ae23592b 100644 --- a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs +++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs @@ -21,7 +21,7 @@ using System; using System.Collections; -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageEncoder { @@ -45,3 +45,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs index b8996e1853..3001d1a963 100644 --- a/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs +++ b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public interface IMessageEncoderFactory { @@ -29,3 +29,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs b/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs index 689d305919..ab01864bc0 100644 --- a/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs +++ b/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec.Demux +namespace Apache.Qpid.Codec.Demux { public enum MessageDecoderResult { @@ -26,3 +26,4 @@ namespace Qpid.Codec.Demux } } + diff --git a/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs index fe4ccc7fde..a26b91b16c 100644 --- a/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs +++ b/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolCodecFactory { @@ -34,3 +34,4 @@ namespace Qpid.Codec } } + diff --git a/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs index 54317c3d07..3cccb0f7da 100644 --- a/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs +++ b/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolDecoder : IDisposable { @@ -38,3 +38,4 @@ namespace Qpid.Codec } } + diff --git a/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs index 5862b36aed..77a1aea9db 100644 --- a/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs +++ b/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolDecoderOutput { @@ -32,3 +32,4 @@ namespace Qpid.Codec } } + diff --git a/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs index aab803d3d6..a16f2ad9d6 100644 --- a/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs +++ b/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs @@ -20,7 +20,7 @@ */ using System; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolEncoder : IDisposable { @@ -38,3 +38,4 @@ namespace Qpid.Codec } } + diff --git a/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs index 12b9d68885..70f9be38dc 100644 --- a/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs +++ b/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { public interface IProtocolEncoderOutput { @@ -34,3 +34,4 @@ namespace Qpid.Codec } } + diff --git a/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs index 515e5f2998..aa1d6a662e 100644 --- a/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs @@ -23,11 +23,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("Mina.Codec")] +[assembly: AssemblyTitle("Apache.Qpid.Codec")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Mina.Codec")] +[assembly: AssemblyProduct("Apache.Qpid.Codec")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs b/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs index a7d7bd9cb2..49678d2c11 100644 --- a/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs +++ b/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { [Serializable] public class ProtocolCodecException : Exception @@ -46,3 +46,4 @@ namespace Qpid.Codec } + diff --git a/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs index 562145288c..8e7e6da145 100644 --- a/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs +++ b/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { [Serializable] public class ProtocolDecoderException : ProtocolCodecException @@ -67,3 +67,4 @@ namespace Qpid.Codec } + diff --git a/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs index 801cacbd54..ac565a308b 100644 --- a/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs +++ b/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs @@ -21,7 +21,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Codec +namespace Apache.Qpid.Codec { [Serializable] public class ProtocolEncoderException : ProtocolCodecException @@ -46,3 +46,4 @@ namespace Qpid.Codec } + diff --git a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj index a67d2d6a1b..ebe4681397 100644 --- a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj +++ b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{22D0D0C2-77AF-4DE3-B456-7FF3893F9F88}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Codec</RootNamespace>
- <AssemblyName>Qpid.Codec</AssemblyName>
+ <RootNamespace>Apache.Qpid.Codec</RootNamespace>
+ <AssemblyName>Apache.Qpid.Codec</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -70,4 +70,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs index bb5d377ad9..0a4ff10ff0 100644 --- a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs +++ b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs @@ -20,7 +20,7 @@ */ using System.Collections; -namespace Qpid.Codec.Support +namespace Apache.Qpid.Codec.Support { public class SimpleProtocolDecoderOutput : IProtocolDecoderOutput { @@ -41,3 +41,4 @@ namespace Qpid.Codec.Support } } + diff --git a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs index 1e4d437d1c..2e4224ef98 100644 --- a/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs +++ b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs @@ -19,9 +19,9 @@ * */ using System.Collections; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Codec.Support +namespace Apache.Qpid.Codec.Support { public abstract class SimpleProtocolEncoderOutput : IProtocolEncoderOutput { diff --git a/qpid/dotnet/Qpid.Codec/default.build b/qpid/dotnet/Qpid.Codec/default.build index 6b4decf1b7..db9e8d1166 100644 --- a/qpid/dotnet/Qpid.Codec/default.build +++ b/qpid/dotnet/Qpid.Codec/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Codec" default="build">
+<project name="Apache.Qpid.Codec" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
@@ -18,7 +18,7 @@ </sources>
<references>
<include name="${build.dir}/log4net.dll" />
- <include name="${build.dir}/Qpid.Buffer.dll" />
+ <include name="${build.dir}/Apache.Qpid.Buffer.dll" />
</references>
</csc>
</target>
diff --git a/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs index 9a602e21b6..32dcae60ae 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs @@ -3,11 +3,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.Common.Tests")] +[assembly: AssemblyTitle("Apache.Qpid.Common.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("Qpid.Common.Tests")] +[assembly: AssemblyProduct("Apache.Qpid.Common.Tests")] [assembly: AssemblyCopyright("Copyright (c) 2006 The Apache Software Foundation")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj index 30cb56fba1..b51faf92c7 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj +++ b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{F83624B0-762B-4D82-900D-FF4C1B36E36E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Common.Tests</RootNamespace>
- <AssemblyName>Qpid.Common.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Common.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -62,4 +62,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs index 1a400aab68..03ed999999 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs +++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs @@ -23,9 +23,9 @@ using System.Collections; using System.Text;
using System.Threading;
using NUnit.Framework;
-using Qpid.Collections;
+using Apache.Qpid.Collections;
-namespace Qpid.Collections.Tests
+namespace Apache.Qpid.Collections.Tests
{
[TestFixture]
public class TestConsumerProducerQueue
diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs index cd3f730ab5..dbbc98a2e6 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs +++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs @@ -23,7 +23,7 @@ using System.Collections; using System.Text; using NUnit.Framework; -namespace Qpid.Collections +namespace Apache.Qpid.Collections { [TestFixture] public class TestLinkedHashtable diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs index f5ff30182d..ab4cb4409c 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs +++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs @@ -20,10 +20,10 @@ */
using System;
using NUnit.Framework;
-using Qpid.Buffer;
-using Qpid.Framing;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Framing;
-namespace Qpid.Framing.Tests
+namespace Apache.Qpid.Framing.Tests
{
[TestFixture]
public class TestAMQType
diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs index 7c6615ed1e..720d7697d3 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs +++ b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs @@ -20,10 +20,10 @@ */
using System;
using NUnit.Framework;
-using Qpid.Buffer;
-using Qpid.Framing;
+using Apache.Qpid.Buffer;
+using Apache.Qpid.Framing;
-namespace Qpid.Framing.Tests
+namespace Apache.Qpid.Framing.Tests
{
[TestFixture]
public class TestEncodingUtils
diff --git a/qpid/dotnet/Qpid.Common.Tests/default.build b/qpid/dotnet/Qpid.Common.Tests/default.build index 8a087b3ddb..00658bdbe2 100644 --- a/qpid/dotnet/Qpid.Common.Tests/default.build +++ b/qpid/dotnet/Qpid.Common.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Common" default="test">
+<project name="Apache.Qpid.Common" default="test">
<target name="build">
<csc target="library"
@@ -14,9 +14,9 @@ <include name="${build.dir}/log4net.dll" />
<include name="${build.dir}/nunit.framework.dll" />
<include name="${build.dir}/${project::get-name()}.dll" />
- <include name="${build.dir}/Qpid.Codec.dll" />
- <include name="${build.dir}/Qpid.Messaging.dll" />
- <include name="${build.dir}/Qpid.Buffer.dll" />
+ <include name="${build.dir}/Apache.Qpid.Codec.dll" />
+ <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
+ <include name="${build.dir}/Apache.Qpid.Buffer.dll" />
</references>
</csc>
diff --git a/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs b/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs index 77d8c06802..98c6966cd1 100644 --- a/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs +++ b/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid +namespace Apache.Qpid { [Serializable] public class AMQChannelClosedException : AMQException diff --git a/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs b/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs index 977dcee73a..f3bc387a5c 100644 --- a/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs +++ b/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid +namespace Apache.Qpid { [Serializable] public class AMQConnectionClosedException : AMQException diff --git a/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs b/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs index 5ea9672839..b5c4d544cd 100644 --- a/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs +++ b/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid +namespace Apache.Qpid { [Serializable] public class AMQDisconnectedException : AMQException diff --git a/qpid/dotnet/Qpid.Common/AMQException.cs b/qpid/dotnet/Qpid.Common/AMQException.cs index 4c9c46946e..f9f7158a26 100644 --- a/qpid/dotnet/Qpid.Common/AMQException.cs +++ b/qpid/dotnet/Qpid.Common/AMQException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; using log4net; -namespace Qpid +namespace Apache.Qpid { /// <summary> /// The generic AMQ exception. diff --git a/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs index 2220c3152a..0fb4ddae99 100644 --- a/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs +++ b/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs @@ -22,9 +22,9 @@ using System;
using System.Runtime.Serialization;
-using Qpid.Protocol;
+using Apache.Qpid.Protocol;
-namespace Qpid
+namespace Apache.Qpid
{
/// <summary>
/// Thrown when an invalid argument was supplied to the broker
diff --git a/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs index 962211de04..3f8dead94d 100644 --- a/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs +++ b/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs @@ -22,9 +22,9 @@ using System;
using System.Runtime.Serialization;
-using Qpid.Protocol;
+using Apache.Qpid.Protocol;
-namespace Qpid
+namespace Apache.Qpid
{
/// <summary>
/// Thrown when an invalid routing key was sent to the broker
diff --git a/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs b/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs index 225a94e9b8..70ad86c8a3 100644 --- a/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs +++ b/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid +namespace Apache.Qpid { /// <summary> /// Thrown when a message has been bounced by the broker, indicating it could not be delivered. diff --git a/qpid/dotnet/Qpid.Common/AssemblySettings.cs b/qpid/dotnet/Qpid.Common/AssemblySettings.cs index ee07c88659..888de692e8 100644 --- a/qpid/dotnet/Qpid.Common/AssemblySettings.cs +++ b/qpid/dotnet/Qpid.Common/AssemblySettings.cs @@ -27,7 +27,7 @@ using System.Runtime.CompilerServices; using System.Xml; using log4net; -namespace Qpid.Common +namespace Apache.Qpid.Common { /// <summary> /// diff --git a/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs index 71fc9bf518..dcfacf8474 100644 --- a/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs +++ b/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs @@ -21,7 +21,7 @@ using System; using System.Collections; -namespace Qpid.Collections +namespace Apache.Qpid.Collections { public abstract class BlockingQueue : Queue { @@ -92,3 +92,4 @@ namespace Qpid.Collections } } + diff --git a/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs index 1e21284608..ea4526faaf 100644 --- a/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs +++ b/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs @@ -23,7 +23,7 @@ using System.Collections; using System.Threading;
-namespace Qpid.Collections
+namespace Apache.Qpid.Collections
{
/// <summary>
/// Simple FIFO queue to support multi-threaded consumer
diff --git a/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs index 9678464989..be92576951 100644 --- a/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs +++ b/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs @@ -21,7 +21,7 @@ using System; using System.Threading; -namespace Qpid.Collections +namespace Apache.Qpid.Collections { public class LinkedBlockingQueue : BlockingQueue { @@ -381,3 +381,4 @@ namespace Qpid.Collections } } + diff --git a/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs index c08d4a9197..10ab5c674d 100644 --- a/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs +++ b/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs @@ -21,7 +21,7 @@ using System; using System.Collections; -namespace Qpid.Collections +namespace Apache.Qpid.Collections { public class LinkedHashtable : IDictionary { diff --git a/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs index c559a37b44..3c12df6067 100644 --- a/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs +++ b/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs @@ -21,7 +21,7 @@ using System; using System.Threading; -namespace Qpid.Collections +namespace Apache.Qpid.Collections { public class SynchronousQueue : BlockingQueue { diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs index 1c1080bdcb..7867650e50 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs @@ -21,11 +21,11 @@ using System; using System.Collections; using log4net; -using Qpid.Buffer; -using Qpid.Codec; -using Qpid.Codec.Demux; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Demux; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class AMQDataBlockDecoder : IMessageDecoder { diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs index b180e1ac95..e2645c630e 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs @@ -20,11 +20,11 @@ */ using System.Collections; using log4net; -using Qpid.Buffer; -using Qpid.Codec; -using Qpid.Codec.Demux; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Demux; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class AMQDataBlockEncoder : IMessageEncoder { diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs index 2708c331b3..912be72d30 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class AMQFrame : IDataBlock { diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs index 82891b5986..cda8c84ecf 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; using log4net; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// <summary> /// Thrown when a frame cannot be decoded. This generally indicates a mismatch between the broker and the diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs index 804e6a4039..a3c4337147 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public abstract class AMQMethodBody : IBody { diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs index a5c90f0fdd..c1fd3f887a 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class AMQMethodBodyFactory : IBodyFactory { diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs index 555cf1e6af..379e5d00ba 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { [Serializable] public class AMQProtocolHeaderException : AMQException diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQType.cs b/qpid/dotnet/Qpid.Common/Framing/AMQType.cs index 8743ea0ea5..618ab31d32 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQType.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQType.cs @@ -20,9 +20,9 @@ */
using System;
using System.Text;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
{
/// <summary>
/// Base class for the Field Table Type system.
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs index 56d0119a16..ed38c203a9 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs @@ -21,7 +21,7 @@ using System;
using System.Collections;
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
{
public sealed class AMQTypeMap
{
diff --git a/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs index 7fdabbaf6c..8d21a60831 100644 --- a/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs +++ b/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs @@ -19,9 +19,9 @@ *
*/
using System;
-using Qpid.Buffer;
+using Apache.Qpid.Buffer;
-namespace Qpid.Framing
+namespace Apache.Qpid.Framing
{
public class AMQTypedValue
{
diff --git a/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs index 0c06a01eb4..47db7b0887 100644 --- a/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs +++ b/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs @@ -20,10 +20,10 @@ */ using System; using log4net; -using Qpid.Buffer; -using Qpid.Messaging; +using Apache.Qpid.Buffer; +using Apache.Qpid.Messaging; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class BasicContentHeaderProperties : IContentHeaderProperties { diff --git a/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs index 19d12b8039..d2b7f606b2 100644 --- a/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs +++ b/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs @@ -19,9 +19,9 @@ * */ using System.Text; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class CompositeAMQDataBlock : IDataBlock, IEncodableAMQDataBlock { diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs index 617086f2e8..7a2142985d 100644 --- a/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs +++ b/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class ContentBody : IBody { diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs index ec0e89b421..400b2aec08 100644 --- a/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs +++ b/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs @@ -19,9 +19,9 @@ * */ using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class ContentBodyFactory : IBodyFactory { diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs index 29ec46c0fb..82889c23c8 100644 --- a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs +++ b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs @@ -19,9 +19,9 @@ * */ using System; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class ContentHeaderBody : IBody { diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs index 27cc5aeb04..c95a10871d 100644 --- a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs +++ b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs @@ -19,9 +19,9 @@ * */ using log4net; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class ContentHeaderBodyFactory : IBodyFactory { diff --git a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs index 16a24d6b92..bac5d10fd4 100644 --- a/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs +++ b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class ContentHeaderPropertiesFactory { diff --git a/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs b/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs index 6dc973a672..4d424656f9 100644 --- a/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs +++ b/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs @@ -21,9 +21,9 @@ using System; using System.Globalization; using System.Text; -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class EncodingUtils { diff --git a/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs b/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs index adff817923..6567bf58ab 100644 --- a/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs +++ b/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs @@ -22,11 +22,11 @@ using System; using System.Collections; using System.Text; using log4net; -using Qpid.Buffer; -using Qpid.Collections; -using Qpid.Messaging; +using Apache.Qpid.Buffer; +using Apache.Qpid.Collections; +using Apache.Qpid.Messaging; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class FieldTable : IFieldTable, IEnumerable { diff --git a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs index 3fdaa7e850..a8906f5ba8 100644 --- a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs +++ b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class HeartbeatBody : IBody { diff --git a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs index 1e62f26c0d..90e5c7768e 100644 --- a/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs +++ b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class HeartbeatBodyFactory : IBodyFactory { diff --git a/qpid/dotnet/Qpid.Common/Framing/IBody.cs b/qpid/dotnet/Qpid.Common/Framing/IBody.cs index cc0dbd9b59..97b4459e5c 100644 --- a/qpid/dotnet/Qpid.Common/Framing/IBody.cs +++ b/qpid/dotnet/Qpid.Common/Framing/IBody.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// <summary> /// An IBody is contained within a top level frame. As such, it is not en/decodable on its own but diff --git a/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs index 4f6bc7155e..dd7960ddbe 100644 --- a/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs +++ b/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// <summary> /// Any class that is capable of turning a stream of bytes into an AMQ structure must implement this interface. diff --git a/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs index df38738f1d..676d0910d4 100644 --- a/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs +++ b/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// <summary> /// There will be an implementation of this interface for each content type. All content types have associated diff --git a/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs index 57b2a8ed37..c61ed90d10 100644 --- a/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs +++ b/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs @@ -18,9 +18,9 @@ * under the License. * */ -using Qpid.Buffer; +using Apache.Qpid.Buffer; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// <summary> /// A data block represents something that has a size in bytes and the ability to write itself to a byte diff --git a/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs index 1d81d5ea82..da8bf9fef9 100644 --- a/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs +++ b/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs @@ -18,7 +18,7 @@ * under the License. * */ -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// <summary> diff --git a/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs index 280242513c..a9f5697144 100644 --- a/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs +++ b/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs @@ -24,12 +24,12 @@ using System.Configuration; using System.Reflection; using System.Xml; using log4net; -using Qpid.Buffer; -using Qpid.Codec; -using Qpid.Codec.Demux; -using Qpid.Common; +using Apache.Qpid.Buffer; +using Apache.Qpid.Codec; +using Apache.Qpid.Codec.Demux; +using Apache.Qpid.Common; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { public class ProtocolInitiation : IDataBlock, IEncodableAMQDataBlock { diff --git a/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs index 3fea400217..e876015bc3 100644 --- a/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs @@ -23,11 +23,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.Common")] +[assembly: AssemblyTitle("Apache.Qpid.Common")] [assembly: AssemblyDescription("Common AMQ Framing Code")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Qpid")] -[assembly: AssemblyProduct("")] +[assembly: AssemblyProduct("Apache.Qpid.Common")] [assembly: AssemblyCopyright("Copyright © J.P. Morgan Chase & Co. 2006")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs index 04b4011567..fcf94c29f4 100644 --- a/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs +++ b/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs @@ -21,7 +21,7 @@ using System;
using System.Collections;
-namespace Qpid.Protocol
+namespace Apache.Qpid.Protocol
{
public sealed class AMQConstant
{
diff --git a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj index 9cce677d66..d15c1887b7 100644 --- a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj +++ b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid</RootNamespace>
- <AssemblyName>Qpid.Common</AssemblyName>
+ <RootNamespace>Apache.Qpid</RootNamespace>
+ <AssemblyName>Apache.Qpid.Common</AssemblyName>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
@@ -210,4 +210,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Common/default.build b/qpid/dotnet/Qpid.Common/default.build index dd9ad20f62..36055b9ca9 100644 --- a/qpid/dotnet/Qpid.Common/default.build +++ b/qpid/dotnet/Qpid.Common/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<project name="Qpid.Common" default="build"> +<project name="Apache.Qpid.Common" default="build"> <!-- Properties that come from master build file - build.dir: root directory for build @@ -18,9 +18,9 @@ </sources> <references> <include name="${build.dir}/log4net.dll" /> - <include name="${build.dir}/Qpid.Buffer.dll" /> - <include name="${build.dir}/Qpid.Messaging.dll" /> - <include name="${build.dir}/Qpid.Codec.dll" /> + <include name="${build.dir}/Apache.Qpid.Buffer.dll" /> + <include name="${build.dir}/Apache.Qpid.Messaging.dll" /> + <include name="${build.dir}/Apache.Qpid.Codec.dll" /> </references> </csc> </target> diff --git a/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl b/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl index 588ac3145f..674c971559 100644 --- a/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl +++ b/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl @@ -34,10 +34,10 @@ <!-- main class generation template --> <xsl:template name="generate-class"> <xsl:param name="f"/> -using Qpid.Buffer; +using Apache.Qpid.Buffer; using System.Text; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /// /// <summary>This class is autogenerated @@ -147,7 +147,7 @@ using System; using System.Collections; using log4net; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { @@ -202,7 +202,7 @@ namespace Qpid.Framing <xsl:result-document href="{$file}" format="textFormat"> using System.Collections; -namespace Qpid.Framing +namespace Apache.Qpid.Framing { /** * This class is autogenerated, do not modify. [From <xsl:value-of select="@protocol"/>] 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
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/App.config b/qpid/dotnet/Qpid.Sasl.Tests/App.config index 0e7e903e02..539f341e7c 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/App.config +++ b/qpid/dotnet/Qpid.Sasl.Tests/App.config @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
- <section name="qpid.sasl" type="Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Qpid.Sasl"/>
+ <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>
</configSections>
<qpid.sasl>
<clientFactories>
- <add type="Qpid.Sasl.Tests.TestClientFactory, Qpid.Sasl.Tests"/>
+ <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>
</clientFactories>
</qpid.sasl>
</configuration>
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs index 6c906d7f1b..09260736f0 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class AnonymousSaslClientTests : ISaslCallbackHandler
@@ -69,4 +69,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class AnonymousSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs index b5c9935d10..e8b0ae5468 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class CramMD5SaslClientTests : ISaslCallbackHandler
@@ -87,4 +87,4 @@ namespace Qpid.Sasl.Tests.Mechanisms }
} // class CramMD5SaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs index 58e90c29eb..eb7e7ebbd5 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs @@ -25,10 +25,10 @@ using System.Collections.Specialized; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class DigestSaslClientTests : ISaslCallbackHandler
@@ -246,4 +246,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class DigestSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs index 1621f60c06..1864a6c957 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class ExternalSaslClientTests : ISaslCallbackHandler
@@ -68,4 +68,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class AnonymousSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs index 3f39c1980d..4c82f7b126 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests.Mechanisms
+namespace Apache.Qpid.Sasl.Tests.Mechanisms
{
[TestFixture]
public class PlainSaslClientTests : ISaslCallbackHandler
@@ -85,4 +85,4 @@ namespace Qpid.Sasl.Tests.Mechanisms } // class PlainSaslClientTests
-} // namespace Qpid.Sasl.Tests.Mechanisms
+} // namespace Apache.Qpid.Sasl.Tests.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs index f6728b1d1e..657b15e3ea 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,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.Sasl.Tests")]
+[assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Qpid.Sasl.Tests")]
+[assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj index b33174d2f0..8c807e2385 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj +++ b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{587B3520-EBB9-41ED-B019-E96116B651CE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Sasl.Tests</RootNamespace>
- <AssemblyName>Qpid.Sasl.Tests</AssemblyName>
+ <RootNamespace>Apache.Qpid.Sasl.Tests</RootNamespace>
+ <AssemblyName>Apache.Qpid.Sasl.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -64,4 +64,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs index 8d576c175a..5b27949b98 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests
+namespace Apache.Qpid.Sasl.Tests
{
[TestFixture]
public class SaslTests : ISaslCallbackHandler
@@ -130,4 +130,4 @@ namespace Qpid.Sasl.Tests } // class SaslTests
-} // namespace Qpid.Sasl.Tests
+} // namespace Apache.Qpid.Sasl.Tests
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs b/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs index f7b68adfcb..73c68ea2b3 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs @@ -24,10 +24,10 @@ using System.Collections; using System.Text;
using NUnit.Framework;
-using Qpid.Sasl;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl.Tests
+namespace Apache.Qpid.Sasl.Tests
{
public class TestClientFactory : ISaslClientFactory
{
@@ -72,4 +72,4 @@ namespace Qpid.Sasl.Tests }
} // class TestSaslClient
-} // namespace Qpid.Sasl.Tests
+} // namespace Apache.Qpid.Sasl.Tests
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/default.build b/qpid/dotnet/Qpid.Sasl.Tests/default.build index 272ccfe615..eb0514d417 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/default.build +++ b/qpid/dotnet/Qpid.Sasl.Tests/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Sasl" default="test">
+<project name="Apache.Qpid.Sasl" default="test">
<target name="build">
<csc target="library"
diff --git a/qpid/dotnet/Qpid.Sasl/Callbacks.cs b/qpid/dotnet/Qpid.Sasl/Callbacks.cs index 13ed6f784e..90e36beeb8 100644 --- a/qpid/dotnet/Qpid.Sasl/Callbacks.cs +++ b/qpid/dotnet/Qpid.Sasl/Callbacks.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Marker interface for Sasl Callbacks
@@ -101,5 +101,6 @@ namespace Qpid.Sasl }
} // class RealmCallback
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs index d5f428a52e..3446261724 100644 --- a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs +++ b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs @@ -25,7 +25,7 @@ using System.Configuration; using System.Text;
using System.Xml;
-namespace Qpid.Sasl.Configuration
+namespace Apache.Qpid.Sasl.Configuration
{
/// <summary>
/// Represents an Sasl configuration section
@@ -85,5 +85,6 @@ namespace Qpid.Sasl.Configuration } // class SaslConfiguration
-} // namespace Qpid.Sasl.Configuration
+} // namespace Apache.Qpid.Sasl.Configuration
+
diff --git a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs index c307c73eb1..21f6b92414 100644 --- a/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs +++ b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs @@ -25,7 +25,7 @@ using System.Configuration; using System.Text;
using System.Xml;
-namespace Qpid.Sasl.Configuration
+namespace Apache.Qpid.Sasl.Configuration
{
/// <summary>
/// Defines the configuration section to configure extra
@@ -79,5 +79,6 @@ namespace Qpid.Sasl.Configuration }
} // class SaslConfigurationSectionHandler
-} // namespace Qpid.Sasl.Configuration
+} // namespace Apache.Qpid.Sasl.Configuration
+
diff --git a/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs index e6387a1e29..d552aa80c0 100644 --- a/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs +++ b/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs @@ -22,9 +22,9 @@ using System;
using System.Collections;
-using Qpid.Sasl.Mechanisms;
+using Apache.Qpid.Sasl.Mechanisms;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public class DefaultClientFactory : ISaslClientFactory
{
@@ -90,5 +90,6 @@ namespace Qpid.Sasl }
} // class DefaultClientFactory
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs b/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs index ec34755f3e..0dfc482333 100644 --- a/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs +++ b/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public interface ISaslCallbackHandler
{
@@ -30,5 +30,6 @@ namespace Qpid.Sasl } // interface ISaslCallbackHandler
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/qpid/dotnet/Qpid.Sasl/ISaslClient.cs b/qpid/dotnet/Qpid.Sasl/ISaslClient.cs index 3ecccc0fac..526cc1f43a 100644 --- a/qpid/dotnet/Qpid.Sasl/ISaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/ISaslClient.cs @@ -22,7 +22,7 @@ using System;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public interface ISaslClient
{
@@ -37,5 +37,6 @@ namespace Qpid.Sasl } // interface ISaslClient
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs b/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs index 4a5d4d0da4..fc81057ec4 100644 --- a/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs +++ b/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public interface ISaslClientFactory
{
@@ -35,5 +35,6 @@ namespace Qpid.Sasl );
} // interface ISaslClientFactory
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
+
diff --git a/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs b/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs index 0696487d10..134332284a 100644 --- a/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs +++ b/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs @@ -22,7 +22,7 @@ using System;
using System.Security.Cryptography;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Rough HMAC MD5 implementation as presented in
@@ -112,4 +112,4 @@ namespace Qpid.Sasl } // class MD5HMAC
-} // namespace Qpid.Sasl
+} // namespace Apache.Qpid.Sasl
diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs index 9adcfd9d13..5e8c56ff51 100644 --- a/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
/// Implements the ANONYMOUS authentication mechanism
@@ -66,4 +66,4 @@ namespace Qpid.Sasl.Mechanisms } // class AnonymousSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs index b5190daf0d..672cc64c6a 100644 --- a/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Security.Cryptography;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
/// Implements the CRAM-MD5 authentication mechanism as outlined
@@ -88,4 +88,4 @@ namespace Qpid.Sasl.Mechanisms } // class CramMD5SaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs index 1f4b2cebdb..59d3a88991 100644 --- a/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs @@ -26,7 +26,7 @@ using System.Globalization; using System.Security.Cryptography;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
@@ -573,4 +573,4 @@ namespace Qpid.Sasl.Mechanisms } // class DigestResponse
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs index 127591e2da..5b513bda87 100644 --- a/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
/// Implements the EXTERNAL authentication mechanism
@@ -66,4 +66,4 @@ namespace Qpid.Sasl.Mechanisms } // class ExternalSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs index a6813fa825..3addeb2e83 100644 --- a/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl.Mechanisms
+namespace Apache.Qpid.Sasl.Mechanisms
{
/// <summary>
@@ -78,4 +78,4 @@ namespace Qpid.Sasl.Mechanisms #endregion // ISaslClient Implementation
} // class PlainSaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs index 9e422b106e..f38725e53f 100644 --- a/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs +++ b/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs @@ -6,11 +6,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.Sasl")]
+[assembly: AssemblyTitle("Apache.Qpid.Sasl")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Apache Qpid")]
-[assembly: AssemblyProduct("Apache Qpid")]
+[assembly: AssemblyProduct("Apache.Qpid.Sasl")]
[assembly: AssemblyCopyright("Copyright © 2007 The Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj index ae8047fd45..891d710379 100644 --- a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj +++ b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{1465B0EE-6452-42A6-AB73-B2F9EABEEE75}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Qpid.Sasl</RootNamespace>
- <AssemblyName>Qpid.Sasl</AssemblyName>
+ <RootNamespace>Apache.Qpid.Sasl</RootNamespace>
+ <AssemblyName>Apache.Qpid.Sasl</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -61,4 +61,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file +</Project>
diff --git a/qpid/dotnet/Qpid.Sasl/Sasl.cs b/qpid/dotnet/Qpid.Sasl/Sasl.cs index baab5c40e6..5a744a30d9 100644 --- a/qpid/dotnet/Qpid.Sasl/Sasl.cs +++ b/qpid/dotnet/Qpid.Sasl/Sasl.cs @@ -24,9 +24,9 @@ using System.Collections; using System.Configuration;
using System.Text;
-using Qpid.Sasl.Configuration;
+using Apache.Qpid.Sasl.Configuration;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Static class used to access the SASL functionality.
@@ -42,12 +42,12 @@ namespace Qpid.Sasl /// <example><![CDATA[
/// <configuration>
/// <configSections>
- /// <section name="qpid.sasl" type="Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Qpid.Sasl"/>
+ /// <section name="qpid.sasl" type="Apache.Qpid.Sasl.Configuration.SaslConfigurationSectionHandler, Apache.Qpid.Sasl"/>
/// </configSections>
///
/// <qpid.sasl>
/// <clientFactories>
- /// <add type="Qpid.Sasl.Tests.TestClientFactory, Qpid.Sasl.Tests"/>
+ /// <add type="Apache.Qpid.Sasl.Tests.TestClientFactory, Apache.Qpid.Sasl.Tests"/>
/// </clientFactories>
/// </qpid.sasl>
/// </configuration>
@@ -112,4 +112,4 @@ namespace Qpid.Sasl }
} // class Sasl
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/SaslClient.cs b/qpid/dotnet/Qpid.Sasl/SaslClient.cs index 79413e0077..1390b1b352 100644 --- a/qpid/dotnet/Qpid.Sasl/SaslClient.cs +++ b/qpid/dotnet/Qpid.Sasl/SaslClient.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Globalization;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public abstract class SaslClient : ISaslClient
{
@@ -142,4 +142,4 @@ namespace Qpid.Sasl } // class SaslClient
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/SaslException.cs b/qpid/dotnet/Qpid.Sasl/SaslException.cs index 203c408c3f..8f6e00a7ba 100644 --- a/qpid/dotnet/Qpid.Sasl/SaslException.cs +++ b/qpid/dotnet/Qpid.Sasl/SaslException.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Runtime.Serialization;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
/// <summary>
/// Reports an exception during the processing of an SASL
@@ -53,4 +53,4 @@ namespace Qpid.Sasl } // class SaslException
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/SaslProperties.cs b/qpid/dotnet/Qpid.Sasl/SaslProperties.cs index 0e59ce8f90..0658acda21 100644 --- a/qpid/dotnet/Qpid.Sasl/SaslProperties.cs +++ b/qpid/dotnet/Qpid.Sasl/SaslProperties.cs @@ -23,7 +23,7 @@ using System; using System.Collections;
using System.Text;
-namespace Qpid.Sasl
+namespace Apache.Qpid.Sasl
{
public sealed class SaslProperties
{
@@ -39,4 +39,4 @@ namespace Qpid.Sasl } // class SaslProperties
-} // namespace Qpid.Sasl.Mechanisms
+} // namespace Apache.Qpid.Sasl.Mechanisms
diff --git a/qpid/dotnet/Qpid.Sasl/default.build b/qpid/dotnet/Qpid.Sasl/default.build index ed648024d0..5b44d6b9c4 100644 --- a/qpid/dotnet/Qpid.Sasl/default.build +++ b/qpid/dotnet/Qpid.Sasl/default.build @@ -1,5 +1,5 @@ <?xml version="1.0"?>
-<project name="Qpid.Sasl" default="build">
+<project name="Apache.Qpid.Sasl" default="build">
<!--
Properties that come from master build file
- build.dir: root directory for build
diff --git a/qpid/dotnet/TopicListener/Program.cs b/qpid/dotnet/TopicListener/Program.cs index c969f4d736..0134dca1ba 100644 --- a/qpid/dotnet/TopicListener/Program.cs +++ b/qpid/dotnet/TopicListener/Program.cs @@ -4,7 +4,7 @@ namespace TopicListener {
static void Main(string[] args)
{
- Qpid.Client.Tests.interop.TopicListener.Main(args);
+ Apache.Qpid.Client.Tests.interop.TopicListener.Main(args);
}
}
}
diff --git a/qpid/dotnet/TopicListener/default.build b/qpid/dotnet/TopicListener/default.build index 7f49a6de13..afde4d6937 100644 --- a/qpid/dotnet/TopicListener/default.build +++ b/qpid/dotnet/TopicListener/default.build @@ -18,7 +18,7 @@ <include name="**/*.cs" />
</sources>
<references>
- <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+ <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
</references>
</csc>
</target>
diff --git a/qpid/dotnet/TopicPublisher/Program.cs b/qpid/dotnet/TopicPublisher/Program.cs index 9206466cf7..a68df14bb3 100644 --- a/qpid/dotnet/TopicPublisher/Program.cs +++ b/qpid/dotnet/TopicPublisher/Program.cs @@ -4,7 +4,7 @@ namespace TopicPublisher {
static void Main(string[] args)
{
- Qpid.Client.Tests.interop.TopicPublisher.Main(args);
+ Apache.Qpid.Client.Tests.interop.TopicPublisher.Main(args);
}
}
}
diff --git a/qpid/dotnet/TopicPublisher/default.build b/qpid/dotnet/TopicPublisher/default.build index 38ad896f34..8991aae751 100644 --- a/qpid/dotnet/TopicPublisher/default.build +++ b/qpid/dotnet/TopicPublisher/default.build @@ -18,7 +18,7 @@ <include name="**/*.cs" />
</sources>
<references>
- <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+ <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
</references>
</csc>
</target>
diff --git a/qpid/dotnet/default.build b/qpid/dotnet/default.build index b9d0bf2762..e042f38c61 100644 --- a/qpid/dotnet/default.build +++ b/qpid/dotnet/default.build @@ -22,7 +22,7 @@ Fileset with build files for test assemblies
-->
<fileset id="tests.builds">
- <include name="Qpid.Buffer.Tess/default.build" />
+ <include name="Qpid.Buffer.Tests/default.build" />
<include name="Qpid.Sasl.Tests/default.build" />
<include name="Qpid.Common.Tests/default.build" />
<include name="Qpid.Client.Tests/default.build" />
@@ -124,3 +124,4 @@ </project>
+
|