Update -Psetup.eclipse to setup workspace based on changes needed for latest checkstyle
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b8ab7eaf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b8ab7eaf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b8ab7eaf Branch: refs/heads/master-jaxrs-2.1 Commit: b8ab7eaf4d070cf76c4f9088cefe1c0806cca1cd Parents: b3677b6 Author: Daniel Kulp <dk...@apache.org> Authored: Thu Jul 21 10:58:37 2016 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Jul 21 10:58:37 2016 -0400 ---------------------------------------------------------------------- etc/eclipse/template.checkstyle-config.xml | 9 +++++++-- pom.xml | 4 ++++ .../java/org/apache/cxf/binding/corba/CorbaConduit.java | 9 ++++----- 3 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b8ab7eaf/etc/eclipse/template.checkstyle-config.xml ---------------------------------------------------------------------- diff --git a/etc/eclipse/template.checkstyle-config.xml b/etc/eclipse/template.checkstyle-config.xml index 8f6dbe4..ac7151a 100644 --- a/etc/eclipse/template.checkstyle-config.xml +++ b/etc/eclipse/template.checkstyle-config.xml @@ -18,6 +18,11 @@ under the License. --> <checkstyle-configurations file-format-version="5.0.0"> - <check-configuration name="CXF Checks" location="@CHECKSTYLE_CONFIG_FILE@" type="external" description=""/> - <check-configuration name="CXF CORBA Checks" location="@CHECKSTYLE_CORBA_CONFIG_FILE@" type="external" description=""/> + <check-configuration name="CXF Checks" location="@CHECKSTYLE_CONFIG_FILE@" type="external" description=""> + <property name="checkstyle.suppressions.file" value="@CHECKSTYLE_SUPPRESSION_FILE@" /> + </check-configuration> + <check-configuration name="CXF CORBA Checks" location="@CHECKSTYLE_CORBA_CONFIG_FILE@" type="external" description=""> + <property name="checkstyle.suppressions.file" value="@CHECKSTYLE_SUPPRESSION_FILE@" /> + </check-configuration> + </checkstyle-configurations> http://git-wip-us.apache.org/repos/asf/cxf/blob/b8ab7eaf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f11303f..3a5225e 100644 --- a/pom.xml +++ b/pom.xml @@ -276,14 +276,17 @@ <whichresource resource="/cxf-eclipse-checkstyle" property="eclipse.checkstyle.url" /> <whichresource resource="/cxf-checkstyle.xml" property="checkstyle.url" /> <whichresource resource="/cxf-checkstyle-corba.xml" property="corba.checkstyle.url" /> + <whichresource resource="/cxf-checkstyle-suppressions.xml" property="checkstyle.suppression.url" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse" /> <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/cxf-checkstyle.xml" /> + <get src="${checkstyle.suppression.url}" dest="${full.eclipse.workspace}/cxf-checkstyle-suppressions.xml" /> <get src="${corba.checkstyle.url}" dest="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" /> <!-- Add checkstyle config --> <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="no"> <filterset> + <filter token="CHECKSTYLE_SUPPRESSION_FILE" value="${full.eclipse.workspace}/cxf-checkstyle-suppressions.xml" /> <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle.xml" /> <filter token="CHECKSTYLE_CORBA_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" /> <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" /> @@ -297,6 +300,7 @@ <!-- Add checkstyle config for 5.0 plugin --> <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="no"> <filterset> + <filter token="CHECKSTYLE_SUPPRESSION_FILE" value="${full.eclipse.workspace}/cxf-checkstyle-suppressions.xml" /> <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle.xml" /> <filter token="CHECKSTYLE_CORBA_CONFIG_FILE" value="${full.eclipse.workspace}/cxf-checkstyle-corba.xml" /> <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" /> http://git-wip-us.apache.org/repos/asf/cxf/blob/b8ab7eaf/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java ---------------------------------------------------------------------- diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java index 7518ece..98218ca 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java @@ -189,14 +189,13 @@ public class CorbaConduit implements Conduit { if (request == null) { throw new CorbaBindingException("Couldn't build the corba request"); } + Exception ex = null; try { request.invoke(); - } catch (SystemException ex) { - message.setContent(Exception.class, new Fault(ex)); - message.setSystemException(ex); - return; + ex = request.env().exception(); + } catch (SystemException sysex) { + ex = sysex; } - Exception ex = request.env().exception(); if (ex != null) { if (ex instanceof SystemException) { message.setContent(Exception.class, new Fault(ex));
