cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r924897 - in /cxf/branches/2.2.x-fixes: ./ rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
Date Thu, 18 Mar 2010 17:07:30 GMT
Author: dkulp
Date: Thu Mar 18 17:07:30 2010
New Revision: 924897

URL: http://svn.apache.org/viewvc?rev=924897&view=rev
Log:
Merged revisions 924895 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r924895 | dkulp | 2010-03-18 13:04:12 -0400 (Thu, 18 Mar 2010) | 1 line
  
  [CXF-2713]  Add support for element refs in wsdl2js
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=924897&r1=924896&r2=924897&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
Thu Mar 18 17:07:30 2010
@@ -743,8 +743,14 @@ public class ServiceJavascriptBuilder ex
                 if (betterElement instanceof XmlSchemaElement) {
                     element = (XmlSchemaElement)betterElement;
                     if (element.getSchemaType() == null) {
-                        element.setSchemaType(xmlSchemaCollection
+                        if (element.getSchemaTypeName() != null) {
+                            element.setSchemaType(xmlSchemaCollection
                                                   .getTypeByQName(element.getSchemaTypeName()));
+                        } else if (element.getRefName() != null) {
+                            element = xmlSchemaCollection.getElementByQName(element.getRefName());
+                            element.setSchemaType(xmlSchemaCollection
+                                                  .getTypeByQName(element.getSchemaTypeName()));
+                        }
                     }
                     type = element.getSchemaType();
                 }



Mime
View raw message