[jbossws-commits] JBossWS SVN: r2026 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/server and 10 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-01-22 13:48:34 -0500 (Mon, 22 Jan 2007) New Revision: 2026 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainTestCase.java Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/META-INF01/ trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/META-INF02/ejb-jar.xml trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/META-INF03/ Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/src/main/resources/jaxws/context/WEB-INF/jboss-web.xml trunk/jbossws-tests/src/main/resources/jaxws/eardeployment/META-INF/jboss-app.xml trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt Log: Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -46,18 +46,9 @@ { protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception { - UnifiedDeploymentInfo udi; URL webservicesURL = getWebservicesDescriptor(di); - if (webservicesURL != null) - { - udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_EJB21, webservicesURL); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); - } - else - { - udi = new JAXWSDeployment(UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB21); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); - } + UnifiedDeploymentInfo udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_EJB21, webservicesURL); + DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); return udi; } @@ -85,7 +76,8 @@ BeanMetaData beanMetaData = (BeanMetaData)itBeans.next(); String ejbClassName = beanMetaData.getEjbClass(); Class ejbClass = di.annotationsCl.loadClass(ejbClassName); - isWebserviceDeployment = ejbClass.isAnnotationPresent(javax.jws.WebService.class); + if (ejbClass.isAnnotationPresent(javax.jws.WebService.class)) + throw new UnsupportedOperationException("JAXWS not supported on EJB2.1 endpoints"); } } catch (RuntimeException e) @@ -109,7 +101,7 @@ { return di.localCl.findResource("META-INF/webservices.xml"); } - + protected URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException { ServiceEndpointGeneratorEJB21 generator = new ServiceEndpointGeneratorEJB21(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -30,7 +30,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB21; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -90,11 +89,6 @@ JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); wsMetaData = builder.buildMetaData(udi); } - else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB21) - { - JAXWSMetaDataBuilderEJB21 builder = new JAXWSMetaDataBuilderEJB21(); - wsMetaData = builder.buildMetaData(udi); - } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInfo.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -68,7 +68,7 @@ { this.type = EndpointType.JSE; } - else if (udi.type == DeploymentType.JAXRPC_EJB21 || udi.type == DeploymentType.JAXWS_EJB21) + else if (udi.type == DeploymentType.JAXRPC_EJB21) { String ejbName = sepMetaData.getLinkName(); if (ejbName == null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -41,7 +41,7 @@ { public enum DeploymentType { - JAXRPC_Client, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB21, JAXWS_EJB3 + JAXRPC_Client, JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_EJB3, JAXWS_JSE, JAXWS_EJB3 }; public UnifiedDeploymentInfo(DeploymentType type) Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,104 +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. -*/ -// $Id$ -package org.jboss.ws.metadata.builder.jaxws; - -import java.util.Iterator; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.annotation.security.SecurityDomain; -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; - -/** - * A server side meta data builder that is based on JSR-181 annotations - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @since 19-May-2005 - */ -public class JAXWSMetaDataBuilderEJB21 -{ - // provide logging - private final Logger log = Logger.getLogger(JAXWSMetaDataBuilderEJB21.class); - - /** Build from annotations - */ - public UnifiedMetaData buildMetaData(UnifiedDeploymentInfo udi) - { - log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); - try - { - UnifiedMetaData wsMetaData = new UnifiedMetaData(); - wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setClassLoader(udi.classLoader); - - if (udi.classLoader == null) - throw new WSException("Deployment class loader not initialized"); - - // For every bean - UnifiedApplicationMetaData appMetaData = (UnifiedApplicationMetaData)udi.metaData; - Iterator it = appMetaData.getEnterpriseBeans(); - while (it.hasNext()) - { - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)it.next(); - - String ejbClassName = beanMetaData.getEjbClass(); - Class beanClass = udi.classLoader.loadClass(ejbClassName); - if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class)) - { - String ejbLink = beanMetaData.getEjbName(); - JAXWSServerMetaDataBuilder.setupProviderOrWebService(wsMetaData, udi, beanClass, ejbLink); - - // setup the security domain - if (beanClass.isAnnotationPresent(SecurityDomain.class)) - { - SecurityDomain anSecurityDomain = (SecurityDomain)beanClass.getAnnotation(SecurityDomain.class); - String lastDomain = wsMetaData.getSecurityDomain(); - String securityDomain = anSecurityDomain.value(); - if (lastDomain != null && lastDomain.equals(securityDomain) == false) - throw new IllegalStateException("Multiple security domains not supported: " + securityDomain); - - wsMetaData.setSecurityDomain(securityDomain); - } - } - } - - log.debug("END buildMetaData: " + wsMetaData); - return wsMetaData; - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot build meta data: " + ex.getMessage(), ex); - } - } -} Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-22 18:48:34 UTC (rev 2026) @@ -316,34 +316,6 @@ <include name="jboss-web.xml"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice01-ejb21.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/META-INF01"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice02-ejb21.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.class"/> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/META-INF02"> - <include name="ejb-jar.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice03-ejb21.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.class"/> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jsr181/webservice/META-INF03"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.class"/> Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,84 +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.context; - -// $Id$ - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test JAXWS WebServiceContext - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -public class ContextEJBTestCase extends JBossWSTest -{ - private static TestEndpoint port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ContextJSETestCase.class, "jaxws-context.jar"); - } - - public void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new File("resources/jaxws/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); - Service service = Service.create(wsdlURL, qname); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); - bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - } - } - - public void testGetWebContext() throws Exception - { - String retStr = port.testGetMessageContext(); - assertEquals("pass", retStr); - } - - public void testGetUserPrincipal() throws Exception - { - String retStr = port.testGetUserPrincipal(); - assertEquals("kermit", retStr); - } - - public void testIsUserInRole() throws Exception - { - assertTrue("kermit is my friend", port.testIsUserInRole("friend")); - } -} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextJSETestCase.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextJSETestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,84 +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.context; - -// $Id$ - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test JAXWS WebServiceContext - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -public class ContextJSETestCase extends JBossWSTest -{ - private static TestEndpoint port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ContextJSETestCase.class, "jaxws-context.war"); - } - - public void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new File("resources/jaxws/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); - Service service = Service.create(wsdlURL, qname); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); - bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - } - } - - public void testGetWebContext() throws Exception - { - String retStr = port.testGetMessageContext(); - assertEquals("pass", retStr); - } - - public void testGetUserPrincipal() throws Exception - { - String retStr = port.testGetUserPrincipal(); - assertEquals("kermit", retStr); - } - - public void testIsUserInRole() throws Exception - { - assertTrue("kermit is my friend", port.testIsUserInRole("friend")); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java (from rev 2020, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -0,0 +1,84 @@ +/* + * 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.context; + +// $Id$ + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test JAXWS WebServiceContext + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +public class WebServiceContextEJBTestCase extends JBossWSTest +{ + private static TestEndpoint port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(WebServiceContextEJBTestCase.class, "jaxws-context.jar"); + } + + public void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new File("resources/jaxws/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + } + } + + public void testGetWebContext() throws Exception + { + String retStr = port.testGetMessageContext(); + assertEquals("pass", retStr); + } + + public void testGetUserPrincipal() throws Exception + { + String retStr = port.testGetUserPrincipal(); + assertEquals("kermit", retStr); + } + + public void testIsUserInRole() throws Exception + { + assertTrue("kermit is my friend", port.testIsUserInRole("friend")); + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextJSETestCase.java (from rev 2020, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextJSETestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextJSETestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextJSETestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -0,0 +1,84 @@ +/* + * 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.context; + +// $Id$ + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test JAXWS WebServiceContext + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +public class WebServiceContextJSETestCase extends JBossWSTest +{ + private static TestEndpoint port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(WebServiceContextJSETestCase.class, "jaxws-context.war"); + } + + public void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new File("resources/jaxws/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + } + } + + public void testGetWebContext() throws Exception + { + String retStr = port.testGetMessageContext(); + assertEquals("pass", retStr); + } + + public void testGetUserPrincipal() throws Exception + { + String retStr = port.testGetUserPrincipal(); + assertEquals("kermit", retStr); + } + + public void testIsUserInRole() throws Exception + { + assertTrue("kermit is my friend", port.testIsUserInRole("friend")); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -0,0 +1,69 @@ +/* + * 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.jsr181.handlerchain; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test the JSR-181 annotation: javax.jws.HandlerChain + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Oct-2005 + */ +public class HandlerChainClientTestCase extends JBossWSTest +{ + private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(HandlerChainClientTestCase.class, "jaxws-jsr181-handlerchain.war, jaxws-jsr181-handlerchain-client.jar"); + } + + public void testHandlerChainOnWebServiceRef() throws Throwable + { + String resStr = invokeTestClient("testService1", "Kermit"); + assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); + } + + public void testHandlerChainNegative() throws Throwable + { + String resStr = invokeTestClient("testService2", "Kermit"); + assertEquals("Kermit|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut", resStr); + } + + public void testHandlerChainOverride() throws Throwable + { + String resStr = invokeTestClient("testService3", "Kermit"); + assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); + } + + private String invokeTestClient(String testName, String reqStr) throws Throwable + { + new ClientLauncher().launch(HandlerChainClient.class.getName(), "jbossws-client", new String[] { testName, reqStr }); + String resStr = HandlerChainClient.testResult.get(testName); + return resStr; + } +} Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainTestCase.java (from rev 2021, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainTestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -0,0 +1,83 @@ +/* + * 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.jsr181.handlerchain; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.handler.Handler; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test the JSR-181 annotation: javax.jws.HandlerChain + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Oct-2005 + */ +public class HandlerChainTestCase extends JBossWSTest +{ + private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(HandlerChainTestCase.class, "jaxws-jsr181-handlerchain.war"); + } + + public void testDynamicHandlerChain() throws Exception + { + QName serviceName = new QName(targetNS, "EndpointImplService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-handlerchain/TestService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.add(new LogHandler()); + handlerChain.add(new AuthorizationHandler()); + handlerChain.add(new RoutingHandler()); + bindingProvider.getBinding().setHandlerChain(handlerChain); + + String resStr = port.echo("Kermit"); + assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); + } + + public void testHandlerChainOnServiceEndpointInterface() throws Exception + { + QName serviceName = new QName(targetNS, "EndpointImplService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-handlerchain/TestService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class); + + String resStr = port.echo("Kermit"); + assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,109 +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.jsr181.handlerchain; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test the JSR-181 annotation: javax.jws.HandlerChain - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Oct-2005 - */ -public class JSR181HandlerChainTestCase extends JBossWSTest -{ - private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JSR181HandlerChainTestCase.class, "jaxws-jsr181-handlerchain.war, jaxws-jsr181-handlerchain-client.jar"); - } - - public void testDynamicHandlerChain() throws Exception - { - QName serviceName = new QName(targetNS, "EndpointImplService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-handlerchain/TestService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - Endpoint port = (Endpoint)service.getPort(Endpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - List<Handler> handlerChain = new ArrayList<Handler>(); - handlerChain.add(new LogHandler()); - handlerChain.add(new AuthorizationHandler()); - handlerChain.add(new RoutingHandler()); - bindingProvider.getBinding().setHandlerChain(handlerChain); - - String resStr = port.echo("Kermit"); - assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); - } - - public void testHandlerChainOnServiceEndpointInterface() throws Exception - { - QName serviceName = new QName(targetNS, "EndpointImplService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-handlerchain/TestService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class); - - String resStr = port.echo("Kermit"); - assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); - } - - public void testHandlerChainOnWebServiceRef() throws Throwable - { - String resStr = invokeTestClient("testService1", "Kermit"); - assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); - } - - public void testHandlerChainNegative() throws Throwable - { - String resStr = invokeTestClient("testService2", "Kermit"); - assertEquals("Kermit|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut", resStr); - } - - public void testHandlerChainOverride() throws Throwable - { - String resStr = invokeTestClient("testService3", "Kermit"); - assertEquals("Kermit|LogOut|AuthOut|RoutOut|LogIn|AuthIn|RoutIn|endpoint|RoutOut|AuthOut|LogOut|RoutIn|AuthIn|LogIn", resStr); - } - - private String invokeTestClient(String testName, String reqStr) throws Throwable - { - new ClientLauncher().launch(HandlerChainClient.class.getName(), "jbossws-client", new String[] { testName, reqStr }); - String resStr = HandlerChainClient.testResult.get(testName); - return resStr; - } -} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,95 +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.jsr181.webservice; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Test the JSR-181 annotation: javax.jws.WebService - * - * @author Thomas.Diesler(a)jboss.org - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @since 29-Apr-2005 - */ -public class JSR181WebServiceEJB21TestCase extends JSR181WebServiceBase -{ - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB21TestCase.class, ""); - } - - public void testWebServiceTest() throws Exception - { - deploy("jaxws-jsr181-webservice01-ejb21.jar"); - try - { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - webServiceTest(); - } - finally - { - undeploy("jaxws-jsr181-webservice01-ejb21.jar"); - } - } - - public void testWebServiceWsdlLocationTest() throws Exception - { - deploy("jaxws-jsr181-webservice02-ejb21.jar"); - try - { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - webServiceWsdlLocationTest(); - } - finally - { - undeploy("jaxws-jsr181-webservice02-ejb21.jar"); - } - } - - public void testWebServiceEndpointInterfaceTest() throws Exception - { - deploy("jaxws-jsr181-webservice03-ejb21.jar"); - try - { - if (isTargetJBoss50()) - { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - return; - } - webServiceEndpointInterfaceTest(); - } - finally - { - undeploy("jaxws-jsr181-webservice03-ejb21.jar"); - } - } -} \ No newline at end of file Modified: trunk/jbossws-tests/src/main/resources/jaxws/context/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/context/WEB-INF/jboss-web.xml 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/resources/jaxws/context/WEB-INF/jboss-web.xml 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> - <jboss-web> - <security-domain>java:/jaas/JBossWS</security-domain> + <security-domain>java:/jaas/JBossWS</security-domain> </jboss-web> \ No newline at end of file Modified: trunk/jbossws-tests/src/main/resources/jaxws/eardeployment/META-INF/jboss-app.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/eardeployment/META-INF/jboss-app.xml 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/resources/jaxws/eardeployment/META-INF/jboss-app.xml 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,8 +1,6 @@ <?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE jboss-app - PUBLIC "-//JBoss//DTD Java EE Application 5.0///EN" - "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd"> +<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD Java EE Application 5.0///EN" "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd"> <jboss-app> <module> Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/META-INF02/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/META-INF02/ejb-jar.xml 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/META-INF02/ejb-jar.xml 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" - version="2.1"> - - <enterprise-beans> - <session> - <ejb-name>TestService</ejb-name> - - <!-- This is only here to pass the EJB-2.1 verifier --> - <service-endpoint>org.jboss.test.ws.jaxws.jsr181.webservice.EndpointInterface</service-endpoint> - - <ejb-class>org.jboss.test.ws.jaxws.jsr181.webservice.EJB21Bean02</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - </enterprise-beans> -</ejb-jar> - Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-22 18:48:34 UTC (rev 2026) @@ -1 +1,3 @@ -nothing-to-exclude/** \ No newline at end of file +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class +org/jboss/test/ws/jaxws/webserviceref/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-22 18:48:34 UTC (rev 2026) @@ -1 +1,3 @@ -nothing-to-exclude/** \ No newline at end of file +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class +org/jboss/test/ws/jaxws/webserviceref/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-22 18:14:16 UTC (rev 2025) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-22 18:48:34 UTC (rev 2026) @@ -1,8 +1,9 @@ org/jboss/test/ws/jaxws/eardeployment/** org/jboss/test/ws/jaxws/jbws944/** org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.class org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.class org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.class +org/jboss/test/ws/jaxws/webserviceref/** org/jboss/test/ws/jaxws/xop/**