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/11/11 18:01:30 UTC
svn commit: r713083 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Author: dkulp
Date: Tue Nov 11 09:01:30 2008
New Revision: 713083
URL: http://svn.apache.org/viewvc?rev=713083&view=rev
Log:
Merged revisions 713082 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r713082 | dkulp | 2008-11-11 11:57:56 -0500 (Tue, 11 Nov 2008) | 3 lines
If using jms102, use the correct factory.
Make the default for CXF 2.2 be to use the JMS 1.1 stuff (CXF 2.1.x/2.0.x will default to 1.0.2)
........
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/JMSConfiguration.java
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 Tue Nov 11 09:01:30 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,708417,708550,708554,709353-709354,709425,710150,710154,711490,71197
5,712194,712198,712238,712272,712299,712312,712893
+/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,708417,708550,708554,709353-709354,709425,710150,710154,711490,71197
5,712194,712198,712238,712272,712299,712312,712893,713082
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/JMSConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=713083&r1=713082&r2=713083&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Tue Nov 11 09:01:30 2008
@@ -29,11 +29,13 @@
import org.springframework.transaction.PlatformTransactionManager;
public class JMSConfiguration implements InitializingBean {
+ static final boolean DEFAULT_USEJMS11 = true;
+
private ConnectionFactory connectionFactory;
private DestinationResolver destinationResolver;
private PlatformTransactionManager transactionManager;
private TaskExecutor taskExecutor;
- private boolean useJms11;
+ private boolean useJms11 = DEFAULT_USEJMS11;
private boolean useJndi;
private boolean messageIdEnabled = true;
private boolean messageTimestampEnabled = true;
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=713083&r1=713082&r2=713083&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 Tue Nov 11 09:01:30 2008
@@ -31,6 +31,7 @@
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.service.model.EndpointInfo;
import org.springframework.jms.connection.SingleConnectionFactory;
+import org.springframework.jms.connection.SingleConnectionFactory102;
import org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter;
import org.springframework.jms.support.destination.JndiDestinationResolver;
import org.springframework.jndi.JndiTemplate;
@@ -47,7 +48,8 @@
private ServerBehaviorPolicyType serverBehavior;
private ConnectionFactory getConnectionFactoryFromJndi(String connectionFactoryName, String userName,
- String password, JndiTemplate jt) {
+ String password, JndiTemplate jt,
+ boolean use11) {
if (connectionFactoryName == null) {
return null;
}
@@ -58,7 +60,12 @@
uccf.setPassword(password);
uccf.setTargetConnectionFactory(connectionFactory);
- SingleConnectionFactory scf = new SingleConnectionFactory();
+ SingleConnectionFactory scf = null;
+ if (use11) {
+ scf = new SingleConnectionFactory();
+ } else {
+ scf = new SingleConnectionFactory102();
+ }
scf.setTargetConnectionFactory(uccf);
return scf;
} catch (NamingException e) {
@@ -92,7 +99,8 @@
JndiTemplate jt = new JndiTemplate();
jt.setEnvironment(JMSOldConfigHolder.getInitialContextEnv(address));
ConnectionFactory cf = getConnectionFactoryFromJndi(address.getJndiConnectionFactoryName(), address
- .getConnectionUserName(), address.getConnectionPassword(), jt);
+ .getConnectionUserName(), address.getConnectionPassword(), jt,
+ address.isSetUseJms11() ? address.isUseJms11() : JMSConfiguration.DEFAULT_USEJMS11);
boolean pubSubDomain = false;
if (address.isSetDestinationStyle()) {