Author: richard.opalka(a)jboss.com Date: 2010-01-14 01:40:00 -0500 (Thu, 14 Jan 2010) New Revision: 11414 Removed: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml Log: refactoring archive names Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-01-14 06:40:00 UTC (rev 11414) @@ -236,7 +236,7 @@ </jar> <!-- jaxws-jbws1581 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> @@ -247,14 +247,13 @@ </war> <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear"> <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws1581.war"/> + <include name="jaxws-jbws1581-pojo.war"/> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> - <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581-ejb3.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2010-01-14 06:40:00 UTC (rev 11414) @@ -43,16 +43,16 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); + return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581-pojo?wsdl"); Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString()); assertNotNull("wsdl expected", wsdl); } - + public void testEJBVehicle() throws Exception { EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2010-01-14 06:40:00 UTC (rev 11414) @@ -43,16 +43,16 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); + return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581-pojo?wsdl"); Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString()); assertNotNull("wsdl expected", wsdl); } - + public void testEJBVehicle() throws Exception { EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); Deleted: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/application.xml 2010-01-14 06:40:00 UTC (rev 11414) @@ -1,16 +0,0 @@ -<?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 Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/jboss-app.xml 2010-01-14 06:40:00 UTC (rev 11414) @@ -3,7 +3,7 @@ <!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> - + <jboss-app> <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.ear</loader-repository> </jboss-app> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2010-01-14 06:40:00 UTC (rev 11414) @@ -27,7 +27,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBeanBinding' name='EndpointBeanPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1581'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1581-pojo'/> </port> </service> </definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/jboss-web.xml 2010-01-14 06:40:00 UTC (rev 11414) @@ -3,10 +3,10 @@ <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> <jboss-web> - + <class-loading> - <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581.war</loader-repository> + <loader-repository>jbossws.jbws1581:domain=jaxws-jbws1581-pojo.war</loader-repository> </class-loading> - + </jboss-web> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml 2010-01-13 22:08:59 UTC (rev 11413) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1581/WEB-INF/web.xml 2010-01-14 06:40:00 UTC (rev 11414) @@ -2,15 +2,15 @@ <web-app version="2.4" 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/web-app_2_4.xsd"> - + <servlet> <servlet-name>EndpointBean</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.jbws1581.EndpointBean</servlet-class> </servlet> - + <servlet-mapping> <servlet-name>EndpointBean</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> - + </web-app> \ No newline at end of file