Author: darran.lofthouse(a)jboss.com Date: 2008-06-17 14:22:11 -0400 (Tue, 17 Jun 2008) New Revision: 7614 Modified: stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml Log: Modifications to tests to run against JBoss EAP and reproduce the correct failure. Modified: stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml 2008-06-17 16:49:48 UTC (rev 7613) +++ stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxrpc.xml 2008-06-17 18:22:11 UTC (rev 7614) @@ -2575,7 +2575,78 @@ <include name="wsdl/**"/> </metainf> </jar> + + <!-- jaxrpc-jbws1762 --> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="ejb-jar.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged"> + <include name="jboss.xml"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/> + <unjar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/> + <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar/META-INF" + file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml" overwrite="true"/> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> + <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> + + <ear jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws1762-packaged.jar"/> + <include name="jaxrpc-jbws1762-packaged.war"/> + </fileset> + </ear> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear"/> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml" + todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/> + <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"> + <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/> + </copy> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/> + <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"> + <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/> + </copy> + + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws1762-packaged.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> + <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF" + file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"/> + <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" + dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/> + <!-- jaxrpc-jbws1792 --> <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml 2008-06-17 16:49:48 UTC (rev 7613) +++ stack/native/branches/dlofthouse/JBPAPP-890/ant-import-tests/build-jars-jaxws.xml 2008-06-17 18:22:11 UTC (rev 7614) @@ -366,7 +366,53 @@ <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> </classes> - </war> + </war> + + <!-- jaxws-jbws1762 --> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/> + </fileset> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> + <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1762-packaged.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1762-packaged.jar"/> + <include name="jaxws-jbws1762-packaged.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> + <include name="application.xml"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> + <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> <!-- jaxws-jbws1798 --> <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> Modified: stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2008-06-17 16:49:48 UTC (rev 7613) +++ stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2008-06-17 18:22:11 UTC (rev 7614) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxrpc.jbws1762; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -46,7 +47,7 @@ protected void setUp() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - URL mappingURL = getResourceURL("jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml"); + URL mappingURL = new File("resources/jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml").toURL(); QName serviceName = new QName("http://org.jboss.test.webservice/jbws1762", "EJB2Bean"); ServiceFactoryImpl factory = new ServiceFactoryImpl(); Modified: stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2008-06-17 16:49:48 UTC (rev 7613) +++ stack/native/branches/dlofthouse/JBPAPP-890/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2008-06-17 18:22:11 UTC (rev 7614) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxrpc.jbws1762; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -48,7 +49,7 @@ { ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - URL mappingURL = getResourceURL("jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml"); + URL mappingURL = new File("resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml").toURL(); QName serviceName = new QName("http://org.jboss.test.ws/jbws1762", "POJOBean"); Service service = factory.createService(wsdlURL, serviceName, mappingURL); Modified: stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2008-06-17 16:49:48 UTC (rev 7613) +++ stack/native/branches/dlofthouse/JBPAPP-890/src/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2008-06-17 18:22:11 UTC (rev 7614) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> <servlet> <servlet-name>POJOBean</servlet-name> - <servlet-class&gt;@endpoint.servlet(a)&lt;/servlet-class&gt; + <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class> <init-param> <param-name>jboss.ws.endpoint</param-name> <param-value>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</param-value>