Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 79887 invoked from network); 30 Jul 2007 09:15:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jul 2007 09:15:16 -0000 Received: (qmail 1669 invoked by uid 500); 30 Jul 2007 09:15:16 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 1610 invoked by uid 500); 30 Jul 2007 09:15:15 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 1601 invoked by uid 99); 30 Jul 2007 09:15:15 -0000 Received: from Unknown (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2007 02:15:15 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2007 09:15:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6A26C1A981A; Mon, 30 Jul 2007 02:14:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r560897 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ systests/src/test/java/org/apache/cxf/systest/jms/ Date: Mon, 30 Jul 2007 09:14:47 -0000 To: cxf-commits@incubator.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070730091449.6A26C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Jul 30 02:14:38 2007 New Revision: 560897 URL: http://svn.apache.org/viewvc?view=rev&rev=560897 Log: Fixed not support wsdlLocation attribute. Added unit test and jms systest for it. Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml (with props) Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?view=diff&rev=560897&r1=560896&r2=560897 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java Mon Jul 30 02:14:38 2007 @@ -37,6 +37,7 @@ import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.jaxws.EndpointImpl; +import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.jaxws.JaxWsServerFactoryBean; import org.apache.cxf.jaxws.service.Hello; import org.apache.hello_world_soap_http.Greeter; @@ -217,5 +218,12 @@ assertTrue(logging); assertTrue(client.getEndpoint().getService().getDataBinding() instanceof SourceDataBinding); + + JaxWsProxyFactoryBean factory = (JaxWsProxyFactoryBean)ctx.getBean("wsdlLocation.proxyFactory"); + assertNotNull(factory); + String wsdlLocation = factory.getWsdlLocation(); + assertEquals("We should get the right wsdl location" , wsdlLocation, "wsdl/hello_world.wsdl"); + + } } Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml?view=diff&rev=560897&r1=560896&r2=560897 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml Mon Jul 30 02:14:38 2007 @@ -60,37 +60,13 @@ - - Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?view=diff&rev=560897&r1=560896&r2=560897 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Mon Jul 30 02:14:38 2007 @@ -149,6 +149,14 @@ public void setUsername(String username) { this.username = username; } + + public String getWsdlLocation() { + return getWsdlURL(); + } + + public void setWsdlLocation(String wsdlURL) { + setWsdlURL(wsdlURL); + } public String getWsdlURL() { return clientFactoryBean.getServiceFactory().getWsdlURL(); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?view=diff&rev=560897&r1=560896&r2=560897 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Mon Jul 30 02:14:38 2007 @@ -28,6 +28,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; + import org.apache.cxf.hello_world_jms.BadRecordLitFault; import org.apache.cxf.hello_world_jms.HelloWorldOneWayPort; import org.apache.cxf.hello_world_jms.HelloWorldOneWayQueueService; @@ -46,6 +47,8 @@ import org.junit.Before; import org.junit.Test; +import org.springframework.context.support.ClassPathXmlApplicationContext; + public class JMSClientServerTest extends AbstractBusClientServerTestBase { protected static boolean serversStarted; @@ -185,6 +188,58 @@ } catch (UndeclaredThrowableException ex) { throw (Exception)ex.getCause(); } + } + + @Test + public void testConnectionsWithinSpring() throws Exception { + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext( + new String[] {"/org/apache/cxf/systest/jms/JMSClients.xml"}); + + HelloWorldPortType greeter = (HelloWorldPortType)ctx.getBean("jmsRPCClient"); + assertNotNull(greeter); + + String response1 = new String("Hello Milestone-"); + String response2 = new String("Bonjour"); + try { + + for (int idx = 0; idx < 5; idx++) { + String greeting = greeter.greetMe("Milestone-" + idx); + assertNotNull("no response received from service", greeting); + String exResponse = response1 + idx; + assertEquals(exResponse, greeting); + + String reply = greeter.sayHi(); + assertNotNull("no response received from service", reply); + assertEquals(response2, reply); + + try { + greeter.testRpcLitFault("BadRecordLitFault"); + fail("Should have thrown BadRecoedLitFault"); + } catch (BadRecordLitFault ex) { + assertNotNull(ex.getFaultInfo()); + } + + try { + greeter.testRpcLitFault("NoSuchCodeLitFault"); + fail("Should have thrown NoSuchCodeLitFault exception"); + } catch (NoSuchCodeLitFault nslf) { + assertNotNull(nslf.getFaultInfo()); + assertNotNull(nslf.getFaultInfo().getCode()); + } + } + } catch (UndeclaredThrowableException ex) { + throw (Exception)ex.getCause(); + } + + HelloWorldOneWayPort greeter1 = (HelloWorldOneWayPort)ctx.getBean("jmsQueueOneWayServiceClient"); + assertNotNull(greeter1); + try { + greeter1.greetMeOneWay("hello"); + } catch (Exception ex) { + fail("There should not throw the exception" + ex); + } + } @Test Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml?view=auto&rev=560897 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml (added) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml Mon Jul 30 02:14:38 2007 @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClients.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml