Author: dkulp
Date: Tue Aug 19 10:11:11 2008
New Revision: 687096
URL: http://svn.apache.org/viewvc?rev=687096&view=rev
Log:
[CXF-1620] Check parent nodes for jaxb attributes as well.
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=687096&r1=687095&r2=687096&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Tue Aug 19 10:11:11 2008
@@ -278,6 +278,9 @@
private void copyJaxbAttributes(Node childNode, Element schemaNode) {
if (childNode instanceof Element) {
Element el = (Element)childNode;
+ if (el.getParentNode() != null) {
+ copyJaxbAttributes(el.getParentNode(), schemaNode);
+ }
NamedNodeMap atts = el.getAttributes();
for (int x = 0; x < atts.getLength(); x++) {
Attr attr = (Attr)atts.item(x);
Modified:
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb?rev=687096&r1=687095&r2=687096&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
(original)
+++
cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
Tue Aug 19 10:11:11 2008
@@ -20,14 +20,14 @@
<jaxws:bindings wsdlLocation="jaxb_custom_extensors.wsdl"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
+ jaxb:extensionBindingPrefixes="xjc"
+ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";>
<jaxws:bindings node="wsdl:definitions/wsdl:types/xsd:schema">
<jaxb:globalBindings
- jaxb:version="2.0"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
- jaxb:extensionBindingPrefixes="xjc">
+ jaxb:version="2.0">
<xjc:simple />
</jaxb:globalBindings>
</jaxws:bindings>
