March 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15900 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jms and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-08 07:14:52 -0500 (Thu, 08 Mar 2012) New Revision: 15900 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/DeploymentTestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl Log: [JBWS-3454] Refactoring / enhancing SOAP-over-JMS integration tests; test user setup (guest/pass w/ guest role) required 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 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-03-08 12:14:52 UTC (rev 15900) @@ -129,17 +129,7 @@ </manifest> </war> -  - <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> - -  +  <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> -  +  <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> -  +  <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> -  +  <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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -24,12 +24,29 @@ 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; @@ -41,6 +58,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 +74,108 @@ public void testJMSEndpointClientSide() 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"); + 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); + setupProxy(proxy); assertEquals("Hi", proxy.echo("Hi")); } + + public void testMessagingClient() throws Exception + { + 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, "guest"); + env.put(Context.SECURITY_CREDENTIALS, "pass"); + InitialContext context = new InitialContext(env); + 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("guest", "pass"); + 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) { + final String user = "guest"; + final String pwd = "pass"; + JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); + JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); + jndiConfig.setConnectionUserName(user); + jndiConfig.setConnectionPassword(pwd); + Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + props.put(Context.SECURITY_PRINCIPAL, user); + props.put(Context.SECURITY_CREDENTIALS, pwd); + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -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/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2012-03-08 12:14:52 UTC (rev 15900) @@ -24,12 +24,18 @@ 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; @@ -55,16 +61,12 @@ public void testJMSEndpointClientSide() 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"); + 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); + setupProxy(proxy); assertEquals("Hi", proxy.echo("Hi")); } @@ -77,4 +79,16 @@ 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) { + final String user = "guest"; + final String pwd = "pass"; + JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); + JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); + jndiConfig.setConnectionUserName(user); + jndiConfig.setConnectionPassword(pwd); + Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + props.put(Context.SECURITY_PRINCIPAL, user); + props.put(Context.SECURITY_CREDENTIALS, pwd); + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2012-03-08 12:14:52 UTC (rev 15900) @@ -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"/> + </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/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 2012-03-08 11:04:08 UTC (rev 15899) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2012-03-08 12:14:52 UTC (rev 15900) @@ -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

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15899 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: transport and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-08 06:04:08 -0500 (Thu, 08 Mar 2012) New Revision: 15899 Removed: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java Log: [JBWS-3454] Rollbacking previous commit (svn merge -r 15989:15897) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-03-08 09:00:57 UTC (rev 15898) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-03-08 11:04:08 UTC (rev 15899) @@ -37,8 +37,6 @@ import org.jboss.ws.common.Constants; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer; -import org.jboss.wsf.stack.cxf.client.util.SpringUtils; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; @@ -54,7 +52,6 @@ public abstract class BusHolder { public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url"; - private static boolean springAvailable = SpringUtils.isSpringAvailable(BusHolder.class.getClassLoader()); protected Bus bus; protected BusHolderLifeCycleListener busHolderListener; @@ -150,19 +147,6 @@ dfm.registerDestinationFactory(Constants.NS_SOAP12, factory); } } - - /** - * Create a new instance of server side BeanCustomizer, the actual type depending on - * Spring being available in the BusHolder defining classloader; please note that given - * both CXF and JBWS prefer non-Spring Bus factories when Spring is not actually needed - * (even if available), the choice of the BeanCustomizer to use is unrelated to the - * current BusHolder type. - * - * @return a ServerBeanCustomizer instance - */ - protected static ServerBeanCustomizer createBeanCustomizer() { - return !springAvailable ? new ServerBeanCustomizer() : new SpringServerBeanCustomizer(); - } /** * Return the hold bus Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-03-08 09:00:57 UTC (rev 15898) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-03-08 11:04:08 UTC (rev 15899) @@ -179,7 +179,7 @@ public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, List<Endpoint> depEndpoints, UnifiedVirtualFile root) { - ServerBeanCustomizer customizer = createBeanCustomizer(); + ServerBeanCustomizer customizer = new ServerBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-03-08 09:00:57 UTC (rev 15898) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-03-08 11:04:08 UTC (rev 15899) @@ -65,7 +65,7 @@ { configureEndpoint((EndpointImpl) beanInstance); } - else if (beanInstance instanceof ServerFactoryBean) + if (beanInstance instanceof ServerFactoryBean) { ServerFactoryBean factory = (ServerFactoryBean) beanInstance; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-03-08 09:00:57 UTC (rev 15898) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-03-08 11:04:08 UTC (rev 15899) @@ -160,7 +160,7 @@ List<Endpoint> depEndpoints, UnifiedVirtualFile root) { ApplicationContext ctx = bus.getExtension(BusApplicationContext.class); - ServerBeanCustomizer customizer = createBeanCustomizer(); + ServerBeanCustomizer customizer = new ServerBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java 2012-03-08 09:00:57 UTC (rev 15898) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java 2012-03-08 11:04:08 UTC (rev 15899) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * 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. - * - * 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. - */ -package org.jboss.wsf.stack.cxf.configuration; - -import org.apache.cxf.transport.jms.JMSOldConfigHolder; -import org.jboss.wsf.stack.cxf.transport.JBossJMSConfiguration; - -/** - * A Spring-aware version of the server side customizer - * - * @author alessio.soldano(a)jboss.com - * @since 08-Mar-2012 - */ -public class SpringServerBeanCustomizer extends ServerBeanCustomizer -{ - @Override - public void customize(Object beanInstance) - { - if (beanInstance instanceof JMSOldConfigHolder) - { - JMSOldConfigHolder jmsConfHolder = (JMSOldConfigHolder)beanInstance; - jmsConfHolder.setJmsConfig(new JBossJMSConfiguration()); - } - super.customize(beanInstance); - } -} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java 2012-03-08 09:00:57 UTC (rev 15898) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java 2012-03-08 11:04:08 UTC (rev 15899) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * 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. - * - * 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. - */ -package org.jboss.wsf.stack.cxf.transport; - -import java.util.Properties; - -import org.apache.cxf.transport.jms.JMSConfiguration; -import org.apache.cxf.transport.jms.JNDIConfiguration; -import org.springframework.jndi.JndiTemplate; - -/** - * A JBoss AS version of Apache CXF JMSConfiguration - * - * @see org.apache.cxf.binding.soap.SoapTransportFactory.SoapEndpointInfo - * - * @author alessio.soldano(a)jboss.com - * @since 07-Mar-2012 - * - */ -public class JBossJMSConfiguration extends JMSConfiguration -{ - @Override - public void setJndiTemplate(JndiTemplate jndiTemplate) - { - //erase props to have correct JBoss AS server side jndi lookup - jndiTemplate.setEnvironment(new Properties()); - super.setJndiTemplate(jndiTemplate); - } - - @Override - public void setJndiConfig(JNDIConfiguration jndiConfig) - { - //erase props and set correct connection factory for JBoss AS server side connection lookup - jndiConfig.setEnvironment(new Properties()); - jndiConfig.setConnectionPassword(null); - jndiConfig.setConnectionUserName(null); - jndiConfig.setJndiConnectionFactoryName("java:/ConnectionFactory"); - super.setJndiConfig(jndiConfig); - } - -}

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15898 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: transport and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-08 04:00:57 -0500 (Thu, 08 Mar 2012) New Revision: 15898 Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java Log: [JBWS-3454] Adding Spring-aware ServerBeanCustomizer and providing initial server side JMSConfiguration customization Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-03-07 08:15:26 UTC (rev 15897) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-03-08 09:00:57 UTC (rev 15898) @@ -37,6 +37,8 @@ import org.jboss.ws.common.Constants; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer; +import org.jboss.wsf.stack.cxf.client.util.SpringUtils; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; @@ -52,6 +54,7 @@ public abstract class BusHolder { public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url"; + private static boolean springAvailable = SpringUtils.isSpringAvailable(BusHolder.class.getClassLoader()); protected Bus bus; protected BusHolderLifeCycleListener busHolderListener; @@ -147,6 +150,19 @@ dfm.registerDestinationFactory(Constants.NS_SOAP12, factory); } } + + /** + * Create a new instance of server side BeanCustomizer, the actual type depending on + * Spring being available in the BusHolder defining classloader; please note that given + * both CXF and JBWS prefer non-Spring Bus factories when Spring is not actually needed + * (even if available), the choice of the BeanCustomizer to use is unrelated to the + * current BusHolder type. + * + * @return a ServerBeanCustomizer instance + */ + protected static ServerBeanCustomizer createBeanCustomizer() { + return !springAvailable ? new ServerBeanCustomizer() : new SpringServerBeanCustomizer(); + } /** * Return the hold bus Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-03-07 08:15:26 UTC (rev 15897) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-03-08 09:00:57 UTC (rev 15898) @@ -179,7 +179,7 @@ public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, List<Endpoint> depEndpoints, UnifiedVirtualFile root) { - ServerBeanCustomizer customizer = new ServerBeanCustomizer(); + ServerBeanCustomizer customizer = createBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-03-07 08:15:26 UTC (rev 15897) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-03-08 09:00:57 UTC (rev 15898) @@ -65,7 +65,7 @@ { configureEndpoint((EndpointImpl) beanInstance); } - if (beanInstance instanceof ServerFactoryBean) + else if (beanInstance instanceof ServerFactoryBean) { ServerFactoryBean factory = (ServerFactoryBean) beanInstance; Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-03-07 08:15:26 UTC (rev 15897) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-03-08 09:00:57 UTC (rev 15898) @@ -160,7 +160,7 @@ List<Endpoint> depEndpoints, UnifiedVirtualFile root) { ApplicationContext ctx = bus.getExtension(BusApplicationContext.class); - ServerBeanCustomizer customizer = new ServerBeanCustomizer(); + ServerBeanCustomizer customizer = createBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringServerBeanCustomizer.java 2012-03-08 09:00:57 UTC (rev 15898) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * 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. + * + * 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. + */ +package org.jboss.wsf.stack.cxf.configuration; + +import org.apache.cxf.transport.jms.JMSOldConfigHolder; +import org.jboss.wsf.stack.cxf.transport.JBossJMSConfiguration; + +/** + * A Spring-aware version of the server side customizer + * + * @author alessio.soldano(a)jboss.com + * @since 08-Mar-2012 + */ +public class SpringServerBeanCustomizer extends ServerBeanCustomizer +{ + @Override + public void customize(Object beanInstance) + { + if (beanInstance instanceof JMSOldConfigHolder) + { + JMSOldConfigHolder jmsConfHolder = (JMSOldConfigHolder)beanInstance; + jmsConfHolder.setJmsConfig(new JBossJMSConfiguration()); + } + super.customize(beanInstance); + } +} Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/JBossJMSConfiguration.java 2012-03-08 09:00:57 UTC (rev 15898) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * 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. + * + * 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. + */ +package org.jboss.wsf.stack.cxf.transport; + +import java.util.Properties; + +import org.apache.cxf.transport.jms.JMSConfiguration; +import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.springframework.jndi.JndiTemplate; + +/** + * A JBoss AS version of Apache CXF JMSConfiguration + * + * @see org.apache.cxf.binding.soap.SoapTransportFactory.SoapEndpointInfo + * + * @author alessio.soldano(a)jboss.com + * @since 07-Mar-2012 + * + */ +public class JBossJMSConfiguration extends JMSConfiguration +{ + @Override + public void setJndiTemplate(JndiTemplate jndiTemplate) + { + //erase props to have correct JBoss AS server side jndi lookup + jndiTemplate.setEnvironment(new Properties()); + super.setJndiTemplate(jndiTemplate); + } + + @Override + public void setJndiConfig(JNDIConfiguration jndiConfig) + { + //erase props and set correct connection factory for JBoss AS server side connection lookup + jndiConfig.setEnvironment(new Properties()); + jndiConfig.setConnectionPassword(null); + jndiConfig.setConnectionUserName(null); + jndiConfig.setJndiConnectionFactoryName("java:/ConnectionFactory"); + super.setJndiConfig(jndiConfig); + } + +}

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15897 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 03:15:26 -0500 (Wed, 07 Mar 2012) New Revision: 15897 Removed: stack/cxf/branches/jbossws-cxf-4.0.x/etc/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss710/ Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15837,15841,15857,15879,15881,15886,15888,15896 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15837 | ropalka | 2012-03-05 09:20:51 +0100 (Mon, 05 Mar 2012) | 1 line sync. with AS7 upstream ....... r15841 | ropalka | 2012-03-05 09:46:33 +0100 (Mon, 05 Mar 2012) | 1 line sync. appclient config with AS7 upstream + remove support for AS 710 Final ....... r15857 | alessio.soldano(a)jboss.com | 2012-03-05 11:01:33 +0100 (Mon, 05 Mar 2012) | 2 lines Moving to new jbossws component snapshots ....... r15879 | alessio.soldano(a)jboss.com | 2012-03-06 14:29:47 +0100 (Tue, 06 Mar 2012) | 2 lines [JBWS-3390] Synch with AS 7.1.x ....... r15881 | alessio.soldano(a)jboss.com | 2012-03-06 14:50:02 +0100 (Tue, 06 Mar 2012) | 2 lines Synch with AS7.1.1 ....... r15886 | alessio.soldano(a)jboss.com | 2012-03-06 15:34:54 +0100 (Tue, 06 Mar 2012) | 2 lines Removing default mgmt-user.properties ....... r15888 | alessio.soldano(a)jboss.com | 2012-03-06 16:48:09 +0100 (Tue, 06 Mar 2012) | 2 lines Removing static member which is not used and quite misleading ....... r15896 | ropalka | 2012-03-07 09:06:11 +0100 (Wed, 07 Mar 2012) | 1 line [JBWS-3435] use exact remote naming version we wanna use ....... 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,15859,15866 + /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-15888,15896 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2012-03-07 08:06:11 UTC (rev 15896) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2012-03-07 08:15:26 UTC (rev 15897) @@ -30,13 +30,6 @@ */ public class SpringUtils { - public static final boolean SPRING_AVAILABLE; - static - { - SPRING_AVAILABLE = - isSpringAvailable(SpringUtils.class.getClassLoader(), - SecurityActions.getContextClassLoader()); - } /** * Check if Spring is available using the provided classloader * Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-03-07 08:06:11 UTC (rev 15896) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-03-07 08:15:26 UTC (rev 15897) @@ -46,6 +46,7 @@ <module name="org.apache.commons.lang" /> <module name="org.apache.neethi" /> <module name="org.apache.velocity" /> + <module name="org.apache.xml-resolver" /> <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> 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-07 08:06:11 UTC (rev 15896) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-03-07 08:15:26 UTC (rev 15897) @@ -1147,16 +1147,25 @@ <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.3.Final</version> + <version>1.0.4.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> @@ -1286,7 +1295,7 @@  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>  - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.1.GA.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> </additionalClasspathElements> Modified: 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-07 08:06:11 UTC (rev 15896) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-07 08:15:26 UTC (rev 15897) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<server xmlns="urn:jboss:domain:1.1"> +<server xmlns="urn:jboss:domain:1.2"> <extensions> <extension module="org.jboss.as.connector"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-07 08:06:11 UTC (rev 15896) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-07 08:15:26 UTC (rev 15897) @@ -60,13 +60,13 @@  <properties> <jbossws.api.version>1.0.0.GA</jbossws.api.version> - <jbossws.spi.version>2.0.3-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version> - <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> + <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> - <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version> + <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> @@ -82,7 +82,7 @@ <jboss.security.sx.version>2.0.4</jboss.security.sx.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> <picketbox.version>4.0.6.Beta1</picketbox.version> - <jaxws-jboss-httpserver-httpspi.version>1.0.1-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> + <jaxws-jboss-httpserver-httpspi.version>1.0.2-SNAPSHOT</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxb.impl.version>2.2.4</jaxb.impl.version>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15896 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 03:06:11 -0500 (Wed, 07 Mar 2012) New Revision: 15896 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3435] use exact remote naming version we wanna use Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-07 07:59:43 UTC (rev 15895) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-07 08:06:11 UTC (rev 15896) @@ -1141,9 +1141,18 @@ <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15895 - stack/native/branches/jbossws-native-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 02:59:43 -0500 (Wed, 07 Mar 2012) New Revision: 15895 Removed: stack/native/branches/jbossws-native-4.0.x/etc/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/pom.xml Log: Merged revisions 15858,15887 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15858 | alessio.soldano(a)jboss.com | 2012-03-05 11:04:26 +0100 (Mon, 05 Mar 2012) | 2 lines Moving to new jbossws component snapshots ....... r15887 | alessio.soldano(a)jboss.com | 2012-03-06 15:35:27 +0100 (Tue, 06 Mar 2012) | 2 lines Removing default mgmt-user.properties ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15861,15871,15873,15880-15883,15890-15891 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891 Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-07 07:43:16 UTC (rev 15894) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-07 07:59:43 UTC (rev 15895) @@ -59,13 +59,13 @@  <properties> <jbossws.api.version>1.0.1-SNAPSHOT</jbossws.api.version> - <jbossws.spi.version>2.0.3-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.0.2-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version> - <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> + <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> - <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version> + <jbossws.jboss710.version>4.0.3-SNAPSHOT</jbossws.jboss710.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15894 - stack/native/branches/jbossws-native-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 02:43:16 -0500 (Wed, 07 Mar 2012) New Revision: 15894 Modified: stack/native/branches/jbossws-native-4.0.x/ Log: blocking revision 15877 Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652 + https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15893 - stack/native/branches/jbossws-native-4.0.x/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 02:41:14 -0500 (Wed, 07 Mar 2012) New Revision: 15893 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: updating excludes Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-07 07:38:35 UTC (rev 15892) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-07 07:41:14 UTC (rev 15893) @@ -1173,22 +1173,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> - -  <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase*</exclude> @@ -1253,6 +1237,19 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes> </configuration>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15892 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 02:38:35 -0500 (Wed, 07 Mar 2012) New Revision: 15892 Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss710/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml Log: Merged revisions 15836,15840,15873,15880,15883,15890-15891 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15836 | ropalka | 2012-03-05 09:19:33 +0100 (Mon, 05 Mar 2012) | 1 line sync. with AS7 upstream ....... r15840 | ropalka | 2012-03-05 09:45:38 +0100 (Mon, 05 Mar 2012) | 1 line sync. appclient config with AS7 upstream + remove support for AS 710 Final ....... r15873 | ropalka | 2012-03-05 14:56:08 +0100 (Mon, 05 Mar 2012) | 1 line [JBWS-3435] don't call Exit in killer ....... r15880 | ropalka | 2012-03-06 14:32:44 +0100 (Tue, 06 Mar 2012) | 1 line [JBWS-3444] fix typo ....... r15883 | ropalka | 2012-03-06 14:52:29 +0100 (Tue, 06 Mar 2012) | 1 line [JBWS-3435] speed up appclient tests ....... r15890 | ropalka | 2012-03-07 07:32:58 +0100 (Wed, 07 Mar 2012) | 1 line [JBWS-3444] fix context leak ....... r15891 | ropalka | 2012-03-07 08:21:34 +0100 (Wed, 07 Mar 2012) | 1 line [JBWS-3435] use exact remote naming version we wanna use ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15861,15871 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15861,15871,15873,15880-15883,15890-15891 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-07 07:38:35 UTC (rev 15892) @@ -46,6 +46,7 @@ break; } } + System.out.println("forcibly stopped in AppclientKiller"); System.exit(1); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-07 07:38:35 UTC (rev 15892) @@ -82,7 +82,6 @@ public void testRoleSecuredServiceAccess() throws Exception { - iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -123,7 +122,6 @@ public void testBasicSecuredServiceAccess() throws Exception { - iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -156,7 +154,6 @@ public void testConfidentialServiceAccess() throws Exception { - iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-07 07:38:35 UTC (rev 15892) @@ -52,7 +52,7 @@ { return new JBossWSTestSetup(AddressingReplyToTestCase.class, "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," + - "jaxrpc-samples-wsaddr-hello-appclient.jar#jaxrpc-samples-wsaddr-hello-appclient.jar"); + "jaxrpc-samples-wsaddr-hello-appclient.ear#jaxrpc-samples-wsaddr-hello-appclient.jar"); } protected void setUp() throws Exception Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-07 07:38:35 UTC (rev 15892) @@ -1056,16 +1056,25 @@ <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.3.Final</version> + <version>1.0.4.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-07 07:38:35 UTC (rev 15892) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<server xmlns="urn:jboss:domain:1.1"> +<server xmlns="urn:jboss:domain:1.2"> <extensions> <extension module="org.jboss.as.connector"/>

14 years, 1 month

1
0
0 / 0

JBossWS SVN: r15891 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-07 02:21:34 -0500 (Wed, 07 Mar 2012) New Revision: 15891 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3435] use exact remote naming version we wanna use Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-07 06:32:58 UTC (rev 15890) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-07 07:21:34 UTC (rev 15891) @@ -1056,9 +1056,18 @@ <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency>

14 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012