You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/04/04 17:01:37 UTC
[01/16] git commit: Add a mapping for where some of the jaxrs stuff
was moved
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes dc23aafaa -> 454497ab9
Add a mapping for where some of the jaxrs stuff was moved
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91f47fce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91f47fce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91f47fce
Branch: refs/heads/2.7.x-fixes
Commit: 91f47fce8131e774850a44a69dfd3ca05b80f4cd
Parents: dc23aaf
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Apr 4 09:48:04 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:48:04 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/91f47fce/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 81f3715..22d4b1a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,7 @@
origin/master
A core api
A core rt/core
+A rt/rs/description rt/frontend/jaxrs
B 0011b05059467fcd6fbeeb859907d69a9d25efe2
B 003518b1d29250c59493d1b1965303aac8505475
B 003a0d420dca03b94d5ec111dab645669446a942
[11/16] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a120b175
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a120b175
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a120b175
Branch: refs/heads/2.7.x-fixes
Commit: a120b1754b7e8d8dc221bb2cc5b7ded80f6b4df1
Parents: 1060216
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Apr 4 10:02:57 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:02:57 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a120b175/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 22d4b1a..f030dea 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -25,12 +25,14 @@ B 04b535bbb4667e43492515718a061553d50644d8
B 0646fdbf971885ca605cd27d5b46a413bc0e8f84
B 06bb3853d7e5998dbebd8d042114a06f4827d76f
B 07108f9a1f81eee219bfab33fc90391e8b9edc44
+B 0739807fbc6f3b3e24aca2b517e34f1b9354d34e
B 076b258c21ab784322b7231718efba6e0f941fae
B 0776c6c0da3ab42464b6e7c6246981685e9ad0ca
B 07c97db7b2254096156240a98762af0a51808be1
B 07ea01d2707936d9e7f5a205d327238b37ac819b
B 080bd762e7e09f7fe1d1fa2d7c55bc6626f539d9
B 0877b2a7bfc496b6d8d57083abbee2fbfd50c221
+B 0918a1bc99d40bc7fb3079570380b2b3094cae6b
B 0919edd76e4909f06216c546628a6f7d586479b2
B 0946fd921cca26b62812a8e91620b1fe1237daf1
B 094d369363e640de47299e93e288bab758562eb3
@@ -45,6 +47,7 @@ B 0c2672042482c63a14778f9f062ba52eaa088291
B 0c2a87c0a733efff02a2d09691a51ecf51829105
B 0c77f4ff91451c0bf73ebe1103e99583cc26d786
B 0cffef8fc445a8a367315521b03620a14bb8c60a
+B 0da3215d1530c3100b33f3eb4b05637845374bac
B 0dd17b9c51c92a943f27983033bbc05e7e8614eb
B 0e33a8091949cdb162075c1eeb0bc82ce447f805
B 0e5b958dfc41d7debd5ee68b9eb8ba117ea6db75
@@ -64,6 +67,7 @@ B 11bccec4f48f65f36907cd04230b1b751a34d0e1
B 11f1414fed14e737c033122086bc95bbfd24d286
B 1224a400fbbcb08e47b86c8079477f3eddf7b49f
B 12c910c524c8dd40149b087312763b3d2a4434b0
+B 12e8613a90c00b8d34cf624003e7549423639e2b
B 12eda4f03c46507e78ffc78b0fb1b8f4b5726efa
B 12ee3fb1475d16010a6df3b0580c0f67b893d511
B 1353a31981751cc4b66242db5ff425275bb04ec3
@@ -108,6 +112,7 @@ B 1d7365b33c03b44f8fa984fc1f6350469f6bb7f3
B 1d884dc801901c2f343582651fc5aca05d81f24a
B 1ddf740976e130c838bc7e6a012048765eda3ee0
B 1e8aba05df7f3b9a7b9b486a107a534d35e8d81a
+B 1ef40fca273d8d2ba3a37b91dbcf66d1f7e2dfed
B 1f16cb0bdf894848f68e2ee38f5253f5e9f87910
B 1f6f2b34e95d321fa055e110c5dac01534eb6e89
B 1f7d6ad5c95532a3523f940d9daf277c6a03f4d9
@@ -134,6 +139,7 @@ B 229bc4ccaed5d4989b3ec363b1964cb2df00cf6e
B 22ac3203afc7c5017b266e25fdde0df16c294b54
B 22e352f442b62be811b25fba200f2f3158d41132
B 23f8e62836eec21a0dfcf911dc026c4b9240c7df
+B 242ffb176a1b2bea2be1762750f66af8d227ca2f
B 249c25bddbe08ba346f67dcc34d65dd2598d5c72
B 24cbca795a21070f5bf11587277900b3a2cf226b
B 252626fff32596dccce59c8044bd32136dedda12
@@ -162,6 +168,7 @@ B 2b3bb5e434082422a1631a434b3bd346c0ae766c
B 2b573e9d69f9b4defac24f6295a7710baebf90b4
B 2bacebefbb758bf1fd2f0517033fb11ae3f8f8a8
B 2be064961812e7cf20474eedcdb2d5a5f903d5d7
+B 2c8472de712ab3615bb3a9f8f568734c501d68de
B 2ca6a5ec4332d494f71bbe9348ed96f876d28e42
B 2ca813563898e4beb10da293668b740933ab683f
B 2d2800ba52421c3e4a52dcf561b8f00b6f07f3d6
@@ -177,6 +184,7 @@ B 2ed82af55f0f63e955e1d8a7707b51e7204adf1f
B 2fd68d8b34ed0eb1c0a24cab6055497998ca46d7
B 30a6fee4cefe0831c98d569f2eb7e8a3572ff8a8
B 30a9e0570a5c649e25a5212ab075f46c391496a5
+B 30ddf1c899a7153a82790f78db3747472563721e
B 30ef5785401b948ab8aa7e965da5cb36f606a8d0
B 30fa71e52a501fd506afffdf9f600f79d51baea7
B 30fb5ca09ffac5c4b8a2bbe9f6f69b05d7ef260e
@@ -237,6 +245,7 @@ B 3c78d3be567447c50d10ed52fcfe231525d2bf9c
B 3c95b4b01da194ba34a2230dd00a2333d820464a
B 3cd23910e77dfb21c9622cf96c5118765a79e03c
B 3cd24f083d410f2335245a377f961b48341705fa
+B 3d701b59b57942fa0800a54cd46e3f049208da71
B 3d7db466f8a2c5188a5d7038f9fbe8a633679750
B 3d9864c94c43301e84b496e97772928eebb6d36c
B 3dc89fe00c4e4165fc7b9c25ca0faec4ef097a87
@@ -309,11 +318,13 @@ B 501a9ff767f4bdd4183412116f2b45ffa6a1f9b9
B 5027baf5e5f453c7ff92c525c5db48cb3e2e5617
B 5065d9b57a1d5a1fb511190598e40d6683d4b174
B 50ac1ba3e518d9bd01aeca98ac4a142c9fed756c
+B 51053aa2fecbc9620b88f7d25e6f2319c7a4dc04
B 514aebf5b5ae19ec2a844282f4c12e5d65e46c46
B 51809a375ea45a468a2a321c3a5ea47c1351d2f9
B 51b6917d75fe664c0baf21c641232cfb6e1761de
B 51efdf3df80358fc41ef17ae612ccc83e041b3a8
B 524652250be0c05f9cf86ff0865a69efe86acd5b
+B 532c5a78ab6d398869bf36c00aeaaf3089ad2fd3
B 535917e7e2960f5ea8bba6f209eaf53616ec5934
B 536e79f2321c0578ae00a394ff1091fc10dad550
B 536f0c957386061b1abfe0a46d772620f18fbf39
@@ -439,6 +450,7 @@ B 7294ff05b25d1388128b8a546d47a6ebe61ffd61
B 7335999ee13253a0e954ff8bc03c6d09b4058392
B 7397e892c7a63d8959c7a24277fb1b28dfa538e8
B 73ea6c5ce6b86e1b28d3eef94c8ba878e4babffa
+B 751953cde2e691140bd7d61584ffccc42c2c17c0
B 7521ad685276b02af30a5fa145dbced0b91058fd
B 7524807b1dc58e4052eac67d623835f9eeb2b458
B 753557e9dcc97db25d4214759506ff350a992d60
@@ -465,6 +477,7 @@ B 7b2020d6a9f1de574348ae979a5b8a80f5984a6d
B 7bbcaeae79726aff567a14f15e5aed8c0adf9744
B 7c1daf4aa92d95e55de49bde07df097ea90ecf11
B 7c241fb0a6341222515e4d2d0b2d1f98de1e9251
+B 7c7fff780a00adffbc1c67be4457932d8028c62f
B 7c95984d4f8d92a6507d27335739a97a3b1130a2
B 7c9bf2255476a45cbde64a3d91a7b90750c0738f
B 7c9df9d7f70bad77f25c149b432a001640acb33e
@@ -643,6 +656,7 @@ B a84a5a6706bc760dfdc558a419bfc508e214323c
B a894b15bc3b904671e96abe3187409d9f262692c
B a925d01f6d1c064109563dfbb91ef0ab966cb38e
B a93cb919813047ddefa90240d5c3d18d9a97cc78
+B a96ef8a0f5d3f311a2530b9f13a2a8424c1b665c
B a97df555de4fc1a17fd1a13ae055f76295180fba
B a98d18ed2a859822068025662c7bbe5fbb2f8b3d
B aa3834037a647154850de57a9fdacb1d7a44e219
@@ -660,12 +674,14 @@ B ad9fef8fe55752ca99a5047efb2fdc54e7d19e01
B adfb0d10fa2aeaa1add8fbda90d440bdf2c1a8af
B ae039d5762840d76f710393071aad85fb09fd5ea
B ae1212c3e25bfbd9b39ad450fa686e7a9ee9114b
+B af229e25f6a793853bffd91b59857b0223ae8b93
B af577d218398d35a3f52a34bb489789e97f1e8a1
B af70ff876270387875292bcf90844a7ad258376c
B afe13e4bef33381f27adcad6b5b0ca857673945c
B aff4f5d14c7bba6f3b542b61a2a5c80430a1d350
B b0133860d6db408b21f15f9cb52c7d16cee89b13
B b04f7ed86cd6da81578c9a66f4bf7db41dc8903c
+B b0e7be04d0d6ba8061831fcc26448e8e5c1c8a2e
B b11ce27dcaa1180249633d3f45583949cd698ee9
B b14f773634eaee65d8b8f2f1ee67d1e95c4bcb9f
B b15370faae90413f215b82c9d8a7ff5923507708
@@ -679,6 +695,7 @@ B b235b11b7a207d47ae00f84b4ba7b6902e699981
B b256c462ac837e254e826a082a2d71d9f17b18c5
B b269479a90b953d85df1eee446f01eb4d0ab10bd
B b2cc4b22eb064e6a0b242646cb50772f8edc55d2
+B b3288ed94bd6518780839a6b9716c64575c68073
B b34e1daed084078d5cd5964fbf4741a9f9bffb12
B b35e579fd9302c340f8066e192d8fe6f1f9084cc
B b37837f0067dbcb48e8431a8caa2554f32be559c
@@ -747,9 +764,13 @@ B c2ee7f5069907204247474fea5d6f093e23df897
B c2eff324be4e679755818ac04f6a8dc8ef3fdc66
B c48a9c1c5eb33069e065a1b0f1012e5cdc8a82cd
B c4b5bf8b52a7d83a5047c145ca20b37ee608c216
+B c51282ea7e737c4ee92c7e6e10983d84373448e0
+B c5421983e06778b38dfdcca0dbe27c08060197b6
B c54a538bff6318d5f9b05e135dbfcc59c305cfcf
B c5e4dc05175917365dd9dae82685f2c280e6709d
B c5f3efe0ae4f39ac133d3de8c55a5b4670000611
+B c62ac164b892b2a7d075eb936ceee9dc935f4b7f
+B c67b0119c98a59d39cf8ff3cb5261a07890ea4cb
B c68ae4f10040ad6057a4f0e278b14651bf139e5a
B c6ed551aeb4e55984dcb45a70ffa7214a135acc4
B c6efa27d4625cf7219a39621ca4c4e3af9ceb81e
@@ -846,8 +867,10 @@ B df457e9b8f456cc571a5a136ffa6f9bc06219588
B dfbe1e515a3aa4283655b422b4f717d05cc77415
B e01fc4aae66285c5567eb34d01f8ebc41274424c
B e046c38c9d8569f4a6fa2bc3cfa4bccb38e9f71f
+B e05f429384cd199dd8aae19afc0079027f0c98b6
B e0618b670df78b8326f205af76888c28db734e3c
B e07e865dfe69cb31802e349924bbbecca5c35aba
+B e083b4d532f2b5e747a152faca5dfaf73d55cfa8
B e09380862fe870b25f9a5a48991b35d719d04cc0
B e1079067f58abda2a80ccc309e762ea9f064fc3d
B e10f669c0085b797d2e8b25514405569f6f48924
@@ -895,6 +918,7 @@ B ea090bb3fe21bd768e609275f0ffc33515d0aced
B ea2062a26909271861f8237d7d2c9190ba0edb0b
B ea254d2bab7bda362559395637e42212a7b54289
B ea2f8e89664fd5d72471b5d9cc3c18fb159d9fd7
+B ea303974b03322a221de2d042a16e8c4f484056e
B eac8cf37670d44993dec6691f116ae64855538a7
B eaf416c0d51f89dd7bfc028d2f718547453466c9
B eb1059d2e38366ca6fc849b0c150c90746675795
@@ -952,6 +976,7 @@ B f9d34aa106502f8f74f2475de3c10f942c9d2cb5
B fa30f5300915756d6b0248e07118686a0fe6862b
B fa76f6a041ad486ab8afb21db37cc4a490c532e9
B faa5a8f57a41b037d61d8e4493897210a9652546
+B fad0c99f780802d1859c90d3fd5300f0c2615b21
B fb3e0dac7b20009b454c8418a009c6f971b2ef77
B fb8061c8e24710869b963ab68bcfc55aee9ccc2d
B fc277fbea3bddcd819bd64cceaec13ac6bcfbf18
@@ -989,6 +1014,7 @@ M 07f5ffddfd5684eff1c06aa9fc6c3b59105b73ee
M 083fe4f98a41e75d0fe9d118384a8afe6a264b41
M 086b11667b96dec701f592ae2925bfa5de7ad647
M 08d5e152f7c90995bdd336f67c9fe772190e198a
+M 09204993f205a7f2ce05166b025bc215c8aed724
M 0a2e01f228890abba0bde43a545ea046c9c46119
M 0ad59e8757cd183484053ae7d61995266b2f4760
M 0b21c66dc0486643f481c9cf31757e2b3293de23
@@ -1004,11 +1030,14 @@ M 0ede8ff165e93afc86f8d45a64bdafc7e53527c8
M 0fdc68f4cd45715a57f0aabd1c8f33da556bf50e
M 0feb9222ddcb94464356e12ee9a0da88576514ca
M 1022b96f3cbb1f064f3838a008eda420ea74762e
+M 1026909f918661c6d25080a9932f4d63af017a31
M 106b942d2ca4b8a4a95dc34c3d447fe5afb548ba
+M 10897281ffaf746b845004002d81313ed31d67ed
M 10c6be01530e9a8c323fa53743961a0e7ad7e062
M 10d86cfe1b44ea471a6ddade1ef97b0090b29fa5
M 10ee4399bc892c4f96e481882ca89d4ae04edab7
M 11b4bedd47eed11662f3021f6220a6bd4aa01fa8
+M 11ecb9925c899a6696e7ccf03b80d8511374ddc8
M 1223a2c432c7901be7254e358928e6db91db89aa
M 1275ffe6322513beda2eb87a6aef5fa723e9394e
M 12e0ca177aed008991e690456f534b839e565ab4
@@ -1074,6 +1103,7 @@ M 32a194470bc6e123cbadc1ff7fdf2a4aaa4562ec
M 3378d284eb38373b80dd23d6f3d889af28763421
M 34b2d6c6d2a3a3e65494d6c7d8a3cf18700434ad
M 35a3e664bad9f6c0f6f4901e60ce2b6bd748558b
+M 364ef7745af0e0d89ed65ec4d199978f595e6526
M 3665370f96518b7d3475f0ff9d48b6d1006e925f
M 373d15b429b3c517fe0e8ee792dc547135f92717
M 37aff8bb1cb43cdc78e9d50ffce7590ba3cf2df8
@@ -1096,12 +1126,14 @@ M 3d210220f02839cd8388e36f2ae9e6bf645cbdd7
M 3d370cd3d37d222d6e6021e107d408d7cb6d7a2b
M 3f927d153e06b47c5e3462a632dc308915af814f
M 4052ba50657b9814a991b4c4b18ab31beea88fc2
+M 412fcccef8cebaf94b8eebb827672add984ff47c
M 415fc29334310285b25d2c9a59c2640ee56a5963
M 4199bf1c6cafedca459603cdc136c7d805226fc5
M 41d039fbd483609bac8837337c6c1b105c251459
M 424c55b1edc445f7cb9f0c69e483f0f16238f07e
M 43025ff2c4ceb0de499a31a4a9635cffe5db2eab
M 434132594b23cc18f36cab5c3109a4490b35883c
+M 434807822d07b68df50c96f005c1085a12b51e74
M 43ccd742c7aeafc228f6f7acf03a116ea91b8a3f
M 43e74adbdf313e245c88da3b786f8b379ec9a3f0
M 43ee39dc1a7fae7bed0f549c1dc13324a0e2a017
@@ -1109,6 +1141,7 @@ M 43fdd69f929d455e17694dad033d440c5e07a404
M 445d38ab1bade4408a3b76e495759d4808fd4c58
M 45547032baa0b10bf0a97f4afa582cd6b83890f1
M 45d4bebb74ccb9eb138814eaaff047868f0f1b70
+M 45e361cc84b402cdf4f1b97dc35b84ba94512de4
M 46a8e9269a1d51a6f7900f3143197ce42d095730
M 476ef1b68de84b35fbdc5ce6ce68cd1aa6107129
M 47e0f382e88ce9874c9d738cba0b902bcb54e3fd
@@ -1144,6 +1177,7 @@ M 5287bb35f427feef1a8d1daffee157abda488d51
M 52ec9e00350c6d1f2a4f3122bb19ddefb4dfc9b8
M 53e5857352897bc197a78d11b77d84cffe8ead0e
M 540508c6ef33e77a1b2270c24b954141f9564f92
+M 5427c2eceb76e80920e3e3c06e4d060fdfb913b8
M 55441b1a4654fb7ecec2db329c3eadefbcae5c3d
M 566ac6d958e65af7d73235e876ab0d244a8d2c13
M 56990a6121b5d27b815e83e4ebc61636d7d530d7
@@ -1267,6 +1301,7 @@ M 97afa21c40d0e3997100e107f33b523b297fa949
M 97fc83f83f4f252d8b759b5b983af624f77266f4
M 9893ce9d05456b7cdf95beac70fd56d29c2c6f08
M 992c0be0f1e19ffc19f88f5087eec2c5dff73025
+M 99eb3de3ab81776442f0fb1893f84c33a6b65242
M 99fb33495d08513c90ccea76c247e7ac546de769
M 9a94d17aed24b58c0459d4356d124c01db1e7112
M 9b3bddedf4ff47a994aea0112e6a120c9664685e
@@ -1375,6 +1410,7 @@ M cf388678325e27f7f485339b92d01e0c484d4d07
M cf83a6919d1c5cace0e1fa23cb0ce491b5ec44f7
M cfb3f1801d853c631c61a074bc3d8b419de4e942
M d15ad11d6201bf244d9c1a2ea6db333c6eb24e82
+M d16e2ea9758eecf8f85830352877904e23bb35d9
M d33c0de10f41e860ef38793784f20172eb3df2c2
M d4ccde7ae63eb53e9a93b116236cb84d405013c4
M d5f77ca42144474a00aed49f55b03b2990531237
@@ -1453,6 +1489,7 @@ M f4db015fc658d5d86a0539259cad8b38d863ade1
M f57a75aa40be9ab959ae1fade89c2803f2a5b45e
M f5a82c1c393775334725b9de61b94f492cdd1f2f
M f678cdd89d1ba6be3b5113743cfa5859806ba99a
+M f69d6b69fcb2f9677070d12b6ada8cba2c0945fc
M f73a8780a2856a2df8f0d8499232b59845b8582a
M f77a9ebf0d9ee8b2e5cf4ba1c2c38f2e33460759
M f78c3622442b753cb49d47193a1ffa015f49af9b
[14/16] git commit: Make it easier to use a subclass of ServerImpl to
create ManagedEndpoints with specific additional functionality
Posted by dk...@apache.org.
Make it easier to use a subclass of ServerImpl to create ManagedEndpoints with specific additional functionality
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b1c1b78b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b1c1b78b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b1c1b78b
Branch: refs/heads/2.7.x-fixes
Commit: b1c1b78ba892c058073f32a2f151bac7367395fd
Parents: 0e41d57
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Apr 3 10:41:18 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:06:26 2014 -0400
----------------------------------------------------------------------
.../apache/cxf/endpoint/ManagedEndpoint.java | 7 ++--
.../org/apache/cxf/endpoint/ServerImpl.java | 40 ++++++--------------
2 files changed, 15 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1c1b78b/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java b/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
index de53e8b..cd8fc28 100644
--- a/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
+++ b/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
@@ -37,9 +37,10 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
public static final String ENDPOINT_NAME = "managed.endpoint.name";
public static final String SERVICE_NAME = "managed.service.name";
- private Bus bus;
- private Endpoint endpoint;
- private Server server;
+ protected final Bus bus;
+ protected final Endpoint endpoint;
+ protected final Server server;
+
private enum State { CREATED, STARTED, STOPPED };
private State state = State.CREATED;
http://git-wip-us.apache.org/repos/asf/cxf/blob/b1c1b78b/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java b/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
index fa4f4cf..9d4d7b3 100644
--- a/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
+++ b/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
@@ -39,31 +39,21 @@ import org.apache.cxf.transport.MultipleEndpointObserver;
public class ServerImpl implements Server {
private static final Logger LOG = LogUtils.getL7dLogger(ServerImpl.class);
+
+ protected final Endpoint endpoint;
+ protected final Bus bus;
+ protected final BindingFactory bindingFactory;
+
private Destination destination;
- private Endpoint endpoint;
private ServerRegistry serverRegistry;
- private Bus bus;
private ServerLifeCycleManager slcMgr;
private InstrumentationManager iMgr;
- private BindingFactory bindingFactory;
- private MessageObserver messageObserver;
private ManagedEndpoint mep;
private boolean stopped = true;
public ServerImpl(Bus bus,
Endpoint endpoint,
DestinationFactory destinationFactory,
- MessageObserver observer) throws BusException, IOException {
- this.endpoint = endpoint;
- this.bus = bus;
- this.messageObserver = observer;
-
- initDestination(destinationFactory);
- }
-
- public ServerImpl(Bus bus,
- Endpoint endpoint,
- DestinationFactory destinationFactory,
BindingFactory bindingFactory) throws BusException, IOException {
this.endpoint = endpoint;
this.bus = bus;
@@ -94,7 +84,7 @@ public class ServerImpl implements Server {
LOG.info("Setting the server's publish address to be " + ei.getAddress());
serverRegistry = bus.getExtension(ServerRegistry.class);
- mep = new ManagedEndpoint(bus, endpoint, this);
+ mep = createManagedEndpoint();
slcMgr = bus.getExtension(ServerLifeCycleManager.class);
if (slcMgr != null) {
@@ -110,6 +100,10 @@ public class ServerImpl implements Server {
}
}
}
+
+ protected ManagedEndpoint createManagedEndpoint() {
+ return new ManagedEndpoint(bus, endpoint, this);
+ }
public Destination getDestination() {
return destination;
@@ -125,11 +119,7 @@ public class ServerImpl implements Server {
}
LOG.fine("Server is starting.");
- if (messageObserver != null) {
- destination.setMessageObserver(messageObserver);
- } else {
- bindingFactory.addListener(destination, endpoint);
- }
+ bindingFactory.addListener(destination, endpoint);
// register the active server to run
if (null != serverRegistry) {
@@ -201,13 +191,5 @@ public class ServerImpl implements Server {
public Endpoint getEndpoint() {
return endpoint;
}
-
- public MessageObserver getMessageObserver() {
- return messageObserver;
- }
-
- public void setMessageObserver(MessageObserver messageObserver) {
- this.messageObserver = messageObserver;
- }
}
[15/16] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c31a0c29
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c31a0c29
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c31a0c29
Branch: refs/heads/2.7.x-fixes
Commit: c31a0c29f07eb66734cc0457130e655faf5248ec
Parents: b1c1b78
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Apr 4 10:06:26 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:06:26 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c31a0c29/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f030dea..ad73e90 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1209,6 +1209,7 @@ M 6242c058731ddf5931457d25bf0233e6ea2a7f2b
M 635578a9d0a4cc1087795c26479585998d4a828f
M 6358dc0577bb2ff41f91a6c3ac121a75d3da1a6e
M 637963158121f8cd21e68b20f31c521c86048248
+M 63dce4850acf497e08cc692c5ad03d3d0788eae9
M 63f922255e228e4310335ad0b73309a66b735744
M 643a6962ca28c2ad5b93ad0bff4309de372c261e
M 652fab32f3ae5ffa3b4cb6290d654eadbdfd39a2
@@ -1377,6 +1378,7 @@ M c1674905a6deea5f7281f636039b9e5382187828
M c22742203f1669ed0b3a793f6539c9ffcba83a8b
M c23297497697bc1d77c8cdc4c8f1a1fd9324da8d
M c25a5c905e0e4a0c0fd605e3a36e45e5b2af2853
+M c28f0347fee75d9cbef683c85b516c1f74b2f6f0
M c30f553d49dbf24df3b76e4b28394b75095dcb3e
M c364e6c5134002951b22e3740d04ec2cd20b1cf3
M c3ce44b562254a975319046096d6a634d73ce7b8
[12/16] git commit: Move log4j version to parent/pom
Posted by dk...@apache.org.
Move log4j version to parent/pom
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c2c9ced1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c2c9ced1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c2c9ced1
Branch: refs/heads/2.7.x-fixes
Commit: c2c9ced19b5acab856e4ef81a2c9e62ca9e14c2d
Parents: a120b17
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 2 11:28:31 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:04:23 2014 -0400
----------------------------------------------------------------------
api/pom.xml | 1 -
parent/pom.xml | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c2c9ced1/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 41eb88f..e857663 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -87,7 +87,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
<optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c2c9ced1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d3e09ba..b46b30a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -535,6 +535,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${cxf.log4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${cxf.javax.ws.rs.version}</version>
[13/16] git commit: Move some versions up into parent/pom
Posted by dk...@apache.org.
Move some versions up into parent/pom
Conflicts:
parent/pom.xml
rt/rs/extensions/search/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0e41d571
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e41d571
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e41d571
Branch: refs/heads/2.7.x-fixes
Commit: 0e41d5719589d0d9b4ca15074f15ded4247908fe
Parents: c2c9ced
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 2 13:41:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:06:21 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 4 ++++
rt/rs/extensions/search/pom.xml | 1 -
rt/rs/security/oauth-parent/oauth/pom.xml | 2 +-
rt/rs/security/oauth-parent/pom.xml | 1 -
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b46b30a..acb60a5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -102,6 +102,9 @@
<cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
+ <cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
+ <cxf.log4j.version>1.2.17</cxf.log4j.version>
+ <cxf.lucene.version>4.0.0-BETA</cxf.lucene.version>
<cxf.mina.version>2.0.7</cxf.mina.version>
<cxf.javax.annotation-api.version>1.2-b04</cxf.javax.annotation-api.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
@@ -132,6 +135,7 @@
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
+ <cxf.oauth.version>20100527</cxf.oauth.version>
<cxf.opensaml.version>2.6.1</cxf.opensaml.version>
<cxf.opensaml.osgi.version>2.6.1_1</cxf.opensaml.osgi.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/rt/rs/extensions/search/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 900cb93..b521cf6 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -36,7 +36,6 @@
<properties>
<hibernate.em.version>4.1.0.Final</hibernate.em.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
- <cxf.lucene.version>4.0.0-BETA</cxf.lucene.version>
<cxf.osgi.import>
org.apache.cxf.jaxrs.impl.tl
</cxf.osgi.import>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/rt/rs/security/oauth-parent/oauth/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/pom.xml b/rt/rs/security/oauth-parent/oauth/pom.xml
index b9693df..cfa1020 100644
--- a/rt/rs/security/oauth-parent/oauth/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
- <version>${oauth.version}</version>
+ <version>${cxf.oauth.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e41d571/rt/rs/security/oauth-parent/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/pom.xml b/rt/rs/security/oauth-parent/pom.xml
index 2ba2884..ccab779 100644
--- a/rt/rs/security/oauth-parent/pom.xml
+++ b/rt/rs/security/oauth-parent/pom.xml
@@ -34,7 +34,6 @@
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<properties>
- <oauth.version>20100527</oauth.version>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
</cxf.osgi.import>
[16/16] git commit: Fix test/compile failures
Posted by dk...@apache.org.
Fix test/compile failures
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/454497ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/454497ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/454497ab
Branch: refs/heads/2.7.x-fixes
Commit: 454497ab9982c83df701947722f1e3517bb7ccc0
Parents: c31a0c2
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Apr 4 10:33:04 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:33:04 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java | 3 +++
.../org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/454497ab/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java
index 7600deb..f772e72 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ProxyClassLoader.java
@@ -21,4 +21,7 @@ package org.apache.cxf.jaxrs.client;
@Deprecated
public class ProxyClassLoader extends org.apache.cxf.common.util.ProxyClassLoader {
+ public ProxyClassLoader() {
+ super(null);
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/454497ab/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index 1368245..30793e0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -58,7 +58,7 @@ public class JAXRSClientFactoryBeanTest extends Assert {
@Test
public void testCreateClientCustomLoader() throws Exception {
- ProxyClassLoader loader = new ProxyClassLoader();
+ ProxyClassLoader loader = new ProxyClassLoader(BookStore.class.getClassLoader());
loader.addLoader(BookStore.class.getClassLoader());
JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
[06/16] git commit: Updates to get some of the tests passed with the
Moxy profile
Posted by dk...@apache.org.
Updates to get some of the tests passed with the Moxy profile
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b8eb4c06
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b8eb4c06
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b8eb4c06
Branch: refs/heads/2.7.x-fixes
Commit: b8eb4c0667056920e700d90c421beb0d0fdde6e3
Parents: 0940d45
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Mar 28 17:46:11 2014 +0000
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:57:40 2014 -0400
----------------------------------------------------------------------
.../jaxrs/JAXRSClientServerBookTest.java | 21 ++++++++++++++------
.../jaxrs/JAXRSClientServerSpringBookTest.java | 14 +++++++++++--
2 files changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b8eb4c06/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 8990b06..b0575bf 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -2053,7 +2053,8 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
InputStream expected = getClass().getResourceAsStream("resources/expected_add_book.txt");
- assertEquals(getStringFromInputStream(expected), post.getResponseBodyAsString());
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(post.getResponseBodyAsString()));
} finally {
// Release current connection to the connection pool once you are done
post.releaseConnection();
@@ -2087,8 +2088,8 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
int result = httpclient.executeMethod(put);
assertEquals(200, result);
InputStream expected = getClass().getResourceAsStream("resources/expected_update_book.txt");
- assertEquals(getStringFromInputStream(expected),
- getStringFromInputStream(put.getResponseBodyAsStream()));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(put.getResponseBodyAsStream())));
} finally {
// Release current connection to the connection pool once you are
// done
@@ -2135,8 +2136,8 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
int result = httpclient.executeMethod(put);
assertEquals(200, result);
InputStream expected = getClass().getResourceAsStream("resources/expected_update_book.txt");
- assertEquals(getStringFromInputStream(expected),
- getStringFromInputStream(put.getResponseBodyAsStream()));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(put.getResponseBodyAsStream())));
} finally {
// Release current connection to the connection pool once you are
// done
@@ -2463,7 +2464,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals(expectedStatus, result);
String content = getStringFromInputStream(get.getResponseBodyAsStream());
assertEquals("Expected value is wrong",
- expectedValue, content);
+ stripXmlInstructionIfNeeded(expectedValue), stripXmlInstructionIfNeeded(content));
if (expectedStatus == 200) {
assertEquals("123", get.getResponseHeader("BookId").getValue());
assertNotNull(get.getResponseHeader("Date"));
@@ -2480,6 +2481,14 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
}
}
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
+
private void getAndCompareStrings(String address,
String[] expectedValue,
String acceptType,
http://git-wip-us.apache.org/repos/asf/cxf/blob/b8eb4c06/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index 5d54975..90e5d2d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -576,7 +576,8 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
InputStream in = connect.getInputStream();
InputStream expected = getClass().getResourceAsStream(resource);
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in)));
}
private void getBookAegis(String endpointAddress, String type) throws Exception {
@@ -829,7 +830,8 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
if (expectedStatus != 400) {
InputStream expected = getClass().getResourceAsStream(expectedResource);
- assertEquals(getStringFromInputStream(expected), post.getResponseBodyAsString());
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(post.getResponseBodyAsString()));
} else {
assertTrue(post.getResponseBodyAsString()
.contains("Cannot find the declaration of element"));
@@ -840,6 +842,14 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
}
}
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
+
private String getStringFromInputStream(InputStream in) throws Exception {
CachedOutputStream bos = new CachedOutputStream();
IOUtils.copy(in, bos);
[02/16] git commit: Update wadl generator to use the prefix that the
JAXB implementation chose for the targetNamespace.
Posted by dk...@apache.org.
Update wadl generator to use the prefix that the JAXB implementation chose for the targetNamespace.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/323863ba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/323863ba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/323863ba
Branch: refs/heads/2.7.x-fixes
Commit: 323863ba1b25477e3ae860192939dd480330062b
Parents: 91f47fc
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 26 17:00:27 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:55:37 2014 -0400
----------------------------------------------------------------------
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 12 ++++++++----
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 20 ++++++++++++++------
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/323863ba/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 7807407..dd5d512 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1051,10 +1051,14 @@ public class WadlGenerator implements RequestHandler {
ElementQNameResolver theResolver = createElementQNameResolver(context);
String tns = doc.getDocumentElement().getAttribute("targetNamespace");
- String tnsDecl =
- doc.getDocumentElement().getAttribute("xmlns:tns");
- String tnsPrefix = tnsDecl != null && tnsDecl.equals(tns) ? "tns:" : "";
-
+ String tnsPrefix = doc.getDocumentElement().lookupPrefix(tns);
+ if (tnsPrefix == null) {
+ String tnsDecl = doc.getDocumentElement().getAttribute("xmlns:tns");
+ tnsPrefix = tnsDecl != null && tnsDecl.equals(tns) ? "tns:" : "";
+ } else {
+ tnsPrefix += ":";
+ }
+
if (supportJaxbXmlType) {
for (Class<?> cls : resourceTypes.getAllTypes().keySet()) {
if (isXmlRoot(cls)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/323863ba/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 1011d24..abe1bd0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -400,14 +400,24 @@ public class WadlGeneratorTest extends Assert {
return false;
}
+ private boolean checkTypeName(Element el, String typeName, String name) {
+ String pfx = "";
+ String tn = typeName;
+ if (tn.contains(":")) {
+ pfx = tn.substring(0, tn.indexOf(':'));
+ tn = tn.substring(tn.indexOf(':') + 1);
+ }
+ pfx = el.lookupNamespaceURI(pfx);
+
+ return tn.equals(name) && pfx.length() > 5;
+ }
+
private boolean checkElement(List<Element> els, String name, String localTypeName) {
for (Element e : els) {
if (name.equals(e.getAttribute("name"))) {
String type = e.getAttribute("type");
if (!StringUtils.isEmpty(type)) {
- String expectedType1 = "tns:" + localTypeName;
- String expectedType2 = "os:" + localTypeName;
- if (type.equals(expectedType1) || type.equals(expectedType2)) {
+ if (checkTypeName(e, type, localTypeName)) {
return true;
}
} else if ("books".equals(name) || "thebook2s".equals(name)) {
@@ -422,9 +432,7 @@ public class WadlGeneratorTest extends Assert {
(Element)seqElement.getElementsByTagNameNS(XmlSchemaConstants.XSD_NAMESPACE_URI,
"element").item(0);
String ref = xsElement.getAttribute("ref");
- String expectedRef = thebooks2 ? "tns:thebook2" : "tns:thebook";
- String expectedRef2 = thebooks2 ? "os:thebook2" : "os:thebook";
- if (ref.equals(expectedRef) || ref.equals(expectedRef2)) {
+ if (checkTypeName(e, ref, thebooks2 ? "thebook2" : "thebook")) {
return true;
}
}
[05/16] git commit: Update the javato tests to pass with MOXy
Posted by dk...@apache.org.
Update the javato tests to pass with MOXy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0940d45d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0940d45d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0940d45d
Branch: refs/heads/2.7.x-fixes
Commit: 0940d45d27aee71138870d2895195feafcccf5d0
Parents: 8001e89
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 27 10:31:18 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:57:09 2014 -0400
----------------------------------------------------------------------
.../cxf/tools/common/ProcessorTestBase.java | 12 ++++++
.../org/apache/cxf/tools/fortest/MyImage.java | 3 ++
.../apache/cxf/tools/java2ws/JavaToWSTest.java | 40 +++++++++++++++-----
.../processor/JavaToProcessorTest.java | 2 +-
.../jaxws/JaxwsServiceBuilderRPCTest.java | 10 ++++-
.../internal/jaxws/JaxwsServiceBuilderTest.java | 7 ++++
6 files changed, 63 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0940d45d/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
index 3930d4d..fc21ed9 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
@@ -40,6 +40,8 @@ import java.util.StringTokenizer;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.apache.cxf.common.util.StringUtils;
@@ -94,6 +96,16 @@ public class ProcessorTestBase extends Assert {
public void tearDown() {
env = null;
}
+
+
+ protected boolean isMOXy() {
+ try {
+ JAXBContext c = JAXBContext.newInstance(String.class);
+ return c.getClass().getName().contains(".eclipse");
+ } catch (JAXBException e) {
+ return false;
+ }
+ }
protected String getClassPath() throws URISyntaxException, IOException {
ClassLoader loader = getClass().getClassLoader();
http://git-wip-us.apache.org/repos/asf/cxf/blob/0940d45d/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java
index 53f30c7..ed07f59 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/MyImage.java
@@ -19,8 +19,11 @@
package org.apache.cxf.tools.fortest;
import java.awt.Image;
+
import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.XmlType;
+@XmlType(name = "myImage", namespace = "http://fortest.tools.cxf.apache.org/")
public class MyImage {
@XmlMimeType("image/png")
protected Image myPhoto;
http://git-wip-us.apache.org/repos/asf/cxf/blob/0940d45d/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
index 0788134..ba12120 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
@@ -22,11 +22,19 @@ import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.apache.cxf.common.util.Compiler;
import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.helpers.XPathUtils;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolTestBase;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -337,10 +345,17 @@ public class JavaToWSTest extends ToolTestBase {
JavaToWS.main(args);
File file = new File(output.getPath() + "/xml-list.wsdl");
- String str = FileUtils.getStringFromFile(file);
- assertTrue("Java2wsdl did not generate xsd:list element",
- str.indexOf("xs:list") > -1);
-
+
+ Document doc = StaxUtils.read(file);
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("xsd", "http://www.w3.org/2001/XMLSchema");
+ map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
+ map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
+ XPathUtils util = new XPathUtils(map);
+ Element node = (Element)util.getValueNode("//xsd:list", doc);
+ assertNotNull(node);
+
+ assertTrue(node.getAttribute("itemType").contains("string"));
}
@Test
@@ -365,11 +380,18 @@ public class JavaToWSTest extends ToolTestBase {
JavaToWS.main(args);
File file = new File(output.getPath() + "/xmladapter.wsdl");
- String str = FileUtils.getStringFromFile(file);
- String expected = "<xs:element minOccurs=\"0\" name=\"arg0\" type=\"xs:string\"/>";
- assertTrue("@XmlJavaTypeAdapter in SEI dose not take effect",
- str.indexOf(expected) > -1);
-
+
+ Document doc = StaxUtils.read(file);
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("xsd", "http://www.w3.org/2001/XMLSchema");
+ map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
+ map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
+ XPathUtils util = new XPathUtils(map);
+ Element node = (Element)util.getValueNode("//xsd:element[@name='arg0']", doc);
+ assertNotNull(node);
+
+ assertEquals("0", node.getAttribute("minOccurs"));
+ assertTrue(node.getAttribute("type").contains("string"));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/0940d45d/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
index 7751893..bc0212f 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
@@ -480,7 +480,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
@Test
public void testMimeTypeInBean() throws Exception {
env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/send_image2.wsdl");
- env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.ImageSender2");
+ env.put(ToolConstants.CFG_CLASSNAME, org.apache.cxf.tools.fortest.ImageSender2.class.getName());
env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
try {
processor.setEnvironment(env);
http://git-wip-us.apache.org/repos/asf/cxf/blob/0940d45d/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
index 6b9e64a..9080260 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderRPCTest.java
@@ -20,6 +20,8 @@
package org.apache.cxf.tools.java2wsdl.processor.internal.jaxws;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.jaxb.JAXBContextCache;
@@ -27,6 +29,7 @@ import org.apache.cxf.jaxws.JaxwsServiceBuilder;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
+
import org.junit.Before;
import org.junit.Test;
@@ -59,7 +62,12 @@ public class JaxwsServiceBuilderRPCTest extends ProcessorTestBase {
File expectedFile = new File(this.getClass()
.getResource("expected/rpc_greeter.wsdl").toURI());
- assertWsdlEquals(expectedFile, output);
+
+ //MOXy doesn't put a final attribute on the array types, we can ignore that
+ //for the purpose of this test
+ List<String> ignores = new ArrayList<String>(DEFAULT_IGNORE_ATTR);
+ ignores.add("final");
+ assertWsdlEquals(expectedFile, output, ignores, DEFAULT_IGNORE_TAG);
}
private File getOutputFile(String fileName) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/0940d45d/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
index d587deb..f49aaae 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
@@ -68,6 +68,13 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase {
@Test
public void testDocLitWrappedWithWrapperClass() throws Exception {
+ if (isMOXy()) {
+ //This test is testing to see if the lack of namespace declarations on the wrapper classes
+ //can still map into the targetnamespace of the service. MOXy always looks for the
+ //namespace on the annotation or in package-info and thus cannot support this. This
+ //is fairly bad practice anyway.
+ return;
+ }
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.StockWrapped.class);
ServiceInfo service = builder.createService();
generator.setServiceModel(service);
[07/16] git commit: Few more fixes to JAXRS tests to get them running
with Moxy
Posted by dk...@apache.org.
Few more fixes to JAXRS tests to get them running with Moxy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8f82a3e2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8f82a3e2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8f82a3e2
Branch: refs/heads/2.7.x-fixes
Commit: 8f82a3e23cc6374c8c0f0b9f14f7f92c0ae4d92c
Parents: b8eb4c0
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Mar 28 21:51:27 2014 +0000
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:57:57 2014 -0400
----------------------------------------------------------------------
.../jaxrs/JAXRSClientServerNonSpringBookTest.java | 9 ++++++++-
.../JAXRSClientServerProxySpringBookTest.java | 15 +++++++++++----
...ClientServerResourceCreatedOutsideBookTest.java | 16 ++++++++++++----
...SClientServerResourceCreatedSpringBookTest.java | 10 +++++++++-
...entServerResourceCreatedSpringProviderTest.java | 15 +++++++++++----
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 13 +++++++++++--
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 17 +++++++++++++----
.../jaxrs/security/AbstractSpringSecurityTest.java | 11 +++++++++--
8 files changed, 84 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
index bfb82c3..8241d7b 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
@@ -219,7 +219,7 @@ public class JAXRSClientServerNonSpringBookTest extends AbstractBusClientServerT
assertEquals(expectedStatus, result);
String content = getStringFromInputStream(get.getResponseBodyAsStream());
assertEquals("Expected value is wrong",
- expectedValue, content);
+ stripXmlInstructionIfNeeded(expectedValue), stripXmlInstructionIfNeeded(content));
if (expectedContentType != null) {
Header ct = get.getResponseHeader("Content-Type");
assertEquals("Wrong type of response", expectedContentType, ct.getValue());
@@ -229,6 +229,13 @@ public class JAXRSClientServerNonSpringBookTest extends AbstractBusClientServerT
}
}
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
private String getStringFromInputStream(InputStream in) throws Exception {
CachedOutputStream bos = new CachedOutputStream();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
index e5f2e5d..f933e6a 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
@@ -60,8 +60,8 @@ public class JAXRSClientServerProxySpringBookTest extends AbstractBusClientServe
.getResourceAsStream("resources/expected_get_book_notfound_mapped.txt");
assertEquals("Exception is not mapped correctly",
- getStringFromInputStream(expected).trim(),
- getStringFromInputStream(in).trim());
+ stripXmlInstructionIfNeeded(getStringFromInputStream(expected).trim()),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in).trim()));
}
@Test
@@ -115,7 +115,8 @@ public class JAXRSClientServerProxySpringBookTest extends AbstractBusClientServe
InputStream expected = getClass()
.getResourceAsStream("resources/expected_get_book123.txt");
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in)));
}
@Test
@@ -140,7 +141,6 @@ public class JAXRSClientServerProxySpringBookTest extends AbstractBusClientServe
InputStream expected = getClass()
.getResourceAsStream("resources/expected_get_book123json.txt");
- //System.out.println("---" + getStringFromInputStream(in));
assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
}
@@ -164,4 +164,11 @@ public class JAXRSClientServerProxySpringBookTest extends AbstractBusClientServe
return str;
}
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
index f3eb029..e79e88c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
@@ -59,7 +59,8 @@ public class JAXRSClientServerResourceCreatedOutsideBookTest extends AbstractBus
InputStream expected = getClass()
.getResourceAsStream("resources/expected_get_book123.txt");
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in)));
}
@Test
@@ -100,11 +101,18 @@ public class JAXRSClientServerResourceCreatedOutsideBookTest extends AbstractBus
assertEquals(200, responseCode);
InputStream expected = getClass().getResourceAsStream("resources/expected_add_book.txt");
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(httpUrlConnection
- .getInputStream()));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(httpUrlConnection
+ .getInputStream())));
httpUrlConnection.disconnect();
}
-
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
private String getStringFromInputStream(InputStream in) throws Exception {
CachedOutputStream bos = new CachedOutputStream();
IOUtils.copy(in, bos);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java
index 48d78ab..58736ef 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java
@@ -80,7 +80,15 @@ public class JAXRSClientServerResourceCreatedSpringBookTest extends AbstractBusC
InputStream expected = getClass()
.getResourceAsStream("resources/expected_get_book123.txt");
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in)));
+ }
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
index 2ed0c94..dc39ed6 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
@@ -204,10 +204,17 @@ public class JAXRSClientServerResourceCreatedSpringProviderTest extends Abstract
.getResourceAsStream("resources/expected_get_book123badgerfish.txt");
assertEquals("BadgerFish output not correct",
- getStringFromInputStream(expected).trim(),
- getStringFromInputStream(in).trim());
+ stripXmlInstructionIfNeeded(getStringFromInputStream(expected).trim()),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in).trim()));
}
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
@Test
public void testGetBookNotFound() throws Exception {
@@ -224,8 +231,8 @@ public class JAXRSClientServerResourceCreatedSpringProviderTest extends Abstract
.getResourceAsStream("resources/expected_get_book_notfound_mapped.txt");
assertEquals("Exception is not mapped correctly",
- getStringFromInputStream(expected).trim(),
- getStringFromInputStream(in).trim());
+ stripXmlInstructionIfNeeded(getStringFromInputStream(expected).trim()),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in).trim()));
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 152396e..b01a9c7 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -855,7 +855,8 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
assertEquals(status, result);
if (status == 200) {
InputStream expected = getClass().getResourceAsStream("resources/expected_add_book.txt");
- assertEquals(getStringFromInputStream(expected), post.getResponseBodyAsString());
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(post.getResponseBodyAsString()));
}
} finally {
// Release current connection to the connection pool once you are done
@@ -879,7 +880,8 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
assertEquals(status, result);
if (status == 200) {
InputStream expected = getClass().getResourceAsStream("resources/expected_add_book.txt");
- assertEquals(getStringFromInputStream(expected), post.getResponseBodyAsString());
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(post.getResponseBodyAsString()));
}
} finally {
// Release current connection to the connection pool once you are done
@@ -908,4 +910,11 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
MediaType.APPLICATION_JSON_TYPE, null, is);
}
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
index 295687c..c9a9309 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
@@ -343,7 +343,8 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
InputStream in = getHttpInputStream("http://localhost:" + PORT + "/test/services/rest/bookstore/0");
InputStream expected = getClass().getResourceAsStream("resources/expected_get_book123.txt");
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in)));
}
@@ -353,7 +354,8 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
InputStream in = getHttpInputStream("http://localhost:" + PORT + "/test/services/rest/bookstore/123");
InputStream expected = getClass().getResourceAsStream("resources/expected_get_book123.txt");
- assertEquals(getStringFromInputStream(expected), getStringFromInputStream(in));
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(getStringFromInputStream(in)));
}
@@ -757,7 +759,8 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
InputStream expected = getClass().getResourceAsStream("resources/expected_add_book.txt");
- assertEquals(getStringFromInputStream(expected), post.getResponseBodyAsString());
+ assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(post.getResponseBodyAsString()));
} finally {
// Release current connection to the connection pool once you are done
post.releaseConnection();
@@ -1126,5 +1129,11 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
}
}
-
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f82a3e2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
index 00abc4d..af74fca 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java
@@ -60,12 +60,19 @@ public abstract class AbstractSpringSecurityTest extends AbstractBusClientServer
String resource = "/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt";
InputStream expected = getClass().getResourceAsStream(resource);
assertEquals("Expected value is wrong",
- getStringFromInputStream(expected), content);
+ stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
+ stripXmlInstructionIfNeeded(content));
}
} finally {
get.releaseConnection();
}
}
-
+ private String stripXmlInstructionIfNeeded(String str) {
+ if (str != null && str.startsWith("<?xml")) {
+ int index = str.indexOf("?>");
+ str = str.substring(index + 2);
+ }
+ return str;
+ }
}
[04/16] git commit: With MOXy,
the array types namespace only comes from the package-info
Posted by dk...@apache.org.
With MOXy, the array types namespace only comes from the package-info
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8001e892
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8001e892
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8001e892
Branch: refs/heads/2.7.x-fixes
Commit: 8001e8926279def046636e3991ac1dbea7721ccc
Parents: 78c5ca8
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Mar 27 01:14:40 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:56:48 2014 -0400
----------------------------------------------------------------------
.../org/apache/cxf/javascript/fortest/package-info.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8001e892/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/package-info.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/package-info.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/package-info.java
index 2968f4c..bd091d2 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/package-info.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/package-info.java
@@ -17,12 +17,5 @@
* under the License.
*/
-@javax.xml.bind.annotation.XmlSchema(xmlns = {
- @javax.xml.bind.annotation.XmlNs(
- namespaceURI = "uri:org.apache.cxf.javascript.testns3",
- prefix = "Plan3")
- }
- ,
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED
- )
-package org.apache.cxf.javascript.fortest;
\ No newline at end of file
+@javax.xml.bind.annotation.XmlSchema(namespace = "uri:org.apache.cxf.javascript.testns")
+package org.apache.cxf.javascript.fortest;
[03/16] git commit: The the rs/providers working with MOXy
Posted by dk...@apache.org.
The the rs/providers working with MOXy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/78c5ca8e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/78c5ca8e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/78c5ca8e
Branch: refs/heads/2.7.x-fixes
Commit: 78c5ca8e5336c080b1c2f88a95e7791eedde648a
Parents: 323863b
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Mar 26 19:07:01 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:56:35 2014 -0400
----------------------------------------------------------------------
.../transform/DelegatingNamespaceContext.java | 6 ++++--
.../jaxrs/provider/json/utils/JSONUtils.java | 9 +++++++++
.../jaxrs/provider/json/JSONProviderTest.java | 21 ++++++++++++++++++--
3 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/78c5ca8e/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java b/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
index 9d5737f..041b181 100644
--- a/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
+++ b/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
@@ -52,8 +52,10 @@ class DelegatingNamespaceContext implements NamespaceContext {
}
public void addPrefix(String prefix, String ns) {
- namespaces.getFirst().put(prefix, ns);
- prefixes.getFirst().put(ns, prefix);
+ if (!namespaces.isEmpty()) {
+ namespaces.getFirst().put(prefix, ns);
+ prefixes.getFirst().put(ns, prefix);
+ }
}
public String findUniquePrefix(String ns) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/78c5ca8e/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
index 5039617..6b2a4ad 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
@@ -176,6 +176,15 @@ public final class JSONUtils {
this.namespaceMap = nsMap;
}
+
+ public String getNamespaceURI(String arg0) {
+ String uri = super.getNamespaceURI(arg0);
+ if (uri == null) {
+ uri = getNamespaceContext().getNamespaceURI(arg0);
+ }
+ return uri;
+ }
+
@Override
public String getAttributePrefix(int n) {
QName name = getAttributeName(n);
http://git-wip-us.apache.org/repos/asf/cxf/blob/78c5ca8e/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index bf9a7fd..c5e1086 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -633,6 +633,10 @@ public class JSONProviderTest extends Assert {
@Test
public void testWriteToSingleQualifiedTagBadgerFish() throws Exception {
JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
+ Map<String, String> namespaceMap = new HashMap<String, String>();
+ namespaceMap.put("http://tags", "ns2");
+ p.setNamespaceMap(namespaceMap);
+
p.setConvention("badgerfish");
TagVO2 tag = createTag2("a", "b");
@@ -893,9 +897,10 @@ public class JSONProviderTest extends Assert {
private void doTestMixedContent(String data, boolean ignore, String fileName) throws Exception {
InputStream is = getClass().getResourceAsStream(fileName);
- JAXBContext context = JAXBContext.newInstance(new Class[]{Books.class, Book.class});
+ JAXBContext context = JAXBContext.newInstance(Books.class);
Unmarshaller um = context.createUnmarshaller();
JAXBElement<?> jaxbEl = um.unmarshal(new StreamSource(is), Books.class);
+
JSONProvider<JAXBElement<?>> p = new JSONProvider<JAXBElement<?>>();
p.setIgnoreMixedContent(ignore);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -1366,6 +1371,11 @@ public class JSONProviderTest extends Assert {
@Test
public void testOutAppendElementsSameNs() throws Exception {
JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
+
+ Map<String, String> namespaceMap = new HashMap<String, String>();
+ namespaceMap.put("http://tags", "ns2");
+ provider.setNamespaceMap(namespaceMap);
+
Map<String, String> map = new HashMap<String, String>();
map.put("{http://tags}thetag", "{http://tags}t");
provider.setOutAppendElements(map);
@@ -1380,6 +1390,11 @@ public class JSONProviderTest extends Assert {
@Test
public void testOutAppendElementsDiffNs() throws Exception {
JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
+
+ Map<String, String> namespaceMap = new HashMap<String, String>();
+ namespaceMap.put("http://tags", "ns2");
+ provider.setNamespaceMap(namespaceMap);
+
Map<String, String> map = new HashMap<String, String>();
map.put("{http://tags}thetag", "{http://tagsvo2}t");
provider.setOutAppendElements(map);
@@ -1394,6 +1409,9 @@ public class JSONProviderTest extends Assert {
@Test
public void testOutElementsMapLocalNsToLocalNs() throws Exception {
JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
+ Map<String, String> namespaceMap = new HashMap<String, String>();
+ namespaceMap.put("http://tags", "ns2");
+ provider.setNamespaceMap(namespaceMap);
Map<String, String> map = new HashMap<String, String>();
map.put("{http://tags}thetag", "{http://tagsvo2}t");
provider.setOutTransformElements(map);
@@ -1473,7 +1491,6 @@ public class JSONProviderTest extends Assert {
provider.writeTo(b, Base1.class, Base1.class,
new Annotation[0], MediaType.APPLICATION_JSON_TYPE,
new MetadataMap<String, Object>(), bos);
-
readBase(bos.toString());
}
[08/16] git commit: Fix checkstyle
Posted by dk...@apache.org.
Fix checkstyle
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a82725cd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a82725cd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a82725cd
Branch: refs/heads/2.7.x-fixes
Commit: a82725cdfdafef00bac0348d2d06c33db4e1790c
Parents: 8f82a3e
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Mar 28 19:40:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:58:24 2014 -0400
----------------------------------------------------------------------
.../jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a82725cd/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
index e79e88c..8f04353 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
@@ -103,7 +103,7 @@ public class JAXRSClientServerResourceCreatedOutsideBookTest extends AbstractBus
InputStream expected = getClass().getResourceAsStream("resources/expected_add_book.txt");
assertEquals(stripXmlInstructionIfNeeded(getStringFromInputStream(expected)),
stripXmlInstructionIfNeeded(getStringFromInputStream(httpUrlConnection
- .getInputStream())));
+ .getInputStream())));
httpUrlConnection.disconnect();
}
private String stripXmlInstructionIfNeeded(String str) {
[10/16] git commit: Put generated source into default location
Posted by dk...@apache.org.
Put generated source into default location
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/10602169
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/10602169
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/10602169
Branch: refs/heads/2.7.x-fixes
Commit: 106021694edbf1b227b428e8d8d485db0614b9e8
Parents: cd93bbe
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 2 13:28:25 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 10:00:58 2014 -0400
----------------------------------------------------------------------
services/wsn/wsn-api/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/10602169/services/wsn/wsn-api/pom.xml
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml
index 255facf..ab98087 100644
--- a/services/wsn/wsn-api/pom.xml
+++ b/services/wsn/wsn-api/pom.xml
@@ -57,7 +57,6 @@
<execution>
<phase>generate-sources</phase>
<configuration>
- <sourceRoot>${basedir}/target/jaxws</sourceRoot>
<defaultOptions>
<markGenerated>true</markGenerated>
<faultSerialVersionUID>1</faultSerialVersionUID>
[09/16] git commit: [CXF-5668] Set explicit parent to ProxyClassloader
Posted by dk...@apache.org.
[CXF-5668] Set explicit parent to ProxyClassloader
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cd93bbe6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cd93bbe6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cd93bbe6
Branch: refs/heads/2.7.x-fixes
Commit: cd93bbe6a98ca8b8a4a8f005e533641812dd0281
Parents: a82725c
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed Apr 2 18:45:43 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Apr 4 09:59:59 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/common/util/ProxyClassLoader.java | 7 +++++--
api/src/main/java/org/apache/cxf/common/util/ProxyHelper.java | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/cd93bbe6/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java b/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
index f7de519..f14e61f 100644
--- a/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
+++ b/api/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
@@ -32,10 +32,13 @@ public class ProxyClassLoader extends ClassLoader {
private final Set<ClassLoader> loaders = new HashSet<ClassLoader>();
private boolean checkSystem;
- public ProxyClassLoader() {
+ public ProxyClassLoader(ClassLoader parent) {
+ super(parent);
classes = null;
}
- public ProxyClassLoader(Class<?>[] cls) {
+
+ public ProxyClassLoader(ClassLoader parent, Class<?>[] cls) {
+ super(parent);
classes = cls;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/cd93bbe6/api/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/common/util/ProxyHelper.java b/api/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
index c252574..27f2c56 100644
--- a/api/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
+++ b/api/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
@@ -58,7 +58,7 @@ public class ProxyHelper {
if (canSeeAllInterfaces(loader, interfaces)) {
return loader;
}
- ProxyClassLoader combined = new ProxyClassLoader(interfaces);
+ ProxyClassLoader combined = new ProxyClassLoader(loader, interfaces);
for (Class<?> currentInterface : interfaces) {
combined.addLoader(currentInterface.getClassLoader());
}