Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 50385 invoked from network); 18 Feb 2009 21:06:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Feb 2009 21:06:49 -0000 Received: (qmail 8691 invoked by uid 500); 18 Feb 2009 21:06:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8641 invoked by uid 500); 18 Feb 2009 21:06:48 -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 8631 invoked by uid 99); 18 Feb 2009 21:06:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Feb 2009 13:06:48 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Wed, 18 Feb 2009 21:06:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4809C23888A3; Wed, 18 Feb 2009 21:06:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r745648 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ Date: Wed, 18 Feb 2009 21:06:23 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090218210624.4809C23888A3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Feb 18 21:06:23 2009 New Revision: 745648 URL: http://svn.apache.org/viewvc?rev=745648&view=rev Log: Merged revisions 745596 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes ................ r745596 | dkulp | 2009-02-18 13:33:32 -0500 (Wed, 18 Feb 2009) | 14 lines Merged revisions 744756 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r744756 | cschneider | 2009-02-15 16:15:47 -0500 (Sun, 15 Feb 2009) | 6 lines Removed useJndi from JmsConfiguration. Instead it will use Jndi when no ConnectionFactory was specified. Added durableSubscriptionClientId to JmsConfiguration as durable subscribers need to set this. Added setting pubSubNoLocal to jmsListener in JMSFactory. Added setting setSubscriptionDurable to jmsListener. ====> But commented it out because we get test failures then It seems the durable subscribe feature was broken since some time in cxf as the feature was never set on the jmsListener. I will remove the above comment as soon as we got the tests running. ........ ................ 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/JMSFactory.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 Wed Feb 18 21:06:23 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,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593 -/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,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195 +/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,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596 +/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,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756 /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=745648&r1=745647&r2=745648&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 Wed Feb 18 21:06:23 2009 @@ -41,11 +41,7 @@ static final boolean DEFAULT_USEJMS11 = false; private boolean usingEndpointInfo = true; - - /** - * Use jndi to resolve destinations - */ - private boolean useJndi; + private JndiTemplate jndiTemplate; private ConnectionFactory connectionFactory; private DestinationResolver destinationResolver; @@ -71,6 +67,7 @@ private volatile String messageSelector; private boolean subscriptionDurable; + private String durableSubscriptionClientId; private String durableSubscriptionName; private String targetDestination; @@ -134,13 +131,6 @@ public void setUsingEndpointInfo(boolean usingEndpointInfo) { this.usingEndpointInfo = usingEndpointInfo; } - public boolean isUseJndi() { - return useJndi; - } - - public void setUseJndi(boolean useJndi) { - this.useJndi = useJndi; - } public boolean isMessageIdEnabled() { return messageIdEnabled; @@ -376,22 +366,32 @@ public void setReconnectOnException(boolean reconnectOnException) { this.reconnectOnException = reconnectOnException; } - + + /** + * Tries to creates a ConnectionFactory from jndi if none was set as a property + * by using the jndConfig. Then it determiens if the connectionFactory should be wrapped + * into a SingleConnectionFactory and wraps it if necessary. After the first call the + * same connectionFactory will be returned for all subsequent calls + * + * @return usable connectionFactory + */ public ConnectionFactory getOrCreateWrappedConnectionFactory() { if (wrappedConnectionFactory == null) { if (connectionFactory == null) { connectionFactory = JMSFactory.getConnectionFactoryFromJndi(this); } if (wrapInSingleConnectionFactory && !(connectionFactory instanceof SingleConnectionFactory)) { + SingleConnectionFactory scf; if (useJms11) { - wrappedConnectionFactory = new SingleConnectionFactory(connectionFactory); + scf = new SingleConnectionFactory(connectionFactory); } else { - wrappedConnectionFactory = new SingleConnectionFactory102(connectionFactory, - pubSubDomain); + scf = new SingleConnectionFactory102(connectionFactory, pubSubDomain); } - if (reconnectOnException) { - ((SingleConnectionFactory)wrappedConnectionFactory).setReconnectOnException(true); + if (getDurableSubscriptionClientId() != null) { + scf.setClientId(getDurableSubscriptionClientId()); } + scf.setReconnectOnException(isReconnectOnException()); + wrappedConnectionFactory = scf; } else { wrappedConnectionFactory = connectionFactory; } @@ -415,4 +415,12 @@ this.wrapInSingleConnectionFactory = wrapInSingleConnectionFactory; } + public String getDurableSubscriptionClientId() { + return durableSubscriptionClientId; + } + + public void setDurableSubscriptionClientId(String durableSubscriptionClientId) { + this.durableSubscriptionClientId = durableSubscriptionClientId; + } + } Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=745648&r1=745647&r2=745648&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java Wed Feb 18 21:06:23 2009 @@ -123,9 +123,11 @@ jmsListener.setConcurrentConsumers(jmsConfig.getConcurrentConsumers()); jmsListener.setMaxConcurrentConsumers(jmsConfig.getMaxConcurrentConsumers()); jmsListener.setPubSubDomain(jmsConfig.isPubSubDomain()); + jmsListener.setPubSubNoLocal(jmsConfig.isPubSubNoLocal()); jmsListener.setAutoStartup(true); jmsListener.setConnectionFactory(jmsConfig.getOrCreateWrappedConnectionFactory()); jmsListener.setMessageSelector(jmsConfig.getMessageSelector()); + //jmsListener.setSubscriptionDurable(jmsConfig.isSubscriptionDurable()); jmsListener.setDurableSubscriptionName(jmsConfig.getDurableSubscriptionName()); jmsListener.setSessionTransacted(jmsConfig.isSessionTransacted()); jmsListener.setTransactionManager(jmsConfig.getTransactionManager()); 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=745648&r1=745647&r2=745648&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 Wed Feb 18 21:06:23 2009 @@ -102,6 +102,7 @@ } jmsConfig.setSubscriptionDurable(serverBehavior.isSetDurableSubscriberName()); jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName()); + jmsConfig.setDurableSubscriptionClientId(serverConfig.getDurableSubscriptionClientId()); if (sessionPool.isSetHighWaterMark()) { jmsConfig.setMaxConcurrentTasks(sessionPool.getHighWaterMark()); } @@ -115,7 +116,6 @@ jmsConfig.setSessionTransacted(serverBehavior.isTransactional()); } boolean useJndi = address.isSetJndiDestinationName(); - jmsConfig.setUseJndi(useJndi); if (useJndi) { // Setup Destination jndi destination resolver final JndiDestinationResolver jndiDestinationResolver = new JndiDestinationResolver();