[jbossws-commits] JBossWS SVN: r18182 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss: ws/metadata/builder/jaxws and 2 other directories.

Author: rsearls Date: 2013-12-16 10:23:57 -0500 (Mon, 16 Dec 2013) New Revision: 18182 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java Log: JBPAPP-10417: installed toURI() calls as described in jira. Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2013-12-16 15:23:11 UTC (rev 18181) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2013-12-16 15:23:57 UTC (rev 18182) @@ -109,7 +109,7 @@ || (wsdlPublishLoc != null && resourceAbsPath.indexOf(new File(new URL(wsdlPublishLoc).getPath()).getCanonicalPath()) >= 0)) { - Element wsdlElement = DOMUtils.parse(impResourceFile.toURL().openStream()); + Element wsdlElement = DOMUtils.parse(impResourceFile.toURI().toURL().openStream()); wsdlDoc = wsdlElement.getOwnerDocument(); } else Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-12-16 15:23:11 UTC (rev 18181) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2013-12-16 15:23:57 UTC (rev 18182) @@ -456,7 +456,7 @@ }); writer.close(); - serviceMetaData.setWsdlLocation(wsdlFile.toURL()); + serviceMetaData.setWsdlLocation(wsdlFile.toURI().toURL()); } Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2013-12-16 15:23:11 UTC (rev 18181) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2013-12-16 15:23:57 UTC (rev 18182) @@ -564,14 +564,14 @@ tmpFile = SchemaUtils.getSchemaTempFile(targetNS, wsdlContent); tempFiles.add(tmpFile); - publishedLocations.put(wsdlLoc, tmpFile.toURL()); + publishedLocations.put(wsdlLoc, tmpFile.toURI().toURL()); } else { tmpFile = SchemaUtils.getSchemaTempFile("no_namespace", wsdlContent); tempFiles.add(tmpFile); - publishedLocations.put(wsdlLoc, tmpFile.toURL()); + publishedLocations.put(wsdlLoc, tmpFile.toURI().toURL()); } // Handle schema includes @@ -607,7 +607,7 @@ if (targetNS != null) { - schemaLocationsMap.put(targetNS, tmpFile.toURL()); + schemaLocationsMap.put(targetNS, tmpFile.toURI().toURL()); } else { Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2013-12-16 15:23:11 UTC (rev 18181) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2013-12-16 15:23:57 UTC (rev 18182) @@ -114,22 +114,22 @@ WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET); - URL wsdlPublishURL = wsdlFile.toURL(); + URL wsdlPublishURL = wsdlFile.toURI().toURL(); log.info("WSDL published to: " + wsdlPublishURL); // udpate the wsdl file location - serviceMetaData.setWsdlLocation(wsdlFile.toURL()); + serviceMetaData.setWsdlLocation(wsdlPublishURL); // Process the wsdl imports Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition(); if (wsdl11Definition != null) { List<String> published = new LinkedList<String>(); - publishWsdlImports(wsdlFile.toURL(), wsdl11Definition, published); + publishWsdlImports(wsdlPublishURL, wsdl11Definition, published); // Publish XMLSchema imports Document document = wsdlDefinitions.getWsdlDocument(); - publishSchemaImports(wsdlFile.toURL(), document.getDocumentElement(), published); + publishSchemaImports(wsdlPublishURL, document.getDocumentElement(), published); } else { @@ -307,7 +307,7 @@ else { if (file.delete() == false) - log.warn("Cannot delete published wsdl document: " + file.toURL()); + log.warn("Cannot delete published wsdl document: " + file.toURI().toURL()); } }