cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r687100 - in /cxf/branches/2.0.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/
Date Tue, 19 Aug 2008 17:28:08 GMT
Author: dkulp
Date: Tue Aug 19 10:28:07 2008
New Revision: 687100

URL: http://svn.apache.org/viewvc?rev=687100&view=rev
Log:
Merged revisions 687097 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r687097 | dkulp | 2008-08-19 13:17:22 -0400 (Tue, 19 Aug 2008) | 9 lines
  
  Merged revisions 687096 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r687096 | dkulp | 2008-08-19 13:11:11 -0400 (Tue, 19 Aug 2008) | 2 lines
    
    [CXF-1620] Check parent nodes for jaxb attributes as well.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
    cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 19 10:28:07 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827
-/cxf/trunk:651669-686342,686344-686363,686764,686820
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 19 10:28:07 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828
+/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=687100&r1=687099&r2=687100&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Tue Aug 19 10:28:07 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/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb?rev=687100&r1=687099&r2=687100&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
(original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jaxb_custom_extensors.xjb
Tue Aug 19 10:28:07 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>



Mime
View raw message