Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 1488 invoked from network); 16 Dec 2008 04:29:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Dec 2008 04:29:14 -0000 Received: (qmail 65180 invoked by uid 500); 16 Dec 2008 04:29:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 65157 invoked by uid 500); 16 Dec 2008 04:29:27 -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 65148 invoked by uid 99); 16 Dec 2008 04:29:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2008 20:29:27 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= 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; Tue, 16 Dec 2008 04:29:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5E9A62388892; Mon, 15 Dec 2008 20:28:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r726948 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ systests/src/test/java/org/apache/cxf/systest/jms/tx/ Date: Tue, 16 Dec 2008 04:28:51 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081216042851.5E9A62388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Dec 15 20:28:50 2008 New Revision: 726948 URL: http://svn.apache.org/viewvc?rev=726948&view=rev Log: Merged revisions 726756 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes ................ r726756 | dkulp | 2008-12-16 02:16:56 +0800 (Tue, 16 Dec 2008) | 9 lines Merged revisions 726639 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r726639 | ningjiang | 2008-12-15 02:50:18 -0500 (Mon, 15 Dec 2008) | 1 line CXF-180 added an example to show how to use spring transaction framework with jms transport ........ ................ Added: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/ - copied from r726756, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java - copied unchanged from r726756, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java - copied unchanged from r726756, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/Server.java - copied unchanged from r726756, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/Server.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml - copied unchanged from r726756, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 15 20:28:50 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726754,726758 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,726637,726724 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726754,726756,726758 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,726637,726639,726724 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=726948&r1=726947&r2=726948&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Mon Dec 15 20:28:50 2008 @@ -33,7 +33,6 @@ import org.springframework.jms.connection.SingleConnectionFactory; import org.springframework.jms.connection.SingleConnectionFactory102; import org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter; -import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.support.destination.JndiDestinationResolver; import org.springframework.jndi.JndiTemplate; @@ -120,8 +119,11 @@ if (address.isSetDestinationStyle()) { pubSubDomain = DestinationStyleType.TOPIC == address.getDestinationStyle(); } - ConnectionFactory cf = getConnectionFactoryFromJndi(jt, pubSubDomain); - jmsConfig.setConnectionFactory(cf); + + if (jmsConfig.getConnectionFactory() == null) { + ConnectionFactory cf = getConnectionFactoryFromJndi(jt, pubSubDomain); + jmsConfig.setConnectionFactory(cf); + } jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName()); jmsConfig.setExplicitQosEnabled(true); @@ -131,22 +133,24 @@ } jmsConfig.setPubSubDomain(pubSubDomain); jmsConfig.setPubSubNoLocal(true); - if (jmsConfig.getReceiveTimeout() == JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT) { - jmsConfig.setReceiveTimeout(clientConfig.getClientReceiveTimeout()); - } + //if (clientConfig.isSetClientReceiveTimeout()) { + jmsConfig.setReceiveTimeout(clientConfig.getClientReceiveTimeout()); + //} jmsConfig.setSubscriptionDurable(serverBehavior.isSetDurableSubscriberName()); jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName()); long timeToLive = isConduit ? clientConfig.getMessageTimeToLive() : serverConfig .getMessageTimeToLive(); - jmsConfig.setTimeToLive(timeToLive); + jmsConfig.setTimeToLive(timeToLive); if (address.isSetUseJms11()) { jmsConfig.setUseJms11(address.isUseJms11()); } boolean useJndi = address.isSetJndiDestinationName(); jmsConfig.setUseJndi(useJndi); - jmsConfig.setSessionTransacted(serverBehavior.isSetTransactional()); + if (serverBehavior.isSetTransactional()) { + jmsConfig.setSessionTransacted(serverBehavior.isTransactional()); + } if (useJndi) { // Setup Destination jndi destination resolver