Author: asoldano Date: 2015-06-16 18:24:17 -0400 (Tue, 16 Jun 2015) New Revision: 19794 Removed: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java Log: [JBWS-3921] Get rid of unrequired MessagePropertySettingInterceptor 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 2015-06-16 22:07:37 UTC (rev 19793) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-06-16 22:24:17 UTC (rev 19794) @@ -71,7 +71,6 @@ import org.jboss.wsf.stack.cxf.client.configuration.InterceptorUtils; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.extensions.policy.PolicySetsAnnotationListener; -import org.jboss.wsf.stack.cxf.interceptor.MessagePropertySettingInterceptor; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; import org.jboss.wsf.stack.cxf.interceptor.HandlerAuthInterceptor; import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor; @@ -168,6 +167,9 @@ //(moreover the user can tune the web container thread pool instead of expecting cxf to fork new threads) bus.setProperty(OneWayProcessorInterceptor.USE_ORIGINAL_THREAD, true); + //[JBWS-3135] enable decoupled faultTo. This is an optional feature in cxf and we need this to be default to make it same behavior with native stack + bus.setProperty("org.apache.cxf.ws.addressing.decoupled_fault_support", true); + FeatureUtils.addFeatures(bus, bus, props); } @@ -213,7 +215,6 @@ //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 MessagePropertySettingInterceptor()); bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor()); final String p = (props != null) ? props.get(Constants.JBWS_CXF_DISABLE_HANDLER_AUTH_CHECKS) : null; Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java 2015-06-16 22:07:37 UTC (rev 19793) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java 2015-06-16 22:24:17 UTC (rev 19794) @@ -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 interceptor adds the following context properties to cxf message: - * <p>1.decoupled_fault_support<p> - * It enables decoupled faultTo. This is an optional 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 MessagePropertySettingInterceptor extends AbstractPhaseInterceptor<Message> -{ - - public MessagePropertySettingInterceptor() - { - 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 - } -}