Author: thomas.diesler(a)jboss.com Date: 2007-06-26 17:46:51 -0400 (Tue, 26 Jun 2007) New Revision: 3734 Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/CachingJAXBContextFactory.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextFactory.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java Removed: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/handler/ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java Modified: branches/jbossws-2.0/integration/spi/.classpath branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/handler/SOAPMessageTrace.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java Log: Add notion of JAXBContextFactory Modified: branches/jbossws-2.0/integration/spi/.classpath =================================================================== --- branches/jbossws-2.0/integration/spi/.classpath 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/integration/spi/.classpath 2007-06-26 21:46:51 UTC (rev 3734) @@ -22,5 +22,6 @@ <classpathentry kind="lib" path="thirdparty/ant.jar"/> <classpathentry kind="lib" path="thirdparty/getopt.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-26 21:46:51 UTC (rev 3734) @@ -88,6 +88,7 @@ <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/CachingJAXBContextFactory.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/CachingJAXBContextFactory.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/CachingJAXBContextFactory.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.spi.binding.jaxb; + +// $Id: $ + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; + +import org.jboss.wsf.spi.utils.HashCodeUtil; + +/** + * Cache JAXBContext's. + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Jun-2007 + */ +public class CachingJAXBContextFactory implements JAXBContextFactory +{ + private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>(); + + private JAXBContext get(Integer id) + { + return cache.get(id); + } + + private void add(Integer id, JAXBContext context) + { + cache.put(id, context); + } + + /** + * Retrieve a cached JAXBContext instance. + * If no instance is cached a new one will be created and registered. + */ + public JAXBContext getInstance(Class[] classes) throws JAXBException + { + Integer id = buildId(classes); + JAXBContext ctx = get(id); + if (null == ctx) + { + ctx = JAXBContext.newInstance(classes); + add(id, ctx); + } + + return ctx; + } + + private Integer buildId(Class[] classes) + { + int sum = HashCodeUtil.SEED; + for (Class cls : classes) + { + sum = HashCodeUtil.hash(sum, cls.getName()); + } + return new Integer(sum); + } + + private Integer buildId(Class clazz) + { + return buildId(new Class[] { clazz }); + } +} Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextFactory.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextFactory.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextFactory.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.spi.binding.jaxb; + +// $Id: $ + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; + +/** + * A factory for JAXBContext + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Jun-2007 + */ +public interface JAXBContextFactory +{ + /** + * Retrieve a cached JAXBContext instance. + * If no instance is cached a new one will be created and registered. + */ + JAXBContext getInstance(Class[] classes) throws JAXBException; +} Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler (from rev 3729, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/handler) Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericLogicalHandler.java 2007-06-26 19:38:00 UTC (rev 3729) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -19,7 +19,7 @@ * 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.spi.handler; +package org.jboss.wsf.spi.jaxws.handler; // $Id$ Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/handler/GenericSOAPHandler.java 2007-06-26 19:38:00 UTC (rev 3729) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -19,7 +19,7 @@ * 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.spi.handler; +package org.jboss.wsf.spi.jaxws.handler; // $Id: $ Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java (from rev 3729, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.spi.utils; + +import java.lang.reflect.Array; + +/** + * Collected methods which allow easy implementation of <code>hashCode</code>. + * + * Example use case: + * <pre> + * public int hashCode(){ + * int result = HashCodeUtil.SEED; + * //collect the contributions of various fields + * result = HashCodeUtil.hash(result, fPrimitive); + * result = HashCodeUtil.hash(result, fObject); + * result = HashCodeUtil.hash(result, fArray); + * return result; + * } + * </pre> + */ +public final class HashCodeUtil +{ + + /** + * An initial value for a <code>hashCode</code>, to which is added contributions + * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> + * values. + */ + public static final int SEED = 23; + + /** + * booleans. + */ + public static int hash(int aSeed, boolean aBoolean) + { + return firstTerm(aSeed) + (aBoolean ? 1 : 0); + } + + /** + * chars. + */ + public static int hash(int aSeed, char aChar) + { + return firstTerm(aSeed) + (int)aChar; + } + + /** + * ints. + */ + public static int hash(int aSeed, int aInt) + { + /* + * Implementation Note + * Note that byte and short are handled by this method, through + * implicit conversion. + */ + return firstTerm(aSeed) + aInt; + } + + /** + * longs. + */ + public static int hash(int aSeed, long aLong) + { + return firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32)); + } + + /** + * floats. + */ + public static int hash(int aSeed, float aFloat) + { + return hash(aSeed, Float.floatToIntBits(aFloat)); + } + + /** + * doubles. + */ + public static int hash(int aSeed, double aDouble) + { + return hash(aSeed, Double.doubleToLongBits(aDouble)); + } + + /** + * <code>aObject</code> is a possibly-null object field, and possibly an array. + * + * If <code>aObject</code> is an array, then each element may be a primitive + * or a possibly-null object. + */ + public static int hash(int aSeed, Object aObject) + { + int result = aSeed; + if (aObject == null) + { + result = hash(result, 0); + } + else if (!isArray(aObject)) + { + result = hash(result, aObject.hashCode()); + } + else + { + int length = Array.getLength(aObject); + for (int idx = 0; idx < length; ++idx) + { + Object item = Array.get(aObject, idx); + //recursive call! + result = hash(result, item); + } + } + return result; + } + + /// PRIVATE /// + private static final int fODD_PRIME_NUMBER = 37; + + private static int firstTerm(int aSeed) + { + return fODD_PRIME_NUMBER * aSeed; + } + + private static boolean isArray(Object aObject) + { + return aObject.getClass().isArray(); + } +} Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -53,7 +53,7 @@ import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; -import org.jboss.ws.core.utils.HashCodeUtil; +import org.jboss.wsf.spi.utils.HashCodeUtil; import org.jboss.wsf.spi.utils.JavaUtils; /** Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.ws.core.jaxws; - -// $Id: $ - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.utils.HashCodeUtil; -import org.jboss.ws.metadata.umdm.EndpointMetaData; - -/** - * Cache JAXBContext's. - * - * @author Heiko.Braun(a)jboss.org - * @since 26.01.2007 - */ -public class JAXBContextCache -{ - private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>(); - - private JAXBContext get(Integer id) - { - return cache.get(id); - } - - private void add(Integer id, JAXBContext context) - { - cache.put(id, context); - } - - /** - * Retrieve a cached JAXBContext instance. - * If no instance is cached a new one will be created and registered. - */ - public JAXBContext getInstance(Class[] classes) throws JAXBException - { - Integer id = buildId(classes); - JAXBContext ctx = get(id); - if (null == ctx) - { - ctx = JAXBContext.newInstance(classes); - add(id, ctx); - } - - return ctx; - } - - /** - * Retrieve a cached JAXBContext instance. - * If no instance is cached a new one will be created and registered. - */ - public JAXBContext getInstance(Class clazz) throws JAXBException - { - Integer id = buildId(clazz); - JAXBContext ctx = get(id); - if (null == ctx) - { - ctx = JAXBContext.newInstance(clazz); - add(id, ctx); - } - - return ctx; - } - - /** - * Access the JAXBContext cache through the message context. - * The actual instance is assiciated with the EndpointMetaData. - * @return JAXBContextCache - */ - public static JAXBContextCache getContextCache() - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - return epMetaData.getJaxbCache(); - } - - private static Integer buildId(Class[] classes) - { - int sum = HashCodeUtil.SEED; - for (Class cls : classes) - { - sum = HashCodeUtil.hash(sum, cls.getName()); - } - return new Integer(sum); - } - - private static Integer buildId(Class clazz) - { - return buildId(new Class[] { clazz }); - } -} Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -37,6 +37,7 @@ import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; +import org.jboss.wsf.spi.binding.jaxb.JAXBContextFactory; /** * A Deserializer that can handle complex types by delegating to JAXB. @@ -65,8 +66,8 @@ TypeMappingImpl typeMapping = serContext.getTypeMapping(); Class javaType = typeMapping.getJavaType(xmlType); - JAXBContextCache contextCache = JAXBContextCache.getContextCache(); - JAXBContext jaxbContext = contextCache.getInstance(javaTypes); + JAXBContextFactory jaxbFactory = ((SerializationContextJAXWS)serContext).getJAXBContextFactory(); + JAXBContext jaxbContext = jaxbFactory.getInstance(javaTypes); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl()); @@ -84,11 +85,6 @@ } - private JAXBContext getJAXBContext(Class[] types) throws JAXBException { - JAXBContext jaxbContext = JAXBContext.newInstance(types); - return jaxbContext; - } - // 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall // a request or unmarshall a response, an implementation MUST throw a WebServiceException whose // cause is set to the original JAXBException. Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -37,7 +37,7 @@ import org.jboss.ws.core.binding.ComplexTypeSerializer; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; -import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.jboss.wsf.spi.binding.jaxb.JAXBContextFactory; import org.w3c.dom.NamedNodeMap; /** @@ -68,9 +68,9 @@ Class expectedType = serContext.getJavaType(); Class actualType = value.getClass(); - JAXBContextCache contextCache = JAXBContextCache.getContextCache(); - Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; - JAXBContext jaxbContext = contextCache.getInstance(types); + Class[] javaTypes = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; + JAXBContextFactory jaxbFactory = ((SerializationContextJAXWS)serContext).getJAXBContextFactory(); + JAXBContext jaxbContext = jaxbFactory.getInstance(javaTypes); Marshaller marshaller = jaxbContext.createMarshaller(); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -24,7 +24,11 @@ // $Id$ import org.jboss.logging.Logger; +import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.wsf.spi.binding.jaxb.JAXBContextFactory; /** * The serialization context for JAXWS endpoints/clients @@ -38,4 +42,15 @@ private static final Logger log = Logger.getLogger(SerializationContextJAXWS.class); public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types"; + + /** + * Access the JAXBContextFactory through the message context. + * The actual instance is assiciated with the EndpointMetaData. + */ + public static JAXBContextFactory getJAXBContextFactory() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); + return epMetaData.getJAXBContextFactory(); + } } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -49,8 +49,8 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsf.spi.handler.GenericHandler; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -1,134 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.ws.core.utils; - -import java.lang.reflect.Array; - -/** -* Collected methods which allow easy implementation of <code>hashCode</code>. -* -* Example use case: -* <pre> -* public int hashCode(){ -* int result = HashCodeUtil.SEED; -* //collect the contributions of various fields -* result = HashCodeUtil.hash(result, fPrimitive); -* result = HashCodeUtil.hash(result, fObject); -* result = HashCodeUtil.hash(result, fArray); -* return result; -* } -* </pre> -*/ -public final class HashCodeUtil { - - /** - * An initial value for a <code>hashCode</code>, to which is added contributions - * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> - * values. - */ - public static final int SEED = 23; - - /** - * booleans. - */ - public static int hash( int aSeed, boolean aBoolean ) { - return firstTerm( aSeed ) + ( aBoolean ? 1 : 0 ); - } - - /** - * chars. - */ - public static int hash( int aSeed, char aChar ) { - return firstTerm( aSeed ) + (int)aChar; - } - - /** - * ints. - */ - public static int hash( int aSeed , int aInt ) { - /* - * Implementation Note - * Note that byte and short are handled by this method, through - * implicit conversion. - */ - return firstTerm( aSeed ) + aInt; - } - - /** - * longs. - */ - public static int hash( int aSeed , long aLong ) { - return firstTerm(aSeed) + (int)( aLong ^ (aLong >>> 32) ); - } - - /** - * floats. - */ - public static int hash( int aSeed , float aFloat ) { - return hash( aSeed, Float.floatToIntBits(aFloat) ); - } - - /** - * doubles. - */ - public static int hash( int aSeed , double aDouble ) { - return hash( aSeed, Double.doubleToLongBits(aDouble) ); - } - - /** - * <code>aObject</code> is a possibly-null object field, and possibly an array. - * - * If <code>aObject</code> is an array, then each element may be a primitive - * or a possibly-null object. - */ - public static int hash( int aSeed , Object aObject ) { - int result = aSeed; - if ( aObject == null) { - result = hash(result, 0); - } - else if ( ! isArray(aObject) ) { - result = hash(result, aObject.hashCode()); - } - else { - int length = Array.getLength(aObject); - for ( int idx = 0; idx < length; ++idx ) { - Object item = Array.get(aObject, idx); - //recursive call! - result = hash(result, item); - } - } - return result; - } - - - /// PRIVATE /// - private static final int fODD_PRIME_NUMBER = 37; - - private static int firstTerm( int aSeed ){ - return fODD_PRIME_NUMBER * aSeed; - } - - private static boolean isArray(Object aObject){ - return aObject.getClass().isArray(); - } -} - Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -24,7 +24,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -26,7 +26,7 @@ import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -42,7 +42,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * An abstract JAXWS handler that delegates to the WSSecurityDispatcher Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -50,7 +50,6 @@ import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; -import org.jboss.ws.core.jaxws.JAXBContextCache; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; @@ -62,6 +61,8 @@ import org.jboss.ws.metadata.config.EndpointFeature; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.binding.jaxb.CachingJAXBContextFactory; +import org.jboss.wsf.spi.binding.jaxb.JAXBContextFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.utils.JavaUtils; @@ -141,7 +142,7 @@ private ConfigObservable configObservable = new ConfigObservable(); - private JAXBContextCache jaxbCache = new JAXBContextCache(); + private JAXBContextFactory jaxbContextFactory = new CachingJAXBContextFactory(); private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); @@ -601,9 +602,9 @@ } } - public JAXBContextCache getJaxbCache() + public JAXBContextFactory getJAXBContextFactory() { - return jaxbCache; + return jaxbContextFactory; } // --------------------------------------------------------------- Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A client side handler Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; public class ProtocolHandler extends GenericSOAPHandler { Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1283; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import javax.activation.DataHandler; import javax.xml.soap.AttachmentPart; Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -23,7 +23,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import org.jboss.test.ws.jaxws.jbws1357.JBWS1357; import junit.framework.Test; Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -37,7 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.utils.UUIDGenerator; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.spi.utils.DOMUtils; /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -34,7 +34,7 @@ import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.spi.utils.DOMUtils; /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -31,7 +31,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericHandler; /** * A client side handler that disables mustUnderstand processing Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -32,7 +32,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericHandler; /** * A client side handler for the ws-addressing Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -23,7 +23,7 @@ import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -35,7 +35,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A server side handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A client side handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -35,7 +35,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A server side handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -35,7 +35,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A server side handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -27,7 +27,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A server side handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -35,7 +35,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericLogicalHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericLogicalHandler; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.LogicalMessageContext; import javax.xml.ws.handler.MessageContext; -import org.jboss.wsf.spi.handler.GenericLogicalHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericLogicalHandler; public class LogicalJAXBHandler extends GenericLogicalHandler { Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -35,7 +35,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericLogicalHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericLogicalHandler; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A jaxws protocol handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; /** * A jaxws protocol handler Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -35,7 +35,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericLogicalHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericLogicalHandler; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/handler/SOAPMessageTrace.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/handler/SOAPMessageTrace.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/handler/SOAPMessageTrace.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -24,7 +24,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; public class SOAPMessageTrace extends GenericSOAPHandler { Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-06-26 21:03:20 UTC (rev 3733) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-06-26 21:46:51 UTC (rev 3734) @@ -22,7 +22,7 @@ package org.jboss.test.ws.jaxws.samples.xop.doclit; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler; import org.w3c.dom.Node; import org.w3c.dom.NodeList;