Author: thomas.diesler(a)jboss.com Date: 2007-03-19 19:02:17 -0400 (Mon, 19 Mar 2007) New Revision: 2643 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/application.xml Removed: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/jboss-app.xml trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml Log: [JBWS-1581] EJB client vehicle not sufficiently isolated Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-19 22:10:33 UTC (rev 2642) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-19 23:02:17 UTC (rev 2643) @@ -251,6 +251,7 @@ <include name="jaxws-jbws1581.war"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> </jar> Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-03-19 23:02:17 UTC (rev 2643) @@ -0,0 +1,61 @@ +/* + * 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.jbws1581; + +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * EJB vehicle using loader repository not sufficiently isolated + * + * http://jira.jboss.org/jira/browse/JBWS-1581 + * + * @author Thomas.Diesler(a)jboss.com + * @since 19-Mar-2007 + */ +public class JBWS1581EarTestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); + WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + assertNotNull("wsdl expected", wsdl); + } + + public void testEJBVehicle() throws Exception + { + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/ejb3/EJB3Bean"); + String retStr = remote.runTest("Hello World!"); + assertEquals("Hello World!", retStr); + } +} \ No newline at end of file Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2007-03-19 22:10:33 UTC (rev 2642) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2007-03-19 23:02:17 UTC (rev 2643) @@ -1,50 +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.jbws1581; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * EJB vehicle using loader repository not sufficiently isolated - * - * http://jira.jboss.org/jira/browse/JBWS-1581 - * - * @author Thomas.Diesler(a)jboss.com - * @since 19-Mar-2007 - */ -public class JBWS1581TestCase extends JBossWSTest -{ - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1581TestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); - } - - public void testCall() throws Exception - { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/ejb3/EJB3Bean"); - String retStr = remote.runTest("Hello World!"); - assertEquals("Hello World!", retStr); - } -} \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java (from rev 2640, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-03-19 23:02:17 UTC (rev 2643) @@ -0,0 +1,61 @@ +/* + * 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.jbws1581; + +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * EJB vehicle using loader repository not sufficiently isolated + * + * http://jira.jboss.org/jira/browse/JBWS-1581 + * + * @author Thomas.Diesler(a)jboss.com + * @since 19-Mar-2007 + */ +public class JBWS1581WarTestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); + WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + assertNotNull("wsdl expected", wsdl); + } + + public void testEJBVehicle() throws Exception + { + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/ejb3/EJB3Bean"); + String retStr = remote.runTest("Hello World!"); + assertEquals("Hello World!", retStr); + } +} \ No newline at end of file Added: trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/application.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/application.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/application.xml 2007-03-19 23:02:17 UTC (rev 2643) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application 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/application_1_4.xsd" + version="1.4"> + + <module> + <web> + <web-uri>jaxws-jbws1581.war</web-uri> + <context-root>jaxws-jbws1581</context-root> + </web> + </module> + +</application> \ No newline at end of file Property changes on: trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/application.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/jboss-app.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2007-03-19 22:10:33 UTC (rev 2642) +++ trunk/jbossws-tests/src/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2007-03-19 23:02:17 UTC (rev 2643) @@ -5,5 +5,5 @@ "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> <jboss-app> - <loader-repository>jboss.ws.test:loader=JBWS1581</loader-repository> -</jboss-app> \ No newline at end of file + <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.ear</loader-repository> +</jboss-app> \ No newline at end of file Modified: trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml 2007-03-19 22:10:33 UTC (rev 2642) +++ trunk/jbossws-tests/src/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml 2007-03-19 23:02:17 UTC (rev 2643) @@ -5,7 +5,7 @@ <jboss-web> <class-loading> - <loader-repository>jbossws.jbws1581:domain=endpoint</loader-repository> + <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.war</loader-repository> </class-loading> </jboss-web>