Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4C8CE487 for ; Mon, 4 Feb 2013 03:06:43 +0000 (UTC) Received: (qmail 42624 invoked by uid 500); 4 Feb 2013 03:06:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 42493 invoked by uid 500); 4 Feb 2013 03:06:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 42475 invoked by uid 99); 4 Feb 2013 03:06:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 03:06:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 03:06:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9FFAF23889EB; Mon, 4 Feb 2013 03:06:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442015 - in /cxf/trunk: api/src/main/java/org/apache/cxf/interceptor/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/ Date: Mon, 04 Feb 2013 03:06:20 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130204030620.9FFAF23889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Mon Feb 4 03:06:19 2013 New Revision: 1442015 URL: http://svn.apache.org/viewvc?rev=1442015&view=rev Log: [CXF-4790]Set lang and subcode for soapfault Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java?rev=1442015&r1=1442014&r2=1442015&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java Mon Feb 4 03:06:19 2013 @@ -44,11 +44,12 @@ public class Fault extends UncheckedExce private Element detail; private String message; private QName code; + private String lang; /** * response http header status code */ private int statusCode = DEFAULT_HTTP_RESPONSE_CODE; - + public Fault(Message message, Throwable throwable) { super(message, throwable); this.message = message.toString(); @@ -185,4 +186,12 @@ public class Fault extends UncheckedExce public void setStatusCode(int statusCode) { this.statusCode = statusCode; } + + public void setLang(String convertedLang) { + lang = convertedLang; + } + + public String getLang() { + return lang; + } } Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java?rev=1442015&r1=1442014&r2=1442015&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java (original) +++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Mon Feb 4 03:06:19 2013 @@ -105,7 +105,11 @@ public class Soap12FaultOutInterceptor e writer.writeStartElement(defaultPrefix, "Reason", ns); writer.writeStartElement(defaultPrefix, "Text", ns); - writer.writeAttribute("xml", "http://www.w3.org/XML/1998/namespace", "lang", getLangCode()); + String lang = f.getLang(); + if (lang == null || lang.equalsIgnoreCase("")) { + lang = getLangCode(); + } + writer.writeAttribute("xml", "http://www.w3.org/XML/1998/namespace", "lang", lang); writer.writeCharacters(getFaultMessage(message, fault)); writer.writeEndElement(); writer.writeEndElement(); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java?rev=1442015&r1=1442014&r2=1442015&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java Mon Feb 4 03:06:19 2013 @@ -21,6 +21,7 @@ package org.apache.cxf.jaxws.interceptor import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Locale; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; @@ -28,7 +29,9 @@ import java.util.logging.Logger; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamWriter; import javax.xml.ws.WebFault; +import javax.xml.ws.soap.SOAPFaultException; +import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.common.i18n.BundleUtils; import org.apache.cxf.common.logging.LogUtils; @@ -82,7 +85,35 @@ public class WebFaultOutInterceptor exte if (f == null) { return; } - + try { + if (f.getCause().getClass().equals(SOAPFaultException.class)) { + SOAPFaultException sf = (SOAPFaultException) (f.getCause()); + if (sf.getFault().getFaultSubcodes().hasNext() + && f.getClass().equals(SoapFault.class)) { + String subcode = sf.getFault().getFaultSubcodes().next() + .toString(); + String nameSpace = subcode.substring( + subcode.indexOf("{") + 1, subcode.indexOf("}")); + String localPart = subcode + .substring(subcode.indexOf("}") + 1); + QName subcodeQName = new QName(nameSpace, localPart); + ((SoapFault) f).setSubCode(subcodeQName); + } + if (sf.getFault().getFaultReasonLocales().hasNext()) { + Locale lang = (Locale) sf.getFault() + .getFaultReasonLocales().next(); + String convertedLang = lang.getLanguage(); + String country = lang.getCountry(); + if (country.length() > 0) { + convertedLang = convertedLang + '-' + country; + } + f.setLang(convertedLang); + } + message.setContent(Exception.class, f); + } + } catch (Exception e) { + // do nothing; + } Throwable cause = f.getCause(); WebFault fault = null; if (cause != null) {