You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/10/13 15:00:14 UTC
svn commit: r1182823 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/databinding/source/
Author: ningjiang
Date: Thu Oct 13 13:00:13 2011
New Revision: 1182823
URL: http://svn.apache.org/viewvc?rev=1182823&view=rev
Log:
Merged revisions 1182802 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1182802 | ningjiang | 2011-10-13 20:30:45 +0800 (Thu, 13 Oct 2011) | 9 lines
Merged revisions 1182754 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1182754 | ningjiang | 2011-10-13 18:08:19 +0800 (Thu, 13 Oct 2011) | 1 line
CXF-3858 Added the cause exception class name into the fault message
........
................
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/NodeDataWriter.java
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 13:00:13 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1179850,1180650,1180655,1181613,1182639,1182730,1182747-1182789
-/cxf/trunk:1179846,1180649,1180653,1181611,1182637,1182716-1182717,1182752
+/cxf/branches/2.4.x-fixes:1179850,1180650,1180655,1181613,1182639,1182730,1182747-1182789,1182802
+/cxf/trunk:1179846,1180649,1180653,1181611,1182637,1182716-1182717,1182752,1182754
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=1182823&r1=1182822&r2=1182823&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 Thu Oct 13 13:00:13 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}.
-COULD_NOT_WRITE_XML_STREAM_CAUSED_BY = Could not generate the XML stream caused by {0}.
+COULD_NOT_REDA_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=1182823&r1=1182822&r2=1182823&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 Thu Oct 13 13:00:13 2011
@@ -66,7 +66,8 @@ 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, e.getMessage());
+ throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
+ e.getClass().getCanonicalName(), e.getMessage());
}
}
return read(input);
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java?rev=1182823&r1=1182822&r2=1182823&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java Thu Oct 13 13:00:13 2011
@@ -56,7 +56,8 @@ public class NodeDataWriter implements D
XMLStreamWriter writer = new W3CDOMStreamWriter((Element)n);
StaxUtils.copy(s, writer);
} catch (XMLStreamException e) {
- throw new Fault("COULD_NOT_WRITE_XML_STREAM_CAUSED_BY", LOG, e, e.getMessage());
+ throw new Fault("COULD_NOT_WRITE_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=1182823&r1=1182822&r2=1182823&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 Thu Oct 13 13:00:13 2011
@@ -140,9 +140,11 @@ 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, e.getMessage());
+ throw new Fault("COULD_NOT_REDA_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, e.getMessage());
+ throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e,
+ e.getClass().getCanonicalName(), e.getMessage());
}
}
@@ -228,7 +230,8 @@ public class XMLStreamDataReader impleme
return new DOMSource(document);
}
} catch (XMLStreamException e) {
- throw new Fault("COULD_NOT_REDA_XML_STREAM_CAUSED_BY", LOG, e, e.getMessage());
+ throw new Fault("COULD_NOT_REDA_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/XMLStreamDataWriter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java?rev=1182823&r1=1182822&r2=1182823&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java Thu Oct 13 13:00:13 2011
@@ -88,7 +88,8 @@ public class XMLStreamDataWriter impleme
StaxUtils.copy(s, writer);
}
} catch (XMLStreamException e) {
- throw new Fault("COULD_NOT_WRITE_XML_STREAM_CAUSED_BY", LOG, e, e.getMessage());
+ throw new Fault("COULD_NOT_WRITE_XML_STREAM_CAUSED_BY", LOG, e,
+ e.getClass().getCanonicalName(), e.getMessage());
} catch (IOException e) {
throw new Fault(new Message("COULD_NOT_WRITE_XML_STREAM", LOG), e);
}