You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/12/15 19:16:57 UTC
svn commit: r726756 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/
systests/src/test/java/org/apache/cxf/systest/jms/tx/
Author: dkulp
Date: Mon Dec 15 10:16:56 2008
New Revision: 726756
URL: http://svn.apache.org/viewvc?rev=726756&view=rev
Log:
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.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/
- copied from r726639, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/tx/
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java
- copied unchanged from r726639, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
- copied unchanged from r726639, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/Server.java
- copied unchanged from r726639, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/tx/Server.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml
- copied unchanged from r726639, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/tx/jms_server_config.xml
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 10:16:56 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=726756&r1=726755&r2=726756&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Mon Dec 15 10:16:56 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