Author: thomas.diesler(a)jboss.com Date: 2008-04-04 05:59:55 -0400 (Fri, 04 Apr 2008) New Revision: 6226 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Modified: stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java stack/native/trunk/version.properties Log: Add generic handlers to common Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-04 09:59:55 UTC (rev 6226) @@ -143,7 +143,10 @@ <!-- The compile classpath for jbossws core --> <path id="thirdparty.classpath"> - <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> + <!-- + A stack MUST NOT have a compile time dependency on framework + http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071 + --> <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,81 +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.handler; - -// $Id$ - -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; - -/** - * A generic jaxws handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericHandler implements Handler -{ - private String handlerName; - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerName(String handlerName) - { - this.handlerName = handlerName; - } - - public boolean handleMessage(MessageContext msgContext) - { - Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - if (outbound == null) - throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); - } - - protected boolean handleOutbound(MessageContext msgContext) - { - return true; - } - - protected boolean handleInbound(MessageContext msgContext) - { - return true; - } - - public boolean handleFault(MessageContext messagecontext) - { - return true; - } - - public void close(MessageContext messageContext) - { - } - - public String toString() - { - return (handlerName != null ? handlerName : super.toString()); - } -} Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,37 +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.handler; - -// $Id$ - -import javax.xml.ws.handler.LogicalHandler; -import javax.xml.ws.handler.LogicalMessageContext; - -/** - * A generic jaxws logical handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler -{ -} Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,58 +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.handler; - -// $Id$ - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; - - -/** - * A generic jaxws soap handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler -{ - // The header blocks that can be processed by this Handler instance - private Set<QName> headers = new HashSet<QName>(); - - /** Gets the header blocks that can be processed by this Handler instance. - */ - public Set<QName> getHeaders() - { - return headers; - } - - /** Sets the header blocks that can be processed by this Handler instance. - */ - public void setHeaders(Set<QName> headers) - { - this.headers = headers; - } -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -49,6 +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.common.handler.GenericHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -27,7 +27,7 @@ import java.net.URLEncoder; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * A common CID generator Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,121 +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.security.SecureRandom; - -/** - * Generates the string form of IETF variant UUIDs. - * - * See <a href="http://www.ietf.org/internet-drafts/draft-mealling-uuid-urn-05... - * the latest IETF draft</a> for more information about UUID generation. - * - * Currently only pseudo random (type 4) UUIDs are supported. - * - * @author <a href="mailto:jason@stacksmash.com">Jason T. Greene</a> - */ -public class UUIDGenerator -{ - private static SecureRandom rand; - - private static String bytesToHex(byte[] buffer, int offset, int length) - { - long value = 0; - for (int i = 0, countDown = 8 * length; i < length; i++) - { - value |= (buffer[offset + i] & 0xffL) << (countDown -= 8); - } - - return Long.toHexString(value); - } - - /** - * Generates a pseudo random UUID and returns it in byte array form. - * - * @return a UUID byte array in network order - */ - public static byte[] generateRandomUUIDBytes() - { - if (rand == null) - rand = new SecureRandom(); - - byte[] buffer = new byte[16]; - rand.nextBytes(buffer); - - // Set version to 3 (Random) - buffer[6] = (byte) ((buffer[6] & 0x0f) | 0x40); - // Set variant to 2 (IETF) - buffer[8] = (byte) ((buffer[8] & 0x3f) | 0x80); - - return buffer; - } - - /** - * Generates a pseudo random UUID and returns it the IETF specified - * String form. See {@link #convertToString(byte[])} for a description - * of the format. - * - * @return a UUID in IETF string form. - */ - public static String generateRandomUUIDString() - { - return convertToString(generateRandomUUIDBytes()); - } - - /** - * Converts a UUID in byte array form to the IETF string format. - * - * <p>The BNF follows: - * <pre> - * UUID = <time_low> "-" <time_mid> "-" - * <time_high_and_version> "-" - * <variant_and_sequence> "-" - * <node> - * time_low = 4*<hexOctet> - * time_mid = 2*<hexOctet> - * time_high_and_version = 2*<hexOctet> - * variant_and_sequence = 2*<hexOctet> - * node = 6*<hexOctet> - * hexOctet = <hexDigit><hexDigit> - * hexDigit = - * "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" - * | "a" | "b" | "c" | "d" | "e" | "f" - * | "A" | "B" | "C" | "D" | "E" | "F" - * </pre> - * - * @param uuid a 16 byte - * @return the IETF string form of the passed UUID - */ - public static String convertToString(byte[] uuid) - { - if (uuid.length != 16) - throw new IllegalArgumentException("A UUID must be 16 bytes!"); - - String string = bytesToHex(uuid, 0, 4) + "-" - + bytesToHex(uuid, 4, 2) + "-" - + bytesToHex(uuid, 6, 2) + "-" - + bytesToHex(uuid, 8, 2) + "-" - + bytesToHex(uuid, 10, 6); - - return string; - } -} \ No newline at end of file Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -9,7 +9,7 @@ import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.AttributedURI; -import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * @author Heiko Braun, <heiko(a)openj.net&gt; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -26,7 +26,7 @@ import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -23,10 +23,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; 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.common.handler.GenericSOAPHandler; import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -54,7 +54,6 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.Util; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; @@ -62,6 +61,7 @@ import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.common.utils.UUIDGenerator; import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -36,7 +36,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; @@ -44,6 +43,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.common.handler.GenericSOAPHandler; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -43,7 +43,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.client.ClientImpl; -import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.api.RMException; @@ -51,6 +50,7 @@ import org.jboss.ws.extensions.wsrm.protocol.RMProvider; import org.jboss.ws.extensions.wsrm.protocol.spi.RMIncompleteSequenceBehavior; import org.jboss.ws.extensions.wsrm.transport.RMUnassignedMessageListener; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * Client side implementation of the RM sequence Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -29,12 +29,12 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.RMFault; import org.jboss.ws.extensions.wsrm.RMSequence; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.protocol.spi.RMSerializable; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * RM generic JAX-WS handler Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,96 +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.test.ws.jaxws.binding; - -import junit.framework.TestCase; - -import org.jboss.ws.core.jaxws.JAXBBindingCustomization; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jun 28, 2007 - */ -public class BindingCustomizationTestCase extends TestCase { - - DeploymentModelFactory deploymentModelFactory; - - protected void setUp() throws Exception - { - super.setUp(); - - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - } - - public void testCustomizationWriteAccess() throws Exception - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(null); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - - // a started endpoint should deny customizations - try - { - endpoint.setState(EndpointState.STARTED); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - - fail("It should not be possible to change bindinig customizations on a started endpoint"); - } - catch (Exception e) - { - // all fine, this should happen - } - } - - public void testCustomizationReadAccess() throws Exception - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(null); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - endpoint.setState(EndpointState.STARTED); - - // read a single customization - BindingCustomization knownCustomization = endpoint.getAttachment(BindingCustomization.class); - assertNotNull(knownCustomization); - - // however the iteratoion should be unmodifiable - try - { - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - fail("Started Endpoints should only axpose read acccess to their binding customizations"); - } - catch (Exception e) - { - // all fine, we'd expect this - } - - - } -} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A client side handler Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -30,7 +30,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A client side handler Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; public class ProtocolHandler extends GenericSOAPHandler { Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -0,0 +1,96 @@ +/* + * 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.test.ws.jaxws.jaxbcust; + +import junit.framework.TestCase; + +import org.jboss.ws.core.jaxws.JAXBBindingCustomization; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.DeploymentModelFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jun 28, 2007 + */ +public class BindingCustomizationTestCase extends TestCase { + + DeploymentModelFactory deploymentModelFactory; + + protected void setUp() throws Exception + { + super.setUp(); + + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } + + public void testCustomizationWriteAccess() throws Exception + { + Endpoint endpoint = deploymentModelFactory.newEndpoint(null); + JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); + jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + + // a started endpoint should deny customizations + try + { + endpoint.setState(EndpointState.STARTED); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + + fail("It should not be possible to change bindinig customizations on a started endpoint"); + } + catch (Exception e) + { + // all fine, this should happen + } + } + + public void testCustomizationReadAccess() throws Exception + { + Endpoint endpoint = deploymentModelFactory.newEndpoint(null); + JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); + jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + endpoint.setState(EndpointState.STARTED); + + // read a single customization + BindingCustomization knownCustomization = endpoint.getAttachment(BindingCustomization.class); + assertNotNull(knownCustomization); + + // however the iteratoion should be unmodifiable + try + { + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + fail("Started Endpoints should only axpose read acccess to their binding customizations"); + } + catch (Exception e) + { + // all fine, we'd expect this + } + + + } +} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1283; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.activation.DataHandler; import javax.xml.soap.AttachmentPart; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -22,7 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1283; import junit.framework.Test; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; + +import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -36,9 +36,9 @@ import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.UUIDGenerator; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.utils.UUIDGenerator; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A client side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -34,8 +34,8 @@ import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A server side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -31,7 +31,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericHandler; +import org.jboss.wsf.common.handler.GenericHandler; /** * A client side handler that disables mustUnderstand processing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericHandler; +import org.jboss.wsf.common.handler.GenericHandler; /** * A client side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler; -import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * A client side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -23,7 +23,7 @@ import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/version.properties 2008-04-04 09:59:55 UTC (rev 6226) @@ -25,8 +25,8 @@ # Dependend integration projects jbossws-spi=1.0.2.GA -jbossws-common=1.0.4.GA -jbossws-framework=3.0.1.GA +jbossws-common=snapshot +jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA # JBossAS-5.0