Author: richard.opalka(a)jboss.com Date: 2010-03-26 10:16:07 -0400 (Fri, 26 Mar 2010) New Revision: 11868 Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointService.java Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/ClientHandler2.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java Log: [JBPAPP-3995] fixing @HandlerChain accepted on client SEI - it shouldn't be Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-03-26 13:54:09 UTC (rev 11867) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-03-26 14:16:07 UTC (rev 11868) @@ -284,9 +284,6 @@ processEndpointConfig(epMetaData, wsClass); epMetaData.initEndpointConfig(); - // Process an optional @HandlerChain annotation - processHandlerChain(epMetaData, wsClass); - // Process @WebMethod processWebMethods(epMetaData, wsClass); Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/ClientHandler2.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/ClientHandler2.java 2010-03-26 13:54:09 UTC (rev 11867) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/ClientHandler2.java 2010-03-26 14:16:07 UTC (rev 11868) @@ -24,7 +24,6 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; - public class ClientHandler2 extends LifecycleHandler { protected boolean handleOutboundMessage(MessageContext msgContext) Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2010-03-26 13:54:09 UTC (rev 11867) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2010-03-26 14:16:07 UTC (rev 11868) @@ -67,7 +67,7 @@ { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle/soap?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointBeanService"); - Service service = Service.create(wsdlURL, serviceName); + Service service = new SOAPEndpointService(wsdlURL, serviceName); port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); } } @@ -90,11 +90,11 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); - expMessages.add("PreClientHandler1:PostConstruct"); - expMessages.add("PreClientHandler2:PostConstruct"); expMessages.add("ClientHandler1:PostConstruct"); expMessages.add("ClientHandler2:PostConstruct"); expMessages.add("ClientHandler3:PostConstruct"); + expMessages.add("PreClientHandler1:PostConstruct"); + expMessages.add("PreClientHandler2:PostConstruct"); expMessages.add("PostClientHandler1:PostConstruct"); expMessages.add("PostClientHandler2:PostConstruct"); Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2010-03-26 13:54:09 UTC (rev 11867) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2010-03-26 14:16:07 UTC (rev 11868) @@ -21,14 +21,12 @@ */ package org.jboss.test.ws.jaxws.handlerlifecycle; -import javax.jws.HandlerChain; import javax.jws.WebMethod; import javax.jws.WebService; import org.jboss.ws.annotation.EndpointConfig; @WebService -@HandlerChain(file = "jaxws-client-handlers.xml") @EndpointConfig(configName = "Custom Client Config", configFile = "META-INF/jaxws-client-config.xml") public interface SOAPEndpoint { Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2010-03-26 13:54:09 UTC (rev 11867) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2010-03-26 14:16:07 UTC (rev 11868) @@ -39,7 +39,6 @@ @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/handlerlifecycle") @HandlerChain(file = "jaxws-server-handlers.xml") @SOAPBinding(style = Style.RPC) - @EndpointConfig(configName = "Custom Server Config", configFile = "WEB-INF/jaxws-endpoint-config.xml") public class SOAPEndpointBean { Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointService.java (from rev 11867, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointService.java) =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointService.java (rev 0) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointService.java 2010-03-26 14:16:07 UTC (rev 11868) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.handlerlifecycle; + +import java.net.URL; + +import javax.jws.HandlerChain; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@HandlerChain(file = "jaxws-client-handlers.xml") +public class SOAPEndpointService extends Service +{ + public SOAPEndpointService(URL wsdlLocation, QName serviceName) + { + super(wsdlLocation, serviceName); + } +}