svn commit: r1171223 - in /cxf/trunk: parent/pom.xml tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java

[dkulp]

Author: dkulp
Date: Thu Sep 15 19:03:22 2011
New Revision: 1171223

URL: http://svn.apache.org/viewvc?rev=1171223&view=rev
Log:
Update to snapshot for XmlSchema 2.0.1 so that we can do some testing
with it before release.

Modified:
    cxf/trunk/parent/pom.xml
    
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java

Modified: cxf/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1171223&r1=1171222&r2=1171223&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Sep 15 19:03:22 2011
@@ -90,7 +90,7 @@
         <cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.2</cxf.wsdl4j.version>
         <cxf.xmlbeans.version>2.4.0</cxf.xmlbeans.version>
-        <cxf.xmlschema.version>2.0</cxf.xmlschema.version>
+        <cxf.xmlschema.version>2.0.1-SNAPSHOT</cxf.xmlschema.version>
         <cxf.jibx.version>1.2.3</cxf.jibx.version>
         <cxf.axiom.version>1.2.10</cxf.axiom.version>
         <cxf.jettison.version>1.3</cxf.jettison.version>

Modified: 
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java?rev=1171223&r1=1171222&r2=1171223&view=diff
==============================================================================
--- 
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
 (original)
+++ 
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
 Thu Sep 15 19:03:22 2011
@@ -638,7 +638,11 @@ public class WSDLToCorbaHelper {
             name = createQNameCorbaNamespace(schematypeName.getLocalPart());
         }
 
-        if (stype.getContent() instanceof XmlSchemaSimpleTypeRestriction) {
+        if 
(stype.getParent().getTargetNamespace().equals(W3CConstants.NU_SCHEMA_XSD)) {
+            // built in types
+            QName stypeName = createQNameXmlSchemaNamespace(stype.getName());
+            corbaTypeImpl = getLocalType(stypeName);
+        } else if (stype.getContent() instanceof 
XmlSchemaSimpleTypeRestriction) {
             corbaTypeImpl = processSimpleRestrictionType(stype, name, 
schematypeName, anonymous);
         } else if (stype.getContent() instanceof XmlSchemaSimpleTypeList) {
             XmlSchemaSimpleTypeList ltype = 
(XmlSchemaSimpleTypeList)stype.getContent();