Author: dkulp Date: Fri Nov 14 13:13:04 2008 New Revision: 714145 URL: http://svn.apache.org/viewvc?rev=714145&view=rev Log: Merged revisions 713083 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r713083 | dkulp | 2008-11-11 12:01:30 -0500 (Tue, 11 Nov 2008) | 10 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java (props changed) Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 14 13:13:04 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 -/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,712893 +/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 +/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,712893,713082 /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/JMSConfiguration.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=714145&r1=714144&r2=714145&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Fri Nov 14 13:13:04 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.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=714145&r1=714144&r2=714145&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 Fri Nov 14 13:13:04 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()) { Propchange: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 14 13:13:04 2008 @@ -1 +1 @@ -/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600 +/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083
