Author: dkulp Date: Tue Dec 8 03:25:19 2009 New Revision: 888238 URL: http://svn.apache.org/viewvc?rev=888238&view=rev Log: Merged revisions 888161 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r888161 | dkulp | 2009-12-07 17:23:32 -0500 (Mon, 07 Dec 2009) | 10 lines Merged revisions 888159 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r888159 | dkulp | 2009-12-07 17:20:55 -0500 (Mon, 07 Dec 2009) | 2 lines [CXF-2571] Set systemId on the dom things for xjc Workaround bug in xjc not resolving jar: urls ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=888238&r1=888237&r2=888238&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Tue Dec 8 03:25:19 2009 @@ -83,8 +83,8 @@ import org.apache.cxf.tools.wsdlto.core.RandomValueProvider; - public class JAXBDataBinding implements DataBindingProfile { + private static final Logger LOG = LogUtils.getL7dLogger(JAXBDataBinding.class); private static final Set<String> DEFAULT_TYPE_MAP = new HashSet<String>(); @@ -376,21 +376,34 @@ } private Element removeImportElement(Element element) { - List<Element> elemList = DOMUtils.findAllElementsByTagNameNS(element, + List<Element> impElemList = DOMUtils.findAllElementsByTagNameNS(element, ToolConstants.SCHEMA_URI, "import"); - if (elemList.size() == 0) { + List<Element> incElemList = DOMUtils.findAllElementsByTagNameNS(element, + ToolConstants.SCHEMA_URI, + "include"); + if (impElemList.size() == 0 && incElemList.size() == 0) { return element; } element = (Element)cloneNode(element.getOwnerDocument(), element, true); - elemList = DOMUtils.findAllElementsByTagNameNS(element, + List<Node> ns = new ArrayList<Node>(); + + impElemList = DOMUtils.findAllElementsByTagNameNS(element, ToolConstants.SCHEMA_URI, "import"); - List<Node> ns = new ArrayList<Node>(); - for (Element elem : elemList) { + for (Element elem : impElemList) { Node importNode = elem; ns.add(importNode); } + incElemList = DOMUtils.findAllElementsByTagNameNS(element, + ToolConstants.SCHEMA_URI, + "include"); + for (Element elem : incElemList) { + Node importNode = elem; + ns.add(importNode); + } + + for (Node item : ns) { Node schemaNode = item.getParentNode(); schemaNode.removeChild(item);
