Author: dkulp
Date: Thu Jul 30 16:45:17 2009
New Revision: 799358
URL: http://svn.apache.org/viewvc?rev=799358&view=rev
Log:
Merged revisions 799267 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r799267 | dkulp | 2009-07-30 09:52:21 -0400 (Thu, 30 Jul 2009) | 2 lines
[CXF-2371] Use a single wsdl and set the address. Should make it faster
and use less memory
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 30 16:45:17 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798891,798929-798930
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798891,798929-798930,799267
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java?rev=799358&r1=799357&r2=799358&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
Thu Jul 30 16:45:17 2009
@@ -19,8 +19,6 @@
package org.apache.cxf.systest.ws.wssc;
-import java.net.URL;
-
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -101,13 +99,9 @@
new
SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client/client.xml");
BusFactory.setDefaultBus(bus);
BusFactory.setThreadDefaultBus(bus);
- URL wsdlLocation = null;
+ PingService svc = new PingService();
for (String portPrefix : argv) {
- PingService svc;
- wsdlLocation = new URL("http://localhost:9001/"; + portPrefix +
"?wsdl");
-
- svc = new PingService(wsdlLocation);
final IPingService port =
svc.getPort(
new QName(
@@ -117,7 +111,8 @@
IPingService.class
);
-
+
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+
"http://localhost:9001/"; + portPrefix);
if (portPrefix.charAt(0) == '_') {
//MS would like the _ versions to send a cancel
((BindingProvider)port).getRequestContext()
