Author: alessio.soldano(a)jboss.com
Date: 2012-08-27 12:53:48 -0400 (Mon, 27 Aug 2012)
New Revision: 16645
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
Log:
[JBWS-3540] Allow passing in explicit expected location for schemas
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2012-08-27
09:14:02 UTC (rev 16644)
+++
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2012-08-27
16:53:48 UTC (rev 16645)
@@ -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);
}
}
}