Author: dkulp
Date: Tue Dec 4 20:55:43 2012
New Revision: 1417165
URL: http://svn.apache.org/viewvc?rev=1417165&view=rev
Log:
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.6.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
Modified:
cxf/branches/2.6.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.6.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java?rev=1417165&r1=1417164&r2=1417165&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
Tue Dec 4 20:55:43 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.6.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.6.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java?rev=1417165&r1=1417164&r2=1417165&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
Tue Dec 4 20:55:43 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.6.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.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java?rev=1417165&r1=1417164&r2=1417165&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java
Tue Dec 4 20:55:43 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.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java?rev=1417165&r1=1417164&r2=1417165&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
Tue Dec 4 20:55:43 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]);
}
