Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A5AF4C9D2 for ; Wed, 6 Jun 2012 17:57:49 +0000 (UTC) Received: (qmail 38267 invoked by uid 500); 6 Jun 2012 17:57:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 38199 invoked by uid 500); 6 Jun 2012 17:57:49 -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 38189 invoked by uid 99); 6 Jun 2012 17:57:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 17:57:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 06 Jun 2012 17:57:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 628192388BF1; Wed, 6 Jun 2012 17:57:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1347009 - in /cxf/branches/2.5.x-fixes/rt/transports/jms/src/main: java/org/apache/cxf/transport/jms/ resources/schemas/wsdl/ Date: Wed, 06 Jun 2012 17:57:25 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606175725.628192388BF1@eris.apache.org> Author: dkulp Date: Wed Jun 6 17:57:24 2012 New Revision: 1347009 URL: http://svn.apache.org/viewvc?rev=1347009&view=rev Log: Merged revisions 1346926 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1346926 | dkulp | 2012-06-06 10:58:27 -0400 (Wed, 06 Jun 2012) | 2 lines [CXF-4363] Configure server and client timeouts separately ........ Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=1347009&r1=1347008&r2=1347009&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Wed Jun 6 17:57:24 2012 @@ -60,7 +60,8 @@ public class JMSConfiguration implements private boolean messageIdEnabled = true; private boolean messageTimestampEnabled = true; private boolean pubSubNoLocal; - private Long receiveTimeout; + private Long clientReceiveTimeout; + private Long serverReceiveTimeout; private boolean explicitQosEnabled; private int deliveryMode = Message.DEFAULT_DELIVERY_MODE; private int priority = Message.DEFAULT_PRIORITY; @@ -180,13 +181,19 @@ public class JMSConfiguration implements } public Long getReceiveTimeout() { - return receiveTimeout; + return clientReceiveTimeout; } public void setReceiveTimeout(Long receiveTimeout) { - this.receiveTimeout = receiveTimeout; + this.clientReceiveTimeout = receiveTimeout; + } + public Long getServerReceiveTimeout() { + return serverReceiveTimeout; } + public void setServerReceiveTimeout(Long receiveTimeout) { + this.serverReceiveTimeout = receiveTimeout; + } public boolean isExplicitQosEnabled() { return explicitQosEnabled; } Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=1347009&r1=1347008&r2=1347009&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java Wed Jun 6 17:57:24 2012 @@ -245,7 +245,12 @@ public final class JMSFactory { jmsListener.setSessionTransacted(jmsConfig.isSessionTransacted()); jmsListener.setTransactionManager(jmsConfig.getTransactionManager()); jmsListener.setMessageListener(listenerHandler); - if (jmsConfig.getReceiveTimeout() != null) { + if (listenerHandler instanceof JMSDestination) { + //timeout on server side? + if (jmsConfig.getServerReceiveTimeout() != null) { + jmsListener.setReceiveTimeout(jmsConfig.getServerReceiveTimeout()); + } + } else if (jmsConfig.getReceiveTimeout() != null) { jmsListener.setReceiveTimeout(jmsConfig.getReceiveTimeout()); } if (jmsConfig.getRecoveryInterval() != JMSConfiguration.DEFAULT_VALUE) { Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=1347009&r1=1347008&r2=1347009&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Wed Jun 6 17:57:24 2012 @@ -250,6 +250,9 @@ public class JMSOldConfigHolder { if (clientConfig.isSetConduitSelectorPrefix()) { jmsConfig.setConduitSelectorPrefix(clientConfig.getConduitSelectorPrefix()); } + if (serverConfig.isSetServerReceiveTimeout()) { + jmsConfig.setServerReceiveTimeout(serverConfig.getServerReceiveTimeout()); + } jmsConfig.setEnforceSpec(clientConfig.isEnforceSpec()); jmsConfig.setSubscriptionDurable(serverBehavior.isSetDurableSubscriberName()); jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName()); Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=1347009&r1=1347008&r2=1347009&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd (original) +++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Wed Jun 6 17:57:24 2012 @@ -69,6 +69,7 @@ +