Author: richard.opalka(a)jboss.com Date: 2009-02-03 05:33:26 -0500 (Tue, 03 Feb 2009) New Revision: 9216 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss-service.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss-service.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/META-INF/jboss-service.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/META-INF/jboss-service.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/ Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java Log: [JBWS-2433] final fix - use different jboss-service for AS4 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-02-03 10:11:30 UTC (rev 9215) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -103,12 +103,21 @@ <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponseMessageBean.class"/> </fileset> </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client-as4.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-samples-dar-jms-client.war"/> + <include name="jaxws-samples-dar-jms-client.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/jboss4x/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client.sar"> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-samples-dar-jms-client.war"/> <include name="jaxws-samples-dar-jms-client.jar"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/jboss5x/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -120,15 +129,23 @@ <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.class"/> </fileset> </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as4.sar"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-samples-jmstransport.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/jboss4x/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar"> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-samples-jmstransport.jar"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/jboss5x/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> - + <!-- jaxws-samples-news --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-newspaper.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2009-02-03 10:11:30 UTC (rev 9215) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2009-02-03 10:33:26 UTC (rev 9216) @@ -34,6 +34,7 @@ import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -50,7 +51,8 @@ public static Test suite() { - return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client.sar,jaxws-samples-dar-jms.jar"); + String suffix = new JBossWSTestHelper().isTargetJBoss4() ? "-as4" : ""; + return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client" + suffix + ".sar,jaxws-samples-dar-jms.jar"); } public void test() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-02-03 10:11:30 UTC (rev 9215) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-02-03 10:33:26 UTC (rev 9216) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.samples.jmstransport; -import java.io.File; import java.net.URL; import javax.jms.Message; @@ -39,12 +38,12 @@ import javax.xml.ws.Service; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.wsf.common.DOMUtils; import junit.framework.Test; - /** * A web service client that connects to a MDB endpoint. * @@ -57,7 +56,8 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar"); + String suffix = new JBossWSTestHelper().isTargetJBoss4() ? "-as4" : ""; + return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport" + suffix + ".sar"); } public void testJMSEndpointPort() throws Exception Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss-service.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> +</server> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/META-INF/jboss.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss> + <security-domain>java:/jaas/JBossWS</security-domain> +</jboss> \ No newline at end of file Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss-service.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=DarRequestQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=DarResponseQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> +</server> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/META-INF/jboss.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss> + <security-domain>java:/jaas/JBossWS</security-domain> +</jboss> \ No newline at end of file Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/META-INF/jboss-service.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <!-- RequestQueue is automatically created on JBoss4x series --> + <!--mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=RequestQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean--> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=ResponseQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> +</server> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/META-INF/jboss-service.xml 2009-02-03 10:33:26 UTC (rev 9216) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=RequestQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=ResponseQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> +</server>