Author: klape Date: 2011-04-25 14:40:06 -0400 (Mon, 25 Apr 2011) New Revision: 14193 Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java Log: [JBPAPP-6365] Also adding namespace declarations of the <types> parent tag Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2011-04-25 16:05:02 UTC (rev 14192) +++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaExtractor.java 2011-04-25 18:40:06 UTC (rev 14193) @@ -71,7 +71,9 @@ // parse the wsdl Element root = DOMUtils.parse(wsdlURL.openStream()); - List<Attr> nsAttrs = getNamespaceAttrs(root); + List<Attr> nsAttrs = new ArrayList<Attr>(); + + getNamespaceAttrs(root, nsAttrs); // get the types element QName typesQName = new QName(root.getNamespaceURI(), "types"); @@ -82,6 +84,8 @@ return null; } + getNamespaceAttrs(typesEl, nsAttrs); + // get the schema element QName schemaQName = new QName("http://www.w3.org/2001/XMLSchema";, "schema"); List<Element> schemaElements = DOMUtils.getChildElementsAsList(typesEl, schemaQName); @@ -122,10 +126,8 @@ return streams.toArray(new InputStream[streams.size()]); } - private List<Attr> getNamespaceAttrs(Element element) + private void getNamespaceAttrs(Element element, List<Attr> nsAttrs) { - List<Attr> nsAttrs = new ArrayList<Attr>(); - NamedNodeMap nodes = element.getAttributes(); for(int i=0; i < nodes.getLength(); i++) @@ -135,8 +137,6 @@ if(attr.getName().startsWith("xmlns")) nsAttrs.add((Attr)attr.cloneNode(true)); } - - return nsAttrs; } private void pullImportedSchemas(Element schemaElement, List<InputStream> streams)