Author: thomas.diesler(a)jboss.com Date: 2007-11-05 13:30:16 -0500 (Mon, 05 Nov 2007) New Revision: 4988 Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml stack/native/trunk/src/test/resources/test-excludes-jboss500.txt Log: Fix JBWS-1762 regression Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml 2007-11-05 18:30:16 UTC (rev 4988) @@ -2549,6 +2549,26 @@ </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"/> @@ -2563,6 +2583,25 @@ </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"/> @@ -2573,7 +2612,7 @@ </jar> <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/> <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml" todir="${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 --> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractPOJOTest.java 2007-11-05 18:30:16 UTC (rev 4988) @@ -41,18 +41,24 @@ */ public abstract class AbstractPOJOTest extends JBossWSTest { + private String pojoTargetNS = "http://org.jboss.test.ws/jbws1762"; + private String pojoServiceName = "POJOBean"; private POJOIface pojoProxy; public void setUp() throws Exception { super.setUp(); - ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - URL mappingURL = new File("resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName serviceName = new QName("http://org.jboss.test.ws/jbws1762", "POJOBean"); + + if (pojoProxy == null) + { + ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + URL mappingURL = new File("resources/jaxrpc/jbws1762/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName(pojoTargetNS, pojoServiceName); - Service service = factory.createService(wsdlURL, serviceName, mappingURL); - pojoProxy = (POJOIface)service.getPort(POJOIface.class); + Service service = factory.createService(wsdlURL, serviceName, mappingURL); + pojoProxy = (POJOIface)service.getPort(POJOIface.class); + } } protected abstract String getWSDLLocation(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-11-05 18:30:16 UTC (rev 4988) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-exploded-war/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-11-05 18:30:16 UTC (rev 4988) @@ -42,6 +42,6 @@ public String getWSDLLocation() { - return "jaxrpc-jbws1762-packaged-war/POJOBean?wsdl"; + return "jaxrpc-jbws1762/POJOBean?wsdl"; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2007-11-05 18:30:16 UTC (rev 4988) @@ -46,11 +46,15 @@ public void setUp() throws Exception { super.setUp(); - QName serviceName = new QName(ejb3TargetNS, ejb3ServiceName); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + + if (ejb3Proxy == null) + { + QName serviceName = new QName(ejb3TargetNS, ejb3ServiceName); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - Service service = Service.create(wsdlURL, serviceName); - ejb3Proxy = service.getPort(EJB3Iface.class); + Service service = Service.create(wsdlURL, serviceName); + ejb3Proxy = service.getPort(EJB3Iface.class); + } } protected abstract String getWSDLLocation(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2007-11-05 18:30:16 UTC (rev 4988) @@ -33,7 +33,6 @@ * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail * * @author richard.opalka(a)jboss.com - * @author heiko.braun(a)jboss.com * * @since Oct 17, 2007 */ @@ -47,11 +46,15 @@ protected void setUp() throws Exception { super.setUp(); - QName serviceName = new QName(pojoTargetNS, pojoServiceName); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - Service service = Service.create(wsdlURL, serviceName); - pojoProxy = (POJOIface)service.getPort(POJOIface.class); + if (pojoProxy == null) + { + QName serviceName = new QName(pojoTargetNS, pojoServiceName); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + + Service service = Service.create(wsdlURL, serviceName); + pojoProxy = (POJOIface)service.getPort(POJOIface.class); + } } protected abstract String getWSDLLocation(); Modified: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml 2007-11-05 18:30:16 UTC (rev 4988) @@ -9,7 +9,7 @@ <module> <web> <web-uri>jaxrpc-jbws1762-exploded.war</web-uri> - <context-root>jaxrpc-jbws1762-exploded-war</context-root> + <context-root>jaxrpc-jbws1762</context-root> </web> </module> </application> Modified: stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml 2007-11-05 18:30:16 UTC (rev 4988) @@ -9,7 +9,7 @@ <module> <web> <web-uri>jaxrpc-jbws1762-packaged.war</web-uri> - <context-root>jaxrpc-jbws1762-packaged-war</context-root> + <context-root>jaxrpc-jbws1762</context-root> </web> </module> </application> Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-05 13:37:39 UTC (rev 4987) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-05 18:30:16 UTC (rev 4988) @@ -17,6 +17,10 @@ org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/** org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/** +# [JBAS-4940] Deployment.types not propagated +org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/** +org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/** + # [JBAS-4890] EJBAccessException: Caller unauthorized org/jboss/test/ws/jaxws/samples/context/**