You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/06/07 22:57:37 UTC
svn commit: r1490824 -
/cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Author: dkulp
Date: Fri Jun 7 20:57:37 2013
New Revision: 1490824
URL: http://svn.apache.org/r1490824
Log:
Merged revisions 1490819 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1490819 | dkulp | 2013-06-07 16:52:43 -0400 (Fri, 07 Jun 2013) | 10 lines
Merged revisions 1490814 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1490814 | dkulp | 2013-06-07 16:46:35 -0400 (Fri, 07 Jun 2013) | 2 lines
[CXF-5070] Make an attempt to map CDATA -> CHARACTERS to work around jaxb issue
........
........
Modified:
cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1490824&r1=1490823&r2=1490824&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Fri Jun 7 20:57:37 2013
@@ -726,7 +726,13 @@ public class JAXBDataBinding implements
is.setPublicId(key);
opts.addGrammar(is);
try {
- schemaCompiler.parseSchema(key, StaxUtils.createXMLStreamReader(ele, key));
+ XMLStreamReader reader = new StreamReaderDelegate(StaxUtils.createXMLStreamReader(ele, key)) {
+ public int next() throws XMLStreamException {
+ int i = super.next();
+ return i == XMLStreamReader.CDATA ? XMLStreamReader.CHARACTERS : i;
+ }
+ };
+ schemaCompiler.parseSchema(key, reader);
} catch (XMLStreamException e) {
throw new RuntimeException(e);
}