cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1091593 - in /cxf/trunk: parent/pom.xml rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
Date Tue, 12 Apr 2011 23:10:57 GMT
Author: dkulp
Date: Tue Apr 12 23:10:57 2011
New Revision: 1091593

URL: http://svn.apache.org/viewvc?rev=1091593&view=rev
Log:
[CXF-3453] Fix for the complex type use case in addition to simpleType

Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1091593&r1=1091592&r2=1091593&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Apr 12 23:10:57 2011
@@ -93,7 +93,7 @@
         <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
         <cxf.opensaml.version>2.4.1</cxf.opensaml.version>
         <cxf.opensamlws.version>1.4.1</cxf.opensamlws.version>
-        <cxf.opensaml.osgi.version>2.4.1_1-SNAPSHOT</cxf.opensaml.osgi.version>
+        <cxf.opensaml.osgi.version>2.4.1_1</cxf.opensaml.osgi.version>
         <cxf.opensaml.xmltooling.version>1.3.1</cxf.opensaml.xmltooling.version>
         <cxf.neethi.version>3.0.0</cxf.neethi.version>
 

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java?rev=1091593&r1=1091592&r2=1091593&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
Tue Apr 12 23:10:57 2011
@@ -66,7 +66,9 @@ public class DataReaderImpl<T> extends J
         
         public boolean handleEvent(ValidationEvent event) {
             String msg = event.getMessage();
-            if (msg.startsWith("cvc-type.3.1.1: ") && msg.contains(":Id")) {
+            if ((msg.startsWith("cvc-type.3.1.1: ") 
+                || msg.startsWith("cvc-type.3.2.2: "))  
+                && msg.contains(":Id")) {
                 return true;
             }
             if (origHandler != null) {



Mime
View raw message