Author: ningjiang Date: Tue Oct 18 08:57:16 2011 New Revision: 1185537 URL: http://svn.apache.org/viewvc?rev=1185537&view=rev Log: Merged revisions 1185464 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1185464 | ningjiang | 2011-10-18 11:29:40 +0800 (Tue, 18 Oct 2011) | 9 lines Merged revisions 1185460 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1185460 | ningjiang | 2011-10-18 10:36:01 +0800 (Tue, 18 Oct 2011) | 1 line CXF-3858 Fixed the typo with thanks to Glen ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 18 08:57:16 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.4.x-fixes:1183215,1183257 -/cxf/trunk:1183212,1183253 +/cxf/branches/2.4.x-fixes:1183215,1183257,1185464 +/cxf/trunk:1183212,1183253,1185460 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties?rev=1185537&r1=1185536&r2=1185537&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/Messages.properties Tue Oct 18 08:57:16 2011 @@ -20,5 +20,5 @@ # COULD_NOT_READ_XML_STREAM = Could not parse the XML stream. COULD_NOT_WRITE_XML_STREAM = Could not generate the XML stream. -COULD_NOT_REDA_XML_STREAM_CAUSED_BY = Could not parse the XML stream caused by: {0}: {1}. +COULD_NOT_READ_XML_STREAM_CAUSED_BY = Could not parse the XML stream caused by: {0}: {1}. COULD_NOT_WRITE_XML_STREAM_CAUSED_BY = Could not generate the XML stream caused by: {0}: {1}. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java?rev=1185537&r1=1185536&r2=1185537&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java Tue Oct 18 08:57:16 2011 @@ -66,7 +66,7 @@ public class NodeDataReader implements D } catch (IOException e) { throw new Fault("COULD_NOT_READ_XML_STREAM", LOG, e); } catch (TransformerException e) { - throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e, + throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e, e.getClass().getCanonicalName(), e.getMessage()); } } Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1185537&r1=1185536&r2=1185537&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java Tue Oct 18 08:57:16 2011 @@ -140,10 +140,10 @@ public class XMLStreamDataReader impleme } catch (IOException e) { throw new Fault("COULD_NOT_READ_XML_STREAM", LOG, e); } catch (XMLStreamException e) { - throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e, + throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e, e.getClass().getCanonicalName(), e.getMessage()); } catch (SAXException e) { - throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e, + throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e, e.getClass().getCanonicalName(), e.getMessage()); } } @@ -230,7 +230,7 @@ public class XMLStreamDataReader impleme return new DOMSource(document); } } catch (XMLStreamException e) { - throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e, + throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e, e.getClass().getCanonicalName(), e.getMessage()); } }
