Author: asoldano Date: 2013-08-27 10:17:08 -0400 (Tue, 27 Aug 2013) New Revision: 17890 Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl 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/wsdl/HelloWorldService.wsdl Log: [JBWS-3698] Use HTTP Upgrade for remote connection factory JNDI on WFLY 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-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2013-08-27 14:17:08 UTC (rev 17890) @@ -154,26 +154,39 @@ </war> <!-- jaxws-cxf-jms-api --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war" + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.class"/> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> </classes> <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF/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-only-deployment-as7 --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment-as7.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7"> + <include name="wsdl/**/*" /> + </metainf> + <manifest> + <attribute name="Dependencies" value="org.hornetq"/> + </manifest> + </jar> + <!-- jaxws-cxf-jms-only-deployment --> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF"> <include name="wsdl/**/*" /> </metainf> <manifest> @@ -181,6 +194,20 @@ </manifest> </jar> + <!-- jaxws-cxf-jms-http-deployment-as7 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-as7.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld*.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorld*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF-as7"> + <include name="wsdl/**"/> + </webinf> + <manifest> + <attribute name="Dependencies" value="org.hornetq"/> + </manifest> + </war> + <!-- jaxws-cxf-jms-http-deployment --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -203,7 +230,7 @@ <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.class"/> </classes> <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF/wsdl" prefix="WEB-INF/classes/META-INF/wsdl"/> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/> 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-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2013-08-27 14:17:08 UTC (rev 17890) @@ -63,7 +63,8 @@ public static Test suite() { - return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCaseForked.class, "jaxws-cxf-jms-only-deployment-test-servlet.war,jaxws-cxf-jms-only-deployment.jar"); + return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCaseForked.class, "jaxws-cxf-jms-only-deployment-test-servlet.war, " + + (isTargetJBoss7() ? "jaxws-cxf-jms-only-deployment-as7.jar" : "jaxws-cxf-jms-only-deployment.jar")); } public void testJMSEndpointServerSide() throws Exception @@ -75,7 +76,8 @@ public void testJMSEndpointClientSide() throws Exception { - URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl"); + final String suffix = isTargetJBoss7() ? "-as7" : ""; + URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF" + suffix + "/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); @@ -110,7 +112,7 @@ Properties env = new Properties(); env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); - env.put(Context.PROVIDER_URL, "remote://" + getServerHost() + ":4447"); + 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-23 16:59:25 UTC (rev 17889) +++ 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:17:08 UTC (rev 17890) @@ -50,7 +50,8 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, "jaxws-cxf-jms-http-deployment-test-servlet.war,jaxws-cxf-jms-http-deployment.war"); + 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")); } public void testJMSEndpointServerSide() throws Exception Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2013-08-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2013-08-27 14:17:08 UTC (rev 17890) @@ -65,7 +65,7 @@ <wsdl:service name="HelloWorldService"> <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> - <soapjms:jndiURL>remote://@jboss.bind.address@:4447</soapjms:jndiURL> + <soapjms:jndiURL>http-remoting://@jboss.bind.address@:8080</soapjms:jndiURL> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> </wsdl:port> Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl ___________________________________________________________________ Added: svn:mime-type + application/xml