Author: alessio.soldano(a)jboss.com Date: 2012-02-09 08:59:32 -0500 (Thu, 09 Feb 2012) New Revision: 15622 Modified: stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java Log: svn merge -r 15620:15621 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk . Modified: stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java =================================================================== --- stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java 2012-02-09 13:57:14 UTC (rev 15621) +++ stack/cxf/branches/wstrust/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java 2012-02-09 13:59:32 UTC (rev 15622) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -24,8 +24,8 @@ import javax.xml.ws.handler.MessageContext; import org.apache.cxf.jaxws.context.WebServiceContextImpl; -import org.jboss.ws.common.invocation.WebServiceContextAdapter; import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; +import org.jboss.wsf.spi.invocation.WebServiceContextDelegate; import org.jboss.wsf.spi.invocation.WebServiceContextFactory; /** @@ -39,6 +39,6 @@ @Override public ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext) { - return new WebServiceContextAdapter(new WebServiceContextImpl(messageContext)); + return new WebServiceContextDelegate(new WebServiceContextImpl(messageContext)); } }