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 2012/12/04 22:12:00 UTC
svn commit: r1417185 - in
/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples:
in_jvm_transport/src/main/java/demo/colocated/client/
jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/
jaxws_handlers/src/main/java/demo/handlers/cl...
Author: dkulp
Date: Tue Dec 4 21:11:59 2012
New Revision: 1417185
URL: http://svn.apache.org/viewvc?rev=1417185&view=rev
Log:
Merged revisions 1417165 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1417165 | dkulp | 2012-12-04 15:55:43 -0500 (Tue, 04 Dec 2012) | 10 lines
Merged revisions 1414386 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1414386 | dkulp | 2012-11-27 15:33:58 -0500 (Tue, 27 Nov 2012) | 2 lines
Don't use some deprecated API's
........
........
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java?rev=1417185&r1=1417184&r2=1417185&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java Tue Dec 4 21:11:59 2012
@@ -51,7 +51,7 @@ public final class Client {
URL wsdlURL;
File wsdlFile = new File(args[0]);
if (wsdlFile.exists()) {
- wsdlURL = wsdlFile.toURL();
+ wsdlURL = wsdlFile.toURI().toURL();
} else {
wsdlURL = new URL(args[0]);
}
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java?rev=1417185&r1=1417184&r2=1417185&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java Tue Dec 4 21:11:59 2012
@@ -52,7 +52,7 @@ public final class Client {
URL wsdlURL;
File wsdlFile = new File(args[0]);
if (wsdlFile.exists()) {
- wsdlURL = wsdlFile.toURL();
+ wsdlURL = wsdlFile.toURI().toURL();
} else {
wsdlURL = new URL(args[0]);
}
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java?rev=1417185&r1=1417184&r2=1417185&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java Tue Dec 4 21:11:59 2012
@@ -53,7 +53,7 @@ public final class Client {
File wsdl = new File(args[0]);
- AddNumbersService service = new AddNumbersService(wsdl.toURL(), serviceName);
+ AddNumbersService service = new AddNumbersService(wsdl.toURI().toURL(), serviceName);
AddNumbers port = (AddNumbers)service.getPort(portName, AddNumbers.class);
//Add client side handlers programmatically
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java?rev=1417185&r1=1417184&r2=1417185&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/Client.java Tue Dec 4 21:11:59 2012
@@ -50,7 +50,7 @@ public final class Client {
URL wsdlURL;
File wsdlFile = new File(args[0]);
if (wsdlFile.exists()) {
- wsdlURL = wsdlFile.toURL();
+ wsdlURL = wsdlFile.toURI().toURL();
} else {
wsdlURL = new URL(args[0]);
}