Author: veithen
Date: Sat Aug 26 15:37:33 2017
New Revision: 1806311
URL: http://svn.apache.org/viewvc?rev=1806311&view=rev
Log:
AXIS2-5793: Merge r1806292 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
axis/axis2/java/core/branches/1_7/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
axis/axis2/java/core/branches/1_7/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/RPCLitStringArrayService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/asyncdoclit/client/AsyncService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbaremin/sei/BareDocLitMinService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbarenoarg/sei/BareDocLitNoArgService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/sei/ResourceInjectionService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/stringlist/sei/StringListService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wsgen/client/WSGenService.java
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java
axis/axis2/java/core/branches/1_7/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/description/WSDLWrapperTest.java
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/CatalogWSDLLocator.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/ModuleWSDLLocator.java
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportEndpointTests.java
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportHandlersTests.java
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
axis/axis2/java/core/branches/1_7/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java
axis/axis2/java/core/branches/1_7/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 26 15:37:33 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806303-1806305
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305
Modified:
axis/axis2/java/core/branches/1_7/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java
Sat Aug 26 15:37:33 2017
@@ -95,7 +95,7 @@ public class CorbaDeployer extends Abstr
AxisServiceGroup serviceGroup = new AxisServiceGroup(axisConfig);
serviceGroup.setServiceGroupClassLoader(deploymentFileData.getClassLoader());
ArrayList serviceList = processService(deploymentFileData,
serviceGroup, configCtx);
- DeploymentEngine.addServiceGroup(serviceGroup, serviceList,
deploymentFileData.getFile().toURL(), deploymentFileData, axisConfig);
+ DeploymentEngine.addServiceGroup(serviceGroup, serviceList,
deploymentFileData.getFile().toURI().toURL(), deploymentFileData, axisConfig);
name = deploymentFileData.getName();
super.deploy(deploymentFileData);
log.info("Deploying " + name);
Modified:
axis/axis2/java/core/branches/1_7/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
Sat Aug 26 15:37:33 2017
@@ -121,7 +121,7 @@ public class Java2WSDLCodegenEngine impl
if (Java2WSDLUtils.isURL(classPathEntry)) {
urls[i] = new URL(classPathEntry);
} else {
- urls[i] = new File(classPathEntry).toURL();
+ urls[i] = new File(classPathEntry).toURI().toURL();
}
}
} catch (MalformedURLException e) {
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java
Sat Aug 26 15:37:33 2017
@@ -359,7 +359,7 @@ public class CodeGenerationUtility {
private static void scanEpisodeFile(File jar, SchemaCompiler sc)
throws BadCommandLineException, IOException {
- URLClassLoader ucl = new URLClassLoader(new URL[]{jar.toURL()});
+ URLClassLoader ucl = new URLClassLoader(new
URL[]{jar.toURI().toURL()});
Enumeration<URL> resources =
ucl.findResources("META-INF/sun-jaxb.episode");
while (resources.hasMoreElements()) {
URL url = resources.nextElement();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/context/sei/MessageContextService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class MessageContextService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/jaxb/string/JAXBStringService.java
Sat Aug 26 15:37:33 2017
@@ -32,7 +32,7 @@ public class JAXBStringService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/polymorphic/shape/tests/PolymorphicTests.java
Sat Aug 26 15:37:33 2017
@@ -100,7 +100,7 @@ public class PolymorphicTests extends Ab
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
WSDLWrapper wsdlWrapper = new WSDL4JWrapper(url);
org.apache.axis2.jaxws.wsdl.SchemaReader sr= new
SchemaReaderImpl();
Set<String> set=
sr.readPackagesFromSchema(wsdlWrapper.getDefinition());
@@ -149,7 +149,7 @@ public class PolymorphicTests extends Ab
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
WSDLWrapper wsdlWrapper = new WSDL4JWrapper(url);
org.apache.axis2.jaxws.wsdl.SchemaReader sr= new
SchemaReaderImpl();
Set<String> set=
sr.readPackagesFromSchema(wsdlWrapper.getDefinition());
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
Sat Aug 26 15:37:33 2017
@@ -230,7 +230,7 @@ public class AddressingProviderTests ext
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
File file = new File(wsdlLocation);
- return file.toURL();
+ return file.toURI().toURL();
}
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
Sat Aug 26 15:37:33 2017
@@ -65,7 +65,7 @@ public class GorillaDLWProxyTests extend
*/
public GorillaInterface getProxy() throws MalformedURLException {
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
Object proxy =service.getPort(portName, GorillaInterface.class);
BindingProvider p = (BindingProvider)proxy;
@@ -81,7 +81,7 @@ public class GorillaDLWProxyTests extend
*/
public Dispatch<String> getDispatch() throws MalformedURLException {
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
service.addPort(portName, null, axisEndpoint);
Dispatch<String> dispatch = service.createDispatch(portName,
String.class, Service.Mode.PAYLOAD);
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
Sat Aug 26 15:37:33 2017
@@ -82,7 +82,7 @@ public class ProxyTests extends Abstract
TestLogger.logger.debug("---------------------------------------");
TestLogger.logger.debug("Test Name: " + getName());
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
TestLogger.logger.debug(">>Invoking Binding Provider property");
@@ -108,7 +108,7 @@ public class ProxyTests extends Abstract
TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
String request = new String("some string request");
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
@@ -133,7 +133,7 @@ public class ProxyTests extends Abstract
}
TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(wsdlUrl, serviceName);
String request = new String("some string request");
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
@@ -159,7 +159,7 @@ public class ProxyTests extends Abstract
TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
String request = new String("some string request");
Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
@@ -182,7 +182,7 @@ public class ProxyTests extends Abstract
TestLogger.logger.debug("---------------------------------------");
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
DocLitWrappedProxy proxy =service.getPort(portName,
DocLitWrappedProxy.class);
@@ -220,7 +220,7 @@ public class ProxyTests extends Abstract
return;
}
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
String request = new String("some string request");
@@ -250,7 +250,7 @@ public class ProxyTests extends Abstract
return;
}
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
String request = new String("some string request");
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCLitSWAProxyTests.java
Sat Aug 26 15:37:33 2017
@@ -80,7 +80,7 @@ public class RPCLitSWAProxyTests extends
public RPCLitSWA getProxy() throws MalformedURLException {
File wsdl= new File(wsdlLocation);
assertTrue("WSDL does not exist:" + wsdlLocation,wsdl.exists());
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(wsdlUrl, serviceName);
Object proxy =service.getPort(portName, RPCLitSWA.class);
BindingProvider p = (BindingProvider)proxy;
@@ -96,7 +96,7 @@ public class RPCLitSWAProxyTests extends
*/
public Dispatch<String> getDispatch() throws MalformedURLException {
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
service.addPort(portName, null, axisEndpoint);
Dispatch<String> dispatch = service.createDispatch(portName,
String.class,
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/RPCProxyTests.java
Sat Aug 26 15:37:33 2017
@@ -61,7 +61,7 @@ public class RPCProxyTests extends Abstr
*/
public RPCLit getProxy() throws MalformedURLException {
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
Object proxy =service.getPort(portName, RPCLit.class);
BindingProvider p = (BindingProvider)proxy;
@@ -77,7 +77,7 @@ public class RPCProxyTests extends Abstr
*/
public Dispatch<String> getDispatch() throws MalformedURLException {
File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
+ URL wsdlUrl = wsdl.toURI().toURL();
Service service = Service.create(null, serviceName);
service.addPort(portName, null, axisEndpoint);
Dispatch<String> dispatch = service.createDispatch(portName,
String.class, Service.Mode.PAYLOAD);
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java
Sat Aug 26 15:37:33 2017
@@ -47,7 +47,7 @@ public class SOAP12EchoService
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/enumtype/sei/Service.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class Service
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/RPCLitStringArrayService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/RPCLitStringArrayService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/RPCLitStringArrayService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/rpclit/stringarray/sei/RPCLitStringArrayService.java
Sat Aug 26 15:37:33 2017
@@ -53,7 +53,7 @@ public class RPCLitStringArrayService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class AddNumbersService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/AddNumbersHandlerService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class AddNumbersHandlerService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/asyncdoclit/client/AsyncService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/asyncdoclit/client/AsyncService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/asyncdoclit/client/AsyncService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/asyncdoclit/client/AsyncService.java
Sat Aug 26 15:37:33 2017
@@ -49,7 +49,7 @@ public class AsyncService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java
Sat Aug 26 15:37:33 2017
@@ -52,7 +52,7 @@ public class BareDocLitService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbaremin/sei/BareDocLitMinService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbaremin/sei/BareDocLitMinService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbaremin/sei/BareDocLitMinService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbaremin/sei/BareDocLitMinService.java
Sat Aug 26 15:37:33 2017
@@ -52,7 +52,7 @@ public class BareDocLitMinService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbarenoarg/sei/BareDocLitNoArgService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbarenoarg/sei/BareDocLitNoArgService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbarenoarg/sei/BareDocLitNoArgService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/doclitbarenoarg/sei/BareDocLitNoArgService.java
Sat Aug 26 15:37:33 2017
@@ -47,7 +47,7 @@ public class BareDocLitNoArgService
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
// url = new
URL("file:/test/org/apache/axis2/jaxws/sample/doclitbarenoarg/META-INF/doclitbarenoarg.wsdl");
} catch (MalformedURLException e) {
e.printStackTrace();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class FaultyWebServiceService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class FaultsService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HeadersHandlerService.java
Sat Aug 26 15:37:33 2017
@@ -50,7 +50,7 @@ public class HeadersHandlerService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class DocLitNonWrapService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java
Sat Aug 26 15:37:33 2017
@@ -50,7 +50,7 @@ public class AsyncService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/sei/ResourceInjectionService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/sei/ResourceInjectionService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/sei/ResourceInjectionService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/sei/ResourceInjectionService.java
Sat Aug 26 15:37:33 2017
@@ -46,7 +46,7 @@ public class ResourceInjectionService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/stringlist/sei/StringListService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/stringlist/sei/StringListService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/stringlist/sei/StringListService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/stringlist/sei/StringListService.java
Sat Aug 26 15:37:33 2017
@@ -52,7 +52,7 @@ public class StringListService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class DocLitWrapService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wsgen/client/WSGenService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wsgen/client/WSGenService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wsgen/client/WSGenService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/wsgen/client/WSGenService.java
Sat Aug 26 15:37:33 2017
@@ -53,7 +53,7 @@ public class WSGenService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Sat Aug 26 15:37:33 2017
@@ -81,7 +81,7 @@ public class JAXWSDeployer extends Abstr
urls.add(repository);
String webLocation = DeploymentEngine.getWebLocationString();
if (webLocation != null) {
- urls.add(new File(webLocation).toURL());
+ urls.add(new File(webLocation).toURI().toURL());
}
ClassLoader classLoader = Utils.createClassLoader(
urls,
@@ -92,7 +92,7 @@ public class JAXWSDeployer extends Abstr
axisConfig.isChildFirstClassLoading());
Thread.currentThread().setContextClassLoader(classLoader);
JAXWSDeployerSupport deployerSupport = new
JAXWSDeployerSupport(configCtx, directory);
- deployerSupport.deployClasses("JAXWS-Builtin", file.toURL(),
Thread.currentThread().getContextClassLoader(), classList);
+ deployerSupport.deployClasses("JAXWS-Builtin",
file.toURI().toURL(), Thread.currentThread().getContextClassLoader(),
classList);
} catch (NoClassDefFoundError e) {
if (log.isDebugEnabled()) {
log.debug(Messages.getMessage("deployingexception",
e.getMessage()), e);
@@ -128,7 +128,7 @@ public class JAXWSDeployer extends Abstr
try {
threadClassLoader = Thread.currentThread().getContextClassLoader();
String groupName = deploymentFileData.getName();
- URL location = deploymentFileData.getFile().toURL();
+ URL location = deploymentFileData.getFile().toURI().toURL();
if (isJar(deploymentFileData.getFile())) {
log.info("Deploying artifact : " +
deploymentFileData.getAbsolutePath());
ArrayList<URL> urls = new ArrayList<URL>();
@@ -140,7 +140,7 @@ public class JAXWSDeployer extends Abstr
String webLocation = DeploymentEngine.getWebLocationString();
if (webLocation != null) {
- urls.add(new File(webLocation).toURL());
+ urls.add(new File(webLocation).toURI().toURL());
}
ClassLoader classLoader = Utils.createClassLoader(
urls,
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSServiceBuilderExtension.java
Sat Aug 26 15:37:33 2017
@@ -106,7 +106,7 @@ public class JAXWSServiceBuilderExtensio
.getServiceClassNameFromMetaData(serviceMetaData);
}
- return
deployerSupport.deployClasses(deploymentFileData.getFile().toURL(),
+ return
deployerSupport.deployClasses(deploymentFileData.getFile().toURI().toURL(),
deploymentFileData.getClassLoader(), listOfClasses);
} catch (AxisFault e) {
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/PackageSetBuilder.java
Sat Aug 26 15:37:33 2017
@@ -880,7 +880,7 @@ public class PackageSetBuilder {
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
String wsdlLocationPath = new File(baseDir
+File.separator+ wsdlLocation).getAbsolutePath();
File file = new File(wsdlLocationPath);
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
if(log.isDebugEnabled()){
log.debug("Reading WSDL from URL:"
+url.toString());
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/MultiRedirectionCatalogTest.java
Sat Aug 26 15:37:33 2017
@@ -135,7 +135,7 @@ public class MultiRedirectionCatalogTest
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/catalog/XMLCatalogTests.java
Sat Aug 26 15:37:33 2017
@@ -51,10 +51,10 @@ public class XMLCatalogTests extends Tes
DocumentBuilderFactory documentBuilderFactory =
DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse(file.toURL().toString());
+ parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(doc,file.toURL().toString(),null);
+ XmlSchema schema =
schemaCol.read(doc,file.toURI().toURL().toString(),null);
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new
QName("http://soapinterop.org/xsd2","SOAPStruct";)));
@@ -72,10 +72,10 @@ public class XMLCatalogTests extends Tes
DocumentBuilderFactory documentBuilderFactory =
DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse(file.toURL().toString());
+ parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(doc,file.toURL().toString(),null);
+ XmlSchema schema =
schemaCol.read(doc,file.toURI().toURL().toString(),null);
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new
QName("http://soapinterop.org/xsd2","SOAPStruct";)));
@@ -96,11 +96,11 @@ public class XMLCatalogTests extends Tes
DocumentBuilderFactory documentBuilderFactory =
DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Document doc = documentBuilderFactory.newDocumentBuilder().
- parse(file.toURL().toString());
+ parse(file.toURI().toURL().toString());
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
schemaCol.setSchemaResolver(new CatalogURIResolver(catalogManager));
- XmlSchema schema = schemaCol.read(doc,file.toURL().toString(),null);
+ XmlSchema schema =
schemaCol.read(doc,file.toURI().toURL().toString(),null);
assertNotNull(schema);
assertNotNull(schema.getTypeByName(new
QName("http://soapinterop.org/xsd2","SOAPStruct";)));
@@ -123,7 +123,7 @@ public class XMLCatalogTests extends Tes
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ClientConfigTests.java
Sat Aug 26 15:37:33 2017
@@ -50,7 +50,7 @@ public class ClientConfigTests extends T
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
Sat Aug 26 15:37:33 2017
@@ -966,7 +966,7 @@ public class ReleaseServiceTests extends
String wsdlLocation = getWsdlLocation(wsdlFileName);
try {
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail("Exception converting WSDL file to URL: " + e.toString());
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils2.java
Sat Aug 26 15:37:33 2017
@@ -61,7 +61,7 @@ public class DescriptionTestUtils2 {
URL wsdlURL = null;
String urlString = getWSDLLocation(wsdlFileName);
try {
- wsdlURL = new File(urlString).getAbsoluteFile().toURL();
+ wsdlURL = new File(urlString).getAbsoluteFile().toURI().toURL();
} catch (Exception e) {
TestLogger.logger.debug(
"Caught exception creating WSDL URL :" + urlString + ";
exception: " +
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/description/sample/addnumbers/AddNumbersService.java
Sat Aug 26 15:37:33 2017
@@ -51,7 +51,7 @@ public class AddNumbersService
e.printStackTrace();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerResolverTest.java
Sat Aug 26 15:37:33 2017
@@ -142,7 +142,7 @@ public class HandlerResolverTest extends
String sep = "/";
configLoc = sep + "test-resources" + sep + "configuration" + sep +
"handlers" + sep + "handler.xml";
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
- is = new File(baseDir + configLoc).toURL().openStream();
+ is = new File(baseDir + configLoc).toURI().toURL().openStream();
}
catch(Exception e) {
e.printStackTrace();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataHandlerChainTest.java
Sat Aug 26 15:37:33 2017
@@ -536,7 +536,7 @@ public class ClientMetadataHandlerChainT
String sep = "/";
configLoc = sep + "test-resources" + sep + "configuration" + sep +
"handlers" + sep + fileName;
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
- is = new File(baseDir + configLoc).toURL().openStream();
+ is = new File(baseDir + configLoc).toURI().toURL().openStream();
}
catch(Exception e) {
e.printStackTrace();
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/spi/ClientMetadataTest.java
Sat Aug 26 15:37:33 2017
@@ -987,7 +987,7 @@ public class ClientMetadataTest extends
String wsdlLocation = getWsdlLocation(wsdlFileName);
try {
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail("Exception converting WSDL file to URL: " + e.toString());
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws/test/org/apache/axis2/jaxws/wsdl/schemareader/SchemaReaderTests.java
Sat Aug 26 15:37:33 2017
@@ -46,7 +46,7 @@ public class SchemaReaderTests extends T
fail();
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail();
Modified:
axis/axis2/java/core/branches/1_7/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
Sat Aug 26 15:37:33 2017
@@ -243,7 +243,7 @@ public class CodeGenerationUtility {
// added work in finding the namespaces.
ValidationContext vctx = BindingElement.newValidationContext();
binding = BindingElement.readBinding(new
FileInputStream(file), path, vctx);
- binding.setBaseUrl(file.toURL());
+ binding.setBaseUrl(file.toURI().toURL());
vctx.setBindingRoot(binding);
IncludePrevalidationVisitor ipv = new
IncludePrevalidationVisitor(vctx);
vctx.tourTree(binding, ipv);
@@ -1192,4 +1192,4 @@ public class CodeGenerationUtility {
return qname.getLocalPart();
}
}
-}
\ No newline at end of file
+}
Modified:
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/addressing/wsdl/WSDL11ActionHelperTest.java
Sat Aug 26 15:37:33 2017
@@ -48,7 +48,7 @@ public class WSDL11ActionHelperTest exte
reader.setFeature("javax.wsdl.verbose", false);
URL wsdlFile = new File(AbstractTestCase.basedir + testWSDLFile)
-
.toURL();//getClass().getClassLoader().getResource(testWSDLFile);
+
.toURI().toURL();//getClass().getClassLoader().getResource(testWSDLFile);
definition = reader.readWSDL(wsdlFile.toString());
}
Modified:
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
Sat Aug 26 15:37:33 2017
@@ -45,7 +45,7 @@ public class ServiceClientTest extends A
if (basedir == null) {
basedir = ".";
}
- URL zipUrl = new File(basedir, "target/test-zip.zip").toURL();
+ URL zipUrl = new File(basedir, "target/test-zip.zip").toURI().toURL();
URL wsdlUrl = new URL("jar:" + zipUrl + "!/test.wsdl");
ServiceClient serviceClient = new ServiceClient(configContext,
wsdlUrl, new QName("urn:test", "EchoService"), "EchoPort");
List<XmlSchema> schemas = serviceClient.getAxisService().getSchema();
Modified:
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/description/WSDLWrapperTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/description/WSDLWrapperTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/description/WSDLWrapperTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/description/WSDLWrapperTest.java
Sat Aug 26 15:37:33 2017
@@ -115,7 +115,7 @@ public class WSDLWrapperTest extends Tes
.createConfigurationContextFromFileSystem(null, axis2xml)
.getAxisConfiguration();
- WSDLDefinitionWrapper passthru = new WSDLDefinitionWrapper(def1,
testResourceFile1.toURL(), false);
+ WSDLDefinitionWrapper passthru = new WSDLDefinitionWrapper(def1,
testResourceFile1.toURI().toURL(), false);
Definition def_passthru = passthru.getUnwrappedDefinition();
String def_passthru_str = def_passthru.toString();
@@ -123,7 +123,7 @@ public class WSDLWrapperTest extends Tes
String def_passthru_namespace = def_passthru.getTargetNamespace();
Types def_passthru_types = def_passthru.getTypes();
- WSDLDefinitionWrapper serialize = new WSDLDefinitionWrapper(def1,
testResourceFile1.toURL(), axisCfg);
+ WSDLDefinitionWrapper serialize = new WSDLDefinitionWrapper(def1,
testResourceFile1.toURI().toURL(), axisCfg);
Definition def_serialize = serialize.getUnwrappedDefinition();
String def_serialize_str = def_serialize.toString();
@@ -131,7 +131,7 @@ public class WSDLWrapperTest extends Tes
String def_serialize_namespace =
def_serialize.getTargetNamespace();
Types def_serialize_types = def_serialize.getTypes();
- WSDLDefinitionWrapper reload = new WSDLDefinitionWrapper(def1,
testResourceFile1.toURL(), 2);
+ WSDLDefinitionWrapper reload = new WSDLDefinitionWrapper(def1,
testResourceFile1.toURI().toURL(), 2);
Definition def_reload = reload.getUnwrappedDefinition();
String def_reload_str = def_reload.toString();
Modified:
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/kernel/test/org/apache/axis2/validation/ValidateAxis2XMLTest.java
Sat Aug 26 15:37:33 2017
@@ -54,7 +54,7 @@ public class ValidateAxis2XMLTest extend
SAXParser parser = factory.newSAXParser();
//validate against the given schemaURL
- parser.setProperty(extSchemaProp, xsdSource.toURL().toString());
+ parser.setProperty(extSchemaProp,
xsdSource.toURI().toURL().toString());
// parse (validates) the xml
parser.parse(xmlSource, new DefaultHandler());
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
Sat Aug 26 15:37:33 2017
@@ -239,7 +239,7 @@ public class JAXWSRIWSDLGenerator implem
if (wsdlFile != null) {
try {
WSDLReader wsdlReader =
WSDLUtil.newWSDLReaderWithPopulatedExtensionRegistry();
- InputStream is = wsdlFile.toURL().openStream();
+ InputStream is = wsdlFile.toURI().toURL().openStream();
Definition definition =
wsdlReader.readWSDL(localOutputDirectory,
new InputSource(is));
try {
@@ -331,7 +331,7 @@ public class JAXWSRIWSDLGenerator implem
List<File> schemaFiles = getSchemaFiles(localOutputDirectory);
for (File schemaFile : schemaFiles) {
// generate dom document for current schema file
- Document parsedDoc =
fac.newDocumentBuilder().parse(schemaFile.toURL().toString());
+ Document parsedDoc =
fac.newDocumentBuilder().parse(schemaFile.toURI().toURL().toString());
// read the schema through XmlSchema
XmlSchema doc =
schemaCollection.read(parsedDoc.getDocumentElement(),
UIDGenerator.generateUID());
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
Sat Aug 26 15:37:33 2017
@@ -2172,7 +2172,7 @@ class OperationDescriptionImpl
WSDL4JWrapper wsdl4j = null;
try {
File file = new File(wsdlLocation);
- URL url = file.toURL();
+ URL url = file.toURI().toURL();
wsdl4j = new WSDL4JWrapper(url, true, 2); // In this
context, limit the wsdl memory
def = wsdl4j.getDefinition();
} catch (Throwable t) {
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
Sat Aug 26 15:37:33 2017
@@ -256,7 +256,7 @@ public class URIResolverImpl implements
streamURL = (URL) AccessController.doPrivileged(
new PrivilegedExceptionAction() {
public Object run() throws MalformedURLException {
- return file.toURL();
+ return file.toURI().toURL();
}
}
);
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/BaseWSDLLocator.java
Sat Aug 26 15:37:33 2017
@@ -126,7 +126,7 @@ public abstract class BaseWSDLLocator {
if(is == null){
try{
File file = new File(relativeLocation);
- absoluteURL = file.toURL();
+ absoluteURL = file.toURI().toURL();
is = absoluteURL.openStream();
lastestImportURI = absoluteURL.toExternalForm();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/CatalogWSDLLocator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/CatalogWSDLLocator.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/CatalogWSDLLocator.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/CatalogWSDLLocator.java
Sat Aug 26 15:37:33 2017
@@ -117,7 +117,7 @@ public class CatalogWSDLLocator extends
if (is == null) {
try {
File file = new File(importPath);
- is = file.toURL().openStream();
+ is = file.toURI().toURL().openStream();
}
catch (Throwable t) {
// No FFDC required
@@ -180,7 +180,7 @@ public class CatalogWSDLLocator extends
if (is == null) {
try {
File file = new File(wsdlLocation);
- streamURL = file.toURL();
+ streamURL = file.toURI().toURL();
is = streamURL.openStream();
is.close();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/ModuleWSDLLocator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/ModuleWSDLLocator.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/ModuleWSDLLocator.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/jaxws/util/ModuleWSDLLocator.java
Sat Aug 26 15:37:33 2017
@@ -99,7 +99,7 @@ public class ModuleWSDLLocator extends B
if (is == null) {
try {
File file = new File(importPath);
- is = file.toURL().openStream();
+ is = file.toURI().toURL().openStream();
}
catch (Throwable t) {
// No FFDC required
@@ -156,7 +156,7 @@ public class ModuleWSDLLocator extends B
if (is == null) {
try {
File file = new File(wsdlLocation);
- streamURL = file.toURL();
+ streamURL = file.toURI().toURL();
is = streamURL.openStream();
is.close();
}
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/src/org/apache/axis2/metadata/registry/MetadataFactoryRegistry.java
Sat Aug 26 15:37:33 2017
@@ -99,7 +99,7 @@ public class MetadataFactoryRegistry {
url = classLoader.getResource(configurationFileLoc);
if(url == null) {
File file = new File(configurationFileLoc);
- url = file.toURL();
+ url = file.toURI().toURL();
}
// the presence of this file is optional
if(url != null) {
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
Sat Aug 26 15:37:33 2017
@@ -57,7 +57,7 @@ public class DescriptionTestUtils {
String urlString = getWSDLLocation(wsdlFileName);
// Get the URL to the WSDL file. Note that 'basedir' is setup by Maven
try {
- wsdlURL = new File(urlString).getAbsoluteFile().toURL();
+ wsdlURL = new File(urlString).getAbsoluteFile().toURI().toURL();
} catch (Exception e) {
System.out.println("Caught exception creating WSDL URL :" +
urlString +
"; exception: " + e.toString());
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportEndpointTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportEndpointTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportEndpointTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportEndpointTests.java
Sat Aug 26 15:37:33 2017
@@ -277,7 +277,7 @@ public class ClientDBCSupportEndpointTes
fail("Exception creating File(WSDL): " + e.toString());
}
File file = new File(wsdlLocation);
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
e.printStackTrace();
fail("Exception converting WSDL file to URL: " + e.toString());
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportHandlersTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportHandlersTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportHandlersTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/ClientDBCSupportHandlersTests.java
Sat Aug 26 15:37:33 2017
@@ -121,7 +121,7 @@ public class ClientDBCSupportHandlersTes
String sep = "/";
configLoc = sep + "test-resources" + sep + "test-handler.xml";
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
- is = new File(baseDir + configLoc).toURL().openStream();
+ is = new File(baseDir + configLoc).toURI().toURL().openStream();
}
catch(Exception e) {
e.printStackTrace();
Modified:
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/metadata/test/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImplTests.java
Sat Aug 26 15:37:33 2017
@@ -247,7 +247,7 @@ public class DescriptionFactoryImplTests
String sep = "/";
configLoc = sep + "test-resources" + sep + "test-handler.xml";
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
- is = new File(baseDir + configLoc).toURL().openStream();
+ is = new File(baseDir + configLoc).toURI().toURL().openStream();
}
catch(Exception e) {
e.printStackTrace();
Modified:
axis/axis2/java/core/branches/1_7/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java?rev=1806311&r1=1806310&r2=1806311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java
Sat Aug 26 15:37:33 2017
@@ -195,7 +195,7 @@ public class ScriptDeploymentEngine exte
InputStream definition;
try {
- definition = wsdlFile.toURL().openStream();
+ definition = wsdlFile.toURI().toURL().openStream();
} catch (Exception e) {
throw new AxisFault("exception opening wsdl", e);
}
@@ -239,7 +239,7 @@ public class ScriptDeploymentEngine exte
protected String readScriptSource(File scriptFile) throws AxisFault {
InputStream is;
try {
- is = scriptFile.toURL().openStream();
+ is = scriptFile.toURI().toURL().openStream();
} catch (IOException e) {
throw new AxisFault("IOException opening script: " + scriptFile,
e);
}
