Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 74303 invoked from network); 24 Jul 2009 14:27:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jul 2009 14:27:59 -0000 Received: (qmail 8953 invoked by uid 500); 24 Jul 2009 14:29:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8794 invoked by uid 500); 24 Jul 2009 14:29:02 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 8716 invoked by uid 99); 24 Jul 2009 14:28:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2009 14:28:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2009 14:28:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B9FF92388877; Fri, 24 Jul 2009 14:28:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r797483 - in /cxf/branches/2.1.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Date: Fri, 24 Jul 2009 14:28:30 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090724142830.B9FF92388877@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jul 24 14:28:30 2009 New Revision: 797483 URL: http://svn.apache.org/viewvc?rev=797483&view=rev Log: Merged revisions 797463 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r797463 | dkulp | 2009-07-24 10:02:28 -0400 (Fri, 24 Jul 2009) | 10 lines Merged revisions 797233 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r797233 | dkulp | 2009-07-23 17:34:00 -0400 (Thu, 23 Jul 2009) | 2 lines Fix some issues that could cause the JMS tests to hang instead of error out by adding some timeouts. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 24 14:28:30 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797232 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=797483&r1=797482&r2=797483&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Fri Jul 24 14:28:30 2009 @@ -543,6 +543,8 @@ return exchange.getInFaultMessage().getContent(Exception.class); } else if (exchange.getOutFaultMessage() != null) { return exchange.getOutFaultMessage().getContent(Exception.class); + } else if (exchange.getInMessage() != null) { + return exchange.getInMessage().getContent(Exception.class); } return null; } Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=797483&r1=797482&r2=797483&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Fri Jul 24 14:28:30 2009 @@ -18,8 +18,7 @@ */ package org.apache.cxf.systest.jms; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; +import java.lang.Thread.State; import java.lang.reflect.UndeclaredThrowableException; import java.net.URL; import java.util.ArrayList; @@ -35,6 +34,7 @@ import javax.xml.ws.Endpoint; import javax.xml.ws.Holder; import javax.xml.ws.soap.SOAPBinding; +import javax.xml.ws.soap.SOAPFaultException; import org.apache.cxf.endpoint.Client; @@ -418,8 +418,7 @@ new GreeterImplQueueDecoupledOneWaysDeferredReply(); replyEndpoint = Endpoint.publish("", replyServant); - InvocationHandler handler = Proxy.getInvocationHandler(greeter); - BindingProvider bp = (BindingProvider)handler; + BindingProvider bp = (BindingProvider)greeter; Map requestContext = bp.getRequestContext(); JMSMessageHeadersType requestHeader = new JMSMessageHeadersType(); requestHeader.setJMSReplyTo("dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply"); @@ -485,8 +484,7 @@ Client client = ClientProxy.getClient(greeter); ((JMSConduit)client.getConduit()).getJmsConfig().setEnforceSpec(true); - InvocationHandler handler = Proxy.getInvocationHandler(greeter); - BindingProvider bp = (BindingProvider)handler; + BindingProvider bp = (BindingProvider)greeter; Map requestContext = bp.getRequestContext(); JMSMessageHeadersType requestHeader = new JMSMessageHeadersType(); requestHeader.setJMSReplyTo("dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply"); @@ -551,8 +549,7 @@ public void run() { try { - InvocationHandler handler = Proxy.getInvocationHandler(port); - BindingProvider bp = (BindingProvider)handler; + BindingProvider bp = (BindingProvider)port; Map requestContext = bp.getRequestContext(); JMSMessageHeadersType requestHeader = new JMSMessageHeadersType(); requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, requestHeader); @@ -582,7 +579,6 @@ } } } - @Test public void testTwoWayQueueAppCorrelationIDStaticPrefix() throws Exception { QName serviceName = getServiceName(new QName("http://cxf.apache.org/hello_world_jms", @@ -624,7 +620,8 @@ } for (Thread t : threads) { - t.join(); + t.join(5000); + assertTrue("No terminated state: " + t.getState(), t.getState() == State.TERMINATED); } Throwable e = (engClient.getException() != null) @@ -681,16 +678,18 @@ clients.add(client); thread.start(); } - - for (Thread t : threads) { - t.join(); - } - for (ClientRunnable client : clients) { - if (client.getException() != null - && client.getException().getMessage().contains("Timeout")) { - // exceptions expected - return; + //Sleep for up to 10 seconds. The timeout should be at 5 seconds so this + //should bail earlier + for (int x = 0; x < 10; x++) { + Thread.sleep(1000); + + for (ClientRunnable client : clients) { + if (client.getException() != null + && client.getException().getMessage().contains("Timeout")) { + // exceptions expected + return; + } } } @@ -763,7 +762,8 @@ } for (Thread t : threads) { - t.join(); + t.join(2000); + assertTrue("Not terminated state: " + t.getState(), t.getState() == State.TERMINATED); } for (ClientRunnable client : clients) { @@ -805,7 +805,8 @@ } for (Thread t : threads) { - t.join(); + t.join(5000); + assertTrue("Not terminated state: " + t.getState(), t.getState() == State.TERMINATED); } for (ClientRunnable client : clients) { @@ -815,7 +816,6 @@ } } - @Test public void testContextPropogation() throws Exception { final String testReturnPropertyName = "Test_Prop"; @@ -831,52 +831,44 @@ try { HelloWorldPortType greeter = service.getPort(portName, HelloWorldPortType.class); - InvocationHandler handler = Proxy.getInvocationHandler(greeter); - BindingProvider bp = null; - - if (handler instanceof BindingProvider) { - bp = (BindingProvider)handler; - Map requestContext = bp.getRequestContext(); - JMSMessageHeadersType requestHeader = new JMSMessageHeadersType(); - requestHeader.setJMSCorrelationID("JMS_SAMPLE_CORRELATION_ID"); - requestHeader.setJMSExpiration(3600000L); - JMSPropertyType propType = new JMSPropertyType(); - propType.setName(testReturnPropertyName); - propType.setValue("mustReturn"); - requestHeader.getProperty().add(propType); - propType = new JMSPropertyType(); - propType.setName(testIgnoredPropertyName); - propType.setValue("mustNotReturn"); - requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, requestHeader); - } + Map requestContext = ((BindingProvider)greeter).getRequestContext(); + JMSMessageHeadersType requestHeader = new JMSMessageHeadersType(); + requestHeader.setJMSCorrelationID("JMS_SAMPLE_CORRELATION_ID"); + requestHeader.setJMSExpiration(3600000L); + JMSPropertyType propType = new JMSPropertyType(); + propType.setName(testReturnPropertyName); + propType.setValue("mustReturn"); + requestHeader.getProperty().add(propType); + propType = new JMSPropertyType(); + propType.setName(testIgnoredPropertyName); + propType.setValue("mustNotReturn"); + requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, requestHeader); String greeting = greeter.greetMe("Milestone-"); assertNotNull("no response received from service", greeting); assertEquals("Hello Milestone-", greeting); - if (bp != null) { - Map responseContext = bp.getResponseContext(); - JMSMessageHeadersType responseHdr = - (JMSMessageHeadersType)responseContext.get(JMSConstants.JMS_CLIENT_RESPONSE_HEADERS); - if (responseHdr == null) { - fail("response Header should not be null"); - } - - assertTrue("CORRELATION ID should match :", - "JMS_SAMPLE_CORRELATION_ID".equals(responseHdr.getJMSCorrelationID())); - assertTrue("response Headers must conain the app property set in request context.", - responseHdr.getProperty() != null); - - boolean found = false; - for (JMSPropertyType p : responseHdr.getProperty()) { - if (testReturnPropertyName.equals(p.getName())) { - found = true; - } + Map responseContext = ((BindingProvider)greeter).getResponseContext(); + JMSMessageHeadersType responseHdr = + (JMSMessageHeadersType)responseContext.get(JMSConstants.JMS_CLIENT_RESPONSE_HEADERS); + if (responseHdr == null) { + fail("response Header should not be null"); + } + + assertTrue("CORRELATION ID should match :", + "JMS_SAMPLE_CORRELATION_ID".equals(responseHdr.getJMSCorrelationID())); + assertTrue("response Headers must conain the app property set in request context.", + responseHdr.getProperty() != null); + + boolean found = false; + for (JMSPropertyType p : responseHdr.getProperty()) { + if (testReturnPropertyName.equals(p.getName())) { + found = true; } - assertTrue("response Headers must match the app property set in request context.", - found); } + assertTrue("response Headers must match the app property set in request context.", + found); } catch (UndeclaredThrowableException ex) { throw (Exception)ex.getCause(); }