Author: dkulp Date: Fri Jan 30 19:17:33 2009 New Revision: 739383 URL: http://svn.apache.org/viewvc?rev=739383&view=rev Log: Merged revisions 739379 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r739379 | dkulp | 2009-01-30 14:06:03 -0500 (Fri, 30 Jan 2009) | 9 lines Merged revisions 739367 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r739367 | dkulp | 2009-01-30 13:32:06 -0500 (Fri, 30 Jan 2009) | 2 lines When using old style config, delay creating ConnectionFactory to allow programatic changing ........ ................ 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 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jan 30 19:17:33 2009 @@ -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,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594 -/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,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244 +/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,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379 +/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,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367 /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=739383&r1=739382&r2=739383&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 Jan 30 19:17:33 2009 @@ -20,12 +20,17 @@ import javax.jms.ConnectionFactory; import javax.jms.Message; +import javax.naming.NamingException; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Required; import org.springframework.core.task.TaskExecutor; -//import org.springframework.jms.core.JmsTemplate; +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.DestinationResolver; +import org.springframework.jndi.JndiTemplate; import org.springframework.transaction.PlatformTransactionManager; public class JMSConfiguration implements InitializingBean { @@ -43,7 +48,6 @@ private PlatformTransactionManager transactionManager; private TaskExecutor taskExecutor; private boolean useJms11 = DEFAULT_USEJMS11; - private boolean useJndi; private boolean messageIdEnabled = true; private boolean messageTimestampEnabled = true; private boolean pubSubNoLocal; @@ -54,6 +58,15 @@ private int priority = Message.DEFAULT_PRIORITY; private long timeToLive = Message.DEFAULT_TIME_TO_LIVE; private boolean sessionTransacted; + + //Stuff for JNDI based and old configs + private boolean useJndi; + private JndiTemplate jndiTemplate; + private String jndiConnectionFactoryName; + private String connectionUserName; + private String connectionPassword; + private Boolean reconnectOnException; + private int concurrentConsumers = 1; private int maxConcurrentConsumers = 1; @@ -215,9 +228,46 @@ } } + public ConnectionFactory getConnectionFactory() { + if (connectionFactory == null && jndiTemplate != null && jndiConnectionFactoryName != null) { + connectionFactory = getConnectionFactoryFromJndi(); + } return connectionFactory; } + private ConnectionFactory getConnectionFactoryFromJndi() { + + String connectionFactoryName = getJndiConnectionFactoryName(); + String userName = getConnectionUserName(); + String password = getConnectionPassword(); + + + if (connectionFactoryName == null) { + return null; + } + try { + ConnectionFactory cf = (ConnectionFactory)jndiTemplate.lookup(connectionFactoryName); + UserCredentialsConnectionFactoryAdapter uccf = new UserCredentialsConnectionFactoryAdapter(); + uccf.setUsername(userName); + uccf.setPassword(password); + uccf.setTargetConnectionFactory(cf); + + if (this.useJms11) { + SingleConnectionFactory scf = new SingleConnectionFactory(uccf); + if (isSetReconnectOnException() && isReconnectOnException()) { + scf.setReconnectOnException(true); + } + return scf; + } + SingleConnectionFactory102 scf = new SingleConnectionFactory102(uccf, pubSubDomain); + if (isSetReconnectOnException() && isReconnectOnException()) { + scf.setReconnectOnException(true); + } + return scf; + } catch (NamingException e) { + throw new RuntimeException(e); + } + } @Required public void setConnectionFactory(ConnectionFactory connectionFactory) { @@ -328,4 +378,47 @@ this.maxConcurrentTasks = maxConcurrentTasks; } + public void setJndiTemplate(JndiTemplate jndiTemplate) { + this.jndiTemplate = jndiTemplate; + } + + public JndiTemplate getJndiTemplate() { + return jndiTemplate; + } + + public String getJndiConnectionFactoryName() { + return jndiConnectionFactoryName; + } + + public void setJndiConnectionFactoryName(String jndiConnectionFactoryName) { + this.jndiConnectionFactoryName = jndiConnectionFactoryName; + } + + public String getConnectionUserName() { + return connectionUserName; + } + + public void setConnectionUserName(String connectionUserName) { + this.connectionUserName = connectionUserName; + } + + public String getConnectionPassword() { + return connectionPassword; + } + + public void setConnectionPassword(String connectionPassword) { + this.connectionPassword = connectionPassword; + } + + public boolean isSetReconnectOnException() { + return reconnectOnException != null; + } + public boolean isReconnectOnException() { + return reconnectOnException; + } + + public void setReconnectOnException(boolean reconnectOnException) { + this.reconnectOnException = reconnectOnException; + } + } 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=739383&r1=739382&r2=739383&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 Jan 30 19:17:33 2009 @@ -23,16 +23,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.jms.ConnectionFactory; -import javax.naming.NamingException; - import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; 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,43 +41,6 @@ private ServerConfig serverConfig; private ServerBehaviorPolicyType serverBehavior; - private ConnectionFactory getConnectionFactoryFromJndi(JndiTemplate jt, - boolean pubSubDomain) { - - String connectionFactoryName = address.getJndiConnectionFactoryName(); - String userName = address.getConnectionUserName(); - String password = address.getConnectionPassword(); - boolean use11 = address.isSetUseJms11() - ? address.isUseJms11() : JMSConfiguration.DEFAULT_USEJMS11; - - - if (connectionFactoryName == null) { - return null; - } - try { - ConnectionFactory connectionFactory = (ConnectionFactory)jt.lookup(connectionFactoryName); - UserCredentialsConnectionFactoryAdapter uccf = new UserCredentialsConnectionFactoryAdapter(); - uccf.setUsername(userName); - uccf.setPassword(password); - uccf.setTargetConnectionFactory(connectionFactory); - - if (use11) { - SingleConnectionFactory cf = new SingleConnectionFactory(uccf); - if (address.isSetReconnectOnException() && address.isReconnectOnException()) { - cf.setReconnectOnException(true); - } - return cf; - } - SingleConnectionFactory102 cf = new SingleConnectionFactory102(uccf, pubSubDomain); - if (address.isSetReconnectOnException() && address.isReconnectOnException()) { - cf.setReconnectOnException(true); - } - return cf; - } catch (NamingException e) { - throw new RuntimeException(e); - } - } - public JMSConfiguration createJMSConfigurationFromEndpointInfo(Bus bus, EndpointInfo endpointInfo, boolean isConduit) { @@ -120,8 +77,13 @@ pubSubDomain = DestinationStyleType.TOPIC == address.getDestinationStyle(); } if (jmsConfig.getConnectionFactory() == null) { - ConnectionFactory cf = getConnectionFactoryFromJndi(jt, pubSubDomain); - jmsConfig.setConnectionFactory(cf); + jmsConfig.setJndiConnectionFactoryName(address.getJndiConnectionFactoryName()); + jmsConfig.setJndiTemplate(jt); + jmsConfig.setConnectionUserName(address.getConnectionUserName()); + jmsConfig.setConnectionPassword(address.getConnectionPassword()); + if (address.isSetReconnectOnException()) { + jmsConfig.setReconnectOnException(address.isReconnectOnException()); + } } jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName()); jmsConfig.setExplicitQosEnabled(true);
