[jbossws-commits] JBossWS SVN: r15939 - in stack/cxf/branches/jbossws-cxf-4.0.x: etc and 11 other directories.

Author: alessio.soldano(a)jboss.com Date: 2012-03-14 10:09:33 -0400 (Wed, 14 Mar 2012) New Revision: 15939 Added: stack/cxf/branches/jbossws-cxf-4.0.x/etc/ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml Removed: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties Log: [JBPAPP-8454] JBossWS appclient and SOAP-over-JMS tests final cleanup Merged revisions 15900,15902-15903,15907,15913-15914,15916,15920 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15900 | alessio.soldano(a)jboss.com | 2012-03-08 13:14:52 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Refactoring / enhancing SOAP-over-JMS integration tests; test user setup (guest/pass w/ guest role) required ....... r15902 | alessio.soldano(a)jboss.com | 2012-03-08 17:28:47 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Adding test user properties, cleaning up testcases, adding hornetq dependencies (test scope) ....... r15903 | alessio.soldano(a)jboss.com | 2012-03-08 17:47:24 +0100 (Thu, 08 Mar 2012) | 2 lines [JBWS-3454] Restoring fixme for AS 7.0.x only (remote JNDI not supported there) and fixing 710 dependencies ....... r15907 | alessio.soldano(a)jboss.com | 2012-03-09 08:39:41 +0100 (Fri, 09 Mar 2012) | 2 lines [JBWS-3435] Move to jboss remote naming 1.0.2.Final ....... r15913 | ropalka | 2012-03-12 13:16:49 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3435] start only services that are really needed for WS tests ....... r15914 | ropalka | 2012-03-12 13:17:14 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3435] configure thread pool bounds to be minimalistic ....... r15916 | ropalka | 2012-03-12 15:02:21 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3452] do not log appclient boot messages to console ....... r15920 | ropalka | 2012-03-12 15:45:11 +0100 (Mon, 12 Mar 2012) | 1 line [JBWS-3451] use custom appclient-ws.xml config, do not override provided default one ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920 Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties =================================================================== --- stack/cxf/trunk/etc/application-roles.properties 2012-03-12 14:45:11 UTC (rev 15920) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -1 +0,0 @@ -kermit=guest Copied: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties (from rev 15920, stack/cxf/trunk/etc/application-roles.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-roles.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -0,0 +1 @@ +kermit=guest Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties =================================================================== --- stack/cxf/trunk/etc/application-users.properties 2012-03-12 14:45:11 UTC (rev 15920) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -1 +0,0 @@ -kermit=0491092837b7e5aef6f270a3b85f8336 Copied: stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties (from rev 15920, stack/cxf/trunk/etc/application-users.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/etc/application-users.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -0,0 +1 @@ +kermit=0491092837b7e5aef6f270a3b85f8336 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -129,17 +129,7 @@ </manifest> </war> - <!-- jaxws-jms-api-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.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> - </jar> - - <!-- jaxws-jms-only-deployment --> + <!-- 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"/> @@ -152,7 +142,7 @@ </manifest> </jar> - <!-- jaxws-jms-http-deployment --> + <!-- 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"> <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld*.class"/> @@ -166,7 +156,7 @@ </manifest> </war> - <!-- jaxws-jms-only-deployment-test-servlet --> + <!-- jaxws-cxf-jms-only-deployment-test-servlet --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment-test-servlet.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -181,7 +171,7 @@ </manifest> </war> - <!-- jaxws-jms-http-deployment-test-servlet --> + <!-- jaxws-cxf-jms-http-deployment-test-servlet --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -3,3 +3,5 @@ java.naming.provider.url=remote://@jboss.bind.address@:4448 jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -52,7 +52,8 @@ BusFactory.setThreadDefaultBus(bus); try { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + //HelloWorldServiceLocal service references local connection factory (for in-VM use) + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldServiceLocal"); Service service = Service.create(wsdlUrl, serviceName); //JMS test Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -26,7 +26,7 @@ @WebService ( portName = "HelloWorldImplPort", - serviceName = "HelloWorldService", + serviceName = "HelloWorldServiceLocal", wsdlLocation = "META-INF/wsdl/HelloWorldService.wsdl", endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms.HelloWorld", targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -25,10 +25,6 @@ import java.io.InputStreamReader; import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSCXFTestSetup; @@ -44,7 +40,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); + return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7.war"); } public void testServerSide() throws Exception @@ -54,26 +50,4 @@ assertEquals("true", br.readLine()); } - public void testClientSide() throws Exception - { - if (isTargetJBoss7()) { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); - return; - } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); - Object implementor = new HelloWorldImpl(); - Endpoint ep = Endpoint.publish("jms:queue:testQueue", implementor); - try - { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - - Service service = Service.create(wsdlUrl, serviceName); - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); - } - finally - { - ep.stop(); - } - } } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -24,14 +24,32 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; +import java.util.Properties; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueReceiver; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.naming.Context; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.jms.JMSConduit; +import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; /** * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) endpoint only @@ -41,6 +59,8 @@ */ public class JMSEndpointOnlyDeploymentTestCase extends JBossWSTest { + private static boolean waitForResponse; + public static Test suite() { return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCase.class, "jaxws-cxf-jms-only-deployment-test-servlet.war,jaxws-cxf-jms-only-deployment.jar"); @@ -55,16 +75,133 @@ public void testJMSEndpointClientSide() throws Exception { - if (isTargetJBoss7()) - { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); + if (isTargetJBoss70()) { + System.out.println("FIXME: can't lookup remote ConnectionFactory, remote JNDI binding not available yet on AS 7.0.x"); return; } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); + setupProxy(proxy); + try { + assertEquals("Hi", proxy.echo("Hi")); + } catch (Exception e) { + rethrowAndHandleAuthWarning(e); + } } + + public void testMessagingClient() throws Exception + { + if (isTargetJBoss70()) { + System.out.println("FIXME: can't lookup remote ConnectionFactory, remote JNDI binding not available yet on AS 7.0.x"); + return; + } + + String reqMessage = + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + + " <soap:Body>" + + " <ns2:echo xmlns:ns2=\"http://org.jboss.ws/jaxws/cxf/jms\">" + + " <arg0>Hi</arg0>" + + " </ns2:echo>" + + " </soap:Body>" + + "</soap:Envelope>"; + + String resMessage = + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + + " <soap:Body>" + + " <ns2:echoResponse xmlns:ns2=\"http://org.jboss.ws/jaxws/cxf/jms\">" + + " <return>Hi</return>" + + " </ns2:echoResponse>" + + " </soap:Body>" + + "</soap:Envelope>"; + + 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.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); + env.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); + InitialContext context = null; + try { + context = new InitialContext(env); + } catch (Exception e) { + rethrowAndHandleAuthWarning(e); + } + QueueConnectionFactory connectionFactory = (QueueConnectionFactory)context.lookup("jms/RemoteConnectionFactory"); + Queue reqQueue = (Queue)context.lookup("jms/queue/test"); + Queue resQueue = (Queue)context.lookup("jms/queue/test"); + + QueueConnection con = connectionFactory.createQueueConnection(JBossWSTestHelper.getTestUsername(), JBossWSTestHelper.getTestPassword()); + QueueSession session = con.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueReceiver receiver = session.createReceiver(resQueue); + ResponseListener responseListener = new ResponseListener(); + receiver.setMessageListener(responseListener); + con.start(); + + TextMessage message = session.createTextMessage(reqMessage); + message.setJMSReplyTo(resQueue); + message.setStringProperty("SOAPJMS_contentType", "text/xml"); + message.setStringProperty("SOAPJMS_requestURI", "jms:queue:testQueue"); + + waitForResponse = true; + + QueueSender sender = session.createSender(reqQueue); + sender.send(message); + sender.close(); + + int timeout = 30000; + while (waitForResponse && timeout > 0) + { + Thread.sleep(100); + timeout -= 100; + } + + assertNotNull("Expected response message", responseListener.resMessage); + assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + + sender.close(); + receiver.close(); + con.stop(); + session.close(); + con.close(); + } + + public static class ResponseListener implements MessageListener + { + public String resMessage; + + public void onMessage(Message msg) + { + TextMessage textMessage = (TextMessage)msg; + try + { + resMessage = textMessage.getText(); + waitForResponse = false; + } + catch (Throwable t) + { + t.printStackTrace(); + } + } + } + + private void setupProxy(HelloWorld proxy) { + JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); + JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); + jndiConfig.setConnectionUserName(JBossWSTestHelper.getTestUsername()); + jndiConfig.setConnectionPassword(JBossWSTestHelper.getTestPassword()); + Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + props.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); + props.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); + } + + private static void rethrowAndHandleAuthWarning(Exception e) throws Exception { + final String msg = "Authentication failed"; + if (e.getMessage().contains(msg) || e.getCause().getMessage().contains(msg)) { + System.out.println("This test requires an user with 'guest' role to be available on the application server; " + + "please ensure that then specify user and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); + } + throw e; + } } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -56,7 +56,8 @@ Endpoint ep = Endpoint.publish("jms:queue:testQueue", implementor); try { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + //use HelloWorldServiceLocal service which has local connection factory references (we're running on the same JVM here) + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldServiceLocal"); Service service = Service.create(wsdlUrl, serviceName); HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -52,11 +52,12 @@ BusFactory.setThreadDefaultBus(bus); try { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - Service service = Service.create(wsdlUrl, serviceName); + Service service = Service.create(wsdlUrl, new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService")); + //HelloWorldServiceLocal service references local connection factory (for in-VM use) + Service serviceLocal = Service.create(wsdlUrl, new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldServiceLocal")); //JMS test - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); + HelloWorld proxy = (HelloWorld) serviceLocal.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); result = "Hi".equals(proxy.echo("Hi")); //HTTP test HelloWorld httpProxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -26,7 +26,7 @@ @WebService ( portName = "HelloWorldImplPort", - serviceName = "HelloWorldService", + serviceName = "HelloWorldServiceLocal", wsdlLocation = "WEB-INF/wsdl/HelloWorldService.wsdl", endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms_http.HelloWorld", targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2012-03-14 14:09:33 UTC (rev 15939) @@ -24,14 +24,21 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; +import java.util.Properties; +import javax.naming.Context; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.jms.JMSConduit; +import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.jboss.test.ws.jaxws.cxf.jms.HelloWorld; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; /** * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) and a HTTP endpoints @@ -55,17 +62,26 @@ public void testJMSEndpointClientSide() throws Exception { - if (isTargetJBoss7()) - { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); + if (isTargetJBoss70()) { + System.out.println("FIXME: can't lookup remote ConnectionFactory, remote JNDI binding not available yet on AS 7.0.x"); return; } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + + URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); + setupProxy(proxy); + try { + assertEquals("Hi", proxy.echo("Hi")); + } catch (Exception e) { + if (e.getMessage().contains("Authentication failed")) { + System.out.println("This test requires an user with 'guest' role to be available on the application server; " + + "please ensure that then specify user and password using -Dtest.username=\"foo\" -Dtest.password=\"bar\"."); + } + throw e; + } } public void testHTTPEndpointClientSide() throws Exception @@ -77,4 +93,14 @@ HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); assertEquals("(http) Hi", proxy.echo("Hi")); } + + private void setupProxy(HelloWorld proxy) { + JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); + JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); + jndiConfig.setConnectionUserName(JBossWSTestHelper.getTestUsername()); + jndiConfig.setConnectionPassword(JBossWSTestHelper.getTestPassword()); + Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + props.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); + props.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); + } } Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-14 14:09:33 UTC (rev 15939) @@ -63,6 +63,17 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="HelloWorldService"> + <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> + <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> + <soapjms:jndiURL>remote://localhost:4447</soapjms:jndiURL> + <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> + <soap:address location="jms:queue:testQueue"/> + </wsdl:port> + <wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort"> + <soap:address location="http://host:port"/><!-- will be rewritten at deploy time --> + </wsdl:port> + </wsdl:service> + <wsdl:service name="HelloWorldServiceLocal"> <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-14 14:09:33 UTC (rev 15939) @@ -63,7 +63,9 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="HelloWorldService"> - <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> + <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> + <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> + <soapjms:jndiURL>remote://localhost:4447</soapjms:jndiURL> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> </wsdl:port> @@ -71,4 +73,10 @@ <soap:address location="http://localhost:8080/jaxws-cxf-jms-http-deployment"/> </wsdl:port> </wsdl:service> + <wsdl:service name="HelloWorldServiceLocal"> + <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> + <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> + <soap:address location="jms:queue:testQueue"/> + </wsdl:port> + </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -3,3 +3,5 @@ java.naming.provider.url=remote://@jboss.bind.address@:4448 jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -27,6 +27,7 @@ <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> <org.slf4j.version>1.6.1</org.slf4j.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> + <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> </properties> <!-- Modules --> @@ -283,9 +284,13 @@ </property> <property> <name>log4j.output.dir</name> - <value>${project.build.directory}</value> + <value>${log4j.output.dir}</value> </property> <property> + <name>appclient.output.dir</name> + <value>${appclient.output.dir}</value> + </property> + <property> <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> <value>${project.build.directory}/test-classes/jbossws-users.properties</value> </property> @@ -330,6 +335,14 @@ <value>${test.resources.directory}</value> </property> <property> + <name>test.username</name> + <value>${test.username}</value> + </property> + <property> + <name>test.password</name> + <value>${test.password}</value> + </property> + <property> <name>wsdl.publish.location</name> <value>${wsdl.publish.location}</value> </property> @@ -1036,6 +1049,18 @@ <version>3.2.1.GA</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -1156,7 +1181,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> - <version>1.0.1.Final</version> + <version>1.0.2.Final</version> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -1260,6 +1285,18 @@ <version>3.2.2.GA</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.11.Final</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -141,8 +141,8 @@ <configuration> <tasks> <copy - file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" + tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" failonerror="false" verbose="true" overwrite="true" Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2012-03-14 14:09:33 UTC (rev 15939) @@ -3,3 +3,5 @@ java.naming.provider.url=remote://@jboss.bind.address@:4448 jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 +jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml (from rev 15920, stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -0,0 +1,115 @@ +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<server xmlns="urn:jboss:domain:1.2"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> + <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup --> + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server> Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-14 13:53:43 UTC (rev 15938) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-14 14:09:33 UTC (rev 15939) @@ -1,168 +0,0 @@ -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<server xmlns="urn:jboss:domain:1.2"> - - <extensions> - <extension module="org.jboss.as.connector"/> - <extension module="org.jboss.as.ee"/> - <extension module="org.jboss.as.ejb3"/> - <extension module="org.jboss.as.jacorb"/> - <extension module="org.jboss.as.jaxr"/> - <extension module="org.jboss.as.jpa"/> - <extension module="org.jboss.as.logging"/> - <extension module="org.jboss.as.naming"/> - <extension module="org.jboss.as.remoting"/> - <extension module="org.jboss.as.security"/> - <extension module="org.jboss.as.transactions"/> - <extension module="org.jboss.as.webservices"/> - </extensions> - - <profile> - <subsystem xmlns="urn:jboss:domain:logging:1.1"> - <console-handler name="CONSOLE"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - </console-handler> - - <periodic-rotating-file-handler name="FILE"> - <level name="INFO"/> - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> - </formatter> - <file relative-to="jboss.server.log.dir" path="appclient.log"/> - <suffix value=".yyyy-MM-dd"/> - <append value="true"/> - </periodic-rotating-file-handler> - - <logger category="com.arjuna"> - <level name="WARN"/> - </logger> - <logger category="sun.rmi"> - <level name="WARN"/> - </logger> - <logger category="jacorb"> - <level name="WARN"/> - </logger> - <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup --> - <logger category="jacorb.config"> - <level name="ERROR"/> - </logger> - - <root-logger> - <level name="INFO"/> - <handlers> - <handler name="CONSOLE"/> - <handler name="FILE"/> - </handlers> - </root-logger> - </subsystem> - <subsystem xmlns="urn:jboss:domain:datasources:1.0"> - <datasources> - <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="false" use-java-context="true" - pool-name="java:jboss/datasources/ExampleDS"> - <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> - <driver>h2</driver> - <pool></pool> - <security> - <user-name>sa</user-name> - <password>sa</password> - </security> - </datasource> - <drivers> - <driver name="h2" module="com.h2database.h2"> - <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> - </driver> - </drivers> - </datasources> - </subsystem> - <subsystem xmlns="urn:jboss:domain:ee:1.0"/> - <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> - <subsystem xmlns="urn:jboss:domain:jacorb:1.0"> - <orb name="JBoss" print-version="off" giop-minor-version="2"> - <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/> - <naming root-context="JBoss/Naming/root" export-corbaloc="on"/> - </orb> - <poa monitoring="off" queue-wait="off"> - <request-processors pool-size="2" max-threads="8"/> - </poa> - <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jpa:1.0"> - <jpa default-datasource=""/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:naming:1.0"/> - <subsystem xmlns="urn:jboss:domain:security:1.0"> - <security-domains> - <security-domain name="other" cache-type="default"> - <authentication> - <login-module code="UsersRoles" flag="required"/> - </authentication> - </security-domain> - <security-domain name="jboss-web-policy" cache-type="default"> - <authorization> - <policy-module code="Delegating" flag="required"/> - </authorization> - </security-domain> - <security-domain name="jboss-ejb-policy" cache-type="default"> - <authorization> - <policy-module code="Delegating" flag="required"/> - </authorization> - </security-domain> - </security-domains> - </subsystem> - <subsystem xmlns="urn:jboss:domain:jaxr:1.0"> - <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/> - <juddi-server publish-url="http://localhost:8080/juddi/publish" query-url="http://localhost:8080/juddi/query"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:remoting:1.1"> - <connector name="remoting-connector" socket-binding="remoting"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:transactions:1.0"> - <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> - <core-environment> - <process-id> - <uuid/> - </process-id> - </core-environment> - <coordinator-environment default-timeout="300"/> - </subsystem> - <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> - </profile> - - <interfaces> - <interface name="public"> - <inet-address value="${jboss.bind.address:127.0.0.1}"/> - </interface> - </interfaces> - - <socket-binding-group name="standard-sockets" default-interface="public"> - <socket-binding name="jacorb" port="13528"/> - <socket-binding name="jacorb-ssl" port="13529"/> - <socket-binding name="remoting" port="4448"/> - <socket-binding name="txn-recovery-environment" port="14712"/> - <socket-binding name="txn-status-manager" port="14713"/> - </socket-binding-group> - -</server>