Author: ay Date: Fri Jan 25 11:19:26 2013 New Revision: 1438454 URL: http://svn.apache.org/viewvc?rev=1438454&view=rev Log: Merged revisions 1438439 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1438439 | ay | 2013-01-25 11:44:26 +0100 (Fri, 25 Jan 2013) | 17 lines Merged revisions 1438431 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1438431 | ay | 2013-01-25 11:37:30 +0100 (Fri, 25 Jan 2013) | 9 lines Merged revisions 1438428 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1438428 | ay | 2013-01-25 11:33:52 +0100 (Fri, 25 Jan 2013) | 1 line [CXF-4752] TransformOutInterceptor does not transform SoapFaults ........ ........ ........ Added: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/ - copied from r1438439, cxf/branches/2.6.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java?rev=1438454&r1=1438453&r2=1438454&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java Fri Jan 25 11:19:26 2013 @@ -63,6 +63,10 @@ public class StaxTransformFeature extend public void setAttributesToElements(boolean value) { out.setAttributesToElements(value); } + + public void setSkipOnFault(boolean value) { + out.setAttributesToElements(value); + } public void setOutAppendElements(Map<String, String> map) { out.setOutAppendElements(map); Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java?rev=1438454&r1=1438453&r2=1438454&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java Fri Jan 25 11:19:26 2013 @@ -50,6 +50,7 @@ public class TransformOutInterceptor ext private Map<String, String> outAppendMap; private List<String> outDropElements; private boolean attributesToElements; + private boolean skipOnFault; private String contextPropertyName; private String defaultNamespace; @@ -84,7 +85,7 @@ public class TransformOutInterceptor ext return; } - if (null != message.getContent(Exception.class)) { + if (skipOnFault && null != message.getContent(Exception.class)) { return; } @@ -129,6 +130,10 @@ public class TransformOutInterceptor ext this.attributesToElements = value; } + public void setSkipOnFault(boolean value) { + this.skipOnFault = value; + } + protected boolean isHttpVerbSupported(Message message) { return isRequestor(message) && isGET(message) ? false : true; }
