Author: asoldano Date: 2013-08-27 11:26:36 -0400 (Tue, 27 Aug 2013) New Revision: 17892 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl Log: [JBWS-3698] Fixing failure on AS 7.x... Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2013-08-27 14:18:53 UTC (rev 17891) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2013-08-27 15:26:36 UTC (rev 17892) @@ -237,6 +237,21 @@ </manifest> </war> + <!-- jaxws-cxf-jms-http-deployment-test-servlet-as7 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet-as7.war" + needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.class"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl" + prefix="WEB-INF/classes/META-INF/wsdl"/> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/> + </manifest> + </war> + <!-- jaxws-cxf-jms-http-deployment-test-servlet --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet.war" needxmlfile='false'> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2013-08-27 14:18:53 UTC (rev 17891) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2013-08-27 15:26:36 UTC (rev 17892) @@ -112,7 +112,11 @@ Properties env = new Properties(); env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); - env.put(Context.PROVIDER_URL, "http-remoting://" + getServerHost() + ":8080"); + if (isTargetJBoss7()) { + env.put(Context.PROVIDER_URL, "remote://" + getServerHost() + ":4447"); + } else { + env.put(Context.PROVIDER_URL, "http-remoting://" + getServerHost() + ":8080"); + } env.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); env.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); InitialContext context = null; Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2013-08-27 14:18:53 UTC (rev 17891) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2013-08-27 15:26:36 UTC (rev 17892) @@ -50,20 +50,23 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, "jaxws-cxf-jms-http-deployment-test-servlet.war," + - (isTargetJBoss7() ? "jaxws-cxf-jms-http-deployment-as7.war" : "jaxws-cxf-jms-http-deployment.war")); + return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, (isTargetJBoss7() ? + "jaxws-cxf-jms-http-deployment-test-servlet-as7.war, jaxws-cxf-jms-http-deployment-as7.war" : + "jaxws-cxf-jms-http-deployment-test-servlet.war, jaxws-cxf-jms-http-deployment.war")); } public void testJMSEndpointServerSide() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet"); + final String suffix = isTargetJBoss7() ? "-as7" : ""; + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet" + suffix); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("true", br.readLine()); } public void testJMSEndpointClientSide() throws Exception { - URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl"); + final String suffix = isTargetJBoss7() ? "-as7" : ""; + URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF" + suffix + "/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); @@ -81,7 +84,8 @@ public void testHTTPEndpointClientSide() throws Exception { - URL wsdlUrl = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment?wsdl"); + final String suffix = isTargetJBoss7() ? "-as7" : ""; + URL wsdlUrl = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment" + suffix + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== (Binary files differ)