Author: jim.ma Date: 2012-06-21 05:14:46 -0400 (Thu, 21 Jun 2012) New Revision: 16418 Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java Removed: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java Log: [JBWS-3516]:Enable transmit the fault message to faultTo endpoint Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-06-20 11:06:18 UTC (rev 16417) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-06-21 09:14:46 UTC (rev 16418) @@ -45,7 +45,7 @@ import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; -import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor; +import org.jboss.wsf.stack.cxf.interceptor.EnableDecoupledFaultInterceptor; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor; @@ -138,7 +138,7 @@ //Install the EndpointAssociationInterceptor for linking every message exchange //with the proper spi Endpoint retrieved in CXFServletExt bus.getInInterceptors().add(new EndpointAssociationInterceptor()); - bus.getInInterceptors().add(new EnableOneWayDecoupledFaultInterceptor()); + bus.getInInterceptors().add(new EnableDecoupledFaultInterceptor()); bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor()); } Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java (from rev 16417, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java 2012-06-21 09:14:46 UTC (rev 16418) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.interceptor; + +import org.apache.cxf.message.Message; +import org.apache.cxf.phase.AbstractPhaseInterceptor; +import org.apache.cxf.phase.Phase; +import org.apache.cxf.ws.addressing.soap.MAPCodec; + +/** + * This intercetpor adds the context property decoupled_fault_support + * to enable decoupled faultTo. This is an optinal feature in cxf and we + * need this to be default to make it same behavior with native stack. + * @author <a href="mailto:ema@redhat.com>Jim Ma</a> + */ +public class EnableDecoupledFaultInterceptor extends AbstractPhaseInterceptor<Message> +{ + + public EnableDecoupledFaultInterceptor() + { + super(Phase.PRE_PROTOCOL); + addBefore(MAPCodec.class.getName()); + } + + public void handleMessage(Message message) + { + message.put("org.apache.cxf.ws.addressing.decoupled_fault_support", true); + } + + public void handleFault(Message message) + { + //complete + } + +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java 2012-06-20 11:06:18 UTC (rev 16417) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableOneWayDecoupledFaultInterceptor.java 2012-06-21 09:14:46 UTC (rev 16418) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.interceptor; - -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.AbstractPhaseInterceptor; -import org.apache.cxf.phase.Phase; -import org.apache.cxf.ws.addressing.soap.MAPCodec; - -/** - * This intercetpor adds the context property decoupled_fault_support - * to enable decoupled faultTo. This is an optinal feature in cxf and we - * need this to be default to make it same behavior with native stack. - * @author <a href="mailto:ema@redhat.com>Jim Ma</a> - */ -public class EnableOneWayDecoupledFaultInterceptor extends AbstractPhaseInterceptor<Message> -{ - - public EnableOneWayDecoupledFaultInterceptor() - { - super(Phase.PRE_PROTOCOL); - addBefore(MAPCodec.class.getName()); - } - - public void handleMessage(Message message) - { - message.put("org.apache.cxf.ws.addressing.oneway.decoupled_fault_support", true); - } - - public void handleFault(Message message) - { - //complete - } - -}