Author: alessio.soldano(a)jboss.com Date: 2013-01-08 07:01:16 -0500 (Tue, 08 Jan 2013) New Revision: 17196 Modified: common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java Log: [JBPAPP6-1767] Allow passing in explicit expected location for schemas Modified: common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java =================================================================== --- common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2013-01-08 11:52:11 UTC (rev 17195) +++ common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2013-01-08 12:01:16 UTC (rev 17196) @@ -125,10 +125,15 @@ return builder; } + protected void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published) throws Exception + { + this.publishWsdlImports(parentURL, parentDefinition, published, expLocation); + } + /** Publish the wsdl imports for a given wsdl definition */ @SuppressWarnings("unchecked") - protected void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published) throws Exception + protected void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published, String expLocation) throws Exception { String baseURI = parentURL.toExternalForm(); @@ -166,19 +171,24 @@ log.debug("WSDL import published to: " + targetURL); // recursively publish imports - publishWsdlImports(targetURL, subdef, published); + publishWsdlImports(targetURL, subdef, published, expLocation); // Publish XMLSchema imports Element subdoc = DOMUtils.parse(targetURL.openStream(), getDocumentBuilder()); - publishSchemaImports(targetURL, subdoc, published); + publishSchemaImports(targetURL, subdoc, published, expLocation); } } } } + + protected void publishSchemaImports(URL parentURL, Element element, List<String> published) throws Exception + { + this.publishSchemaImports(parentURL, element, published, expLocation); + } /** Publish the schema imports for a given wsdl definition */ - protected void publishSchemaImports(URL parentURL, Element element, List<String> published) throws Exception + protected void publishSchemaImports(URL parentURL, Element element, List<String> published, String expLocation) throws Exception { String baseURI = parentURL.toExternalForm(); @@ -240,13 +250,13 @@ // recursively publish imports Element subdoc = DOMUtils.parse(xsdURL.openStream(), getDocumentBuilder()); - publishSchemaImports(xsdURL, subdoc, published); + publishSchemaImports(xsdURL, subdoc, published, expLocation); } } } else { - publishSchemaImports(parentURL, childElement, published); + publishSchemaImports(parentURL, childElement, published, expLocation); } } }