Author: dkulp
Date: Thu Sep 15 19:06:58 2011
New Revision: 1171228
URL: http://svn.apache.org/viewvc?rev=1171228&view=rev
Log:
Merged revisions 1171223 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1171223 | dkulp | 2011-09-15 15:03:22 -0400 (Thu, 15 Sep 2011) | 2 lines
Update to snapshot for XmlSchema 2.0.1 so that we can do some testing
with it before release.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/parent/pom.xml
cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1171228&r1=1171227&r2=1171228&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Thu Sep 15 19:06:58 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/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java?rev=1171228&r1=1171227&r2=1171228&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
(original)
+++
cxf/branches/2.4.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
Thu Sep 15 19:06:58 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();
