cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r766061 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/ rt/transports/jms/src/test/java/org/apache/cxf/transport/jm...
Date Fri, 17 Apr 2009 15:44:12 GMT
Author: sergeyb
Date: Fri Apr 17 15:44:11 2009
New Revision: 766061

URL: http://svn.apache.org/viewvc?rev=766061&view=rev
Log:
Merged revisions 766045 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r766045 | sergeyb | 2009-04-17 16:14:09 +0100 (Fri, 17 Apr 2009) | 9 lines
  
  Merged revisions 766013 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r766013 | sergeyb | 2009-04-17 14:58:12 +0100 (Fri, 17 Apr 2009) | 1 line
    
    CXF-2002 : support for maxSuspendedContinuations in JMS
  ........
................

Added:
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
      - copied unchanged from r766045, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
      - copied unchanged from r766045, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
      - copied unchanged from r766045, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/test2.wsdl
      - copied unchanged from r766045, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/test2.wsdl
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/JMSDestination.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
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProvider.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/resources/jms_test_config.xml
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 15:44:11 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,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076,760469,761762,761790,762395,764892
-/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,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073,760468,761759,761789,762393,764887
+/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,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076,760469,761762,761790,762395,764892,766045
+/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,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073,760468,761759,761789,762393,764887,766013
 /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=766061&r1=766060&r2=766061&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 Apr 17 15:44:11 2009
@@ -64,6 +64,7 @@
     private int concurrentConsumers = 1;
     private int maxConcurrentConsumers = 1;
     private int maxConcurrentTasks = 10;
+    private int maxSuspendedContinuations = DEFAULT_VALUE;
 
     private volatile String messageSelector;
     private boolean subscriptionDurable;
@@ -318,6 +319,14 @@
     public void setMaxConcurrentConsumers(int maxConcurrentConsumers) {
         this.maxConcurrentConsumers = maxConcurrentConsumers;
     }
+    
+    public int getMaxSuspendedContinuations() {
+        return maxSuspendedContinuations;
+    }
+
+    public void setMaxSuspendedContinuations(int maxSuspendedContinuations) {
+        this.maxSuspendedContinuations = maxSuspendedContinuations;
+    }
 
     public TaskExecutor getTaskExecutor() {
         return taskExecutor;

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Fri Apr 17 15:44:11 2009
@@ -176,12 +176,15 @@
             inMessage.put(JMSConstants.JMS_SERVER_RESPONSE_HEADERS, new JMSMessageHeadersType());
             inMessage.put(JMSConstants.JMS_REQUEST_MESSAGE, message);
             inMessage.setDestination(this);
-
-            inMessage.put(ContinuationProvider.class.getName(), 
-                          new JMSContinuationProvider(bus,
-                                                      inMessage,
-                                                      incomingObserver,
-                                                      continuations));
+            if (jmsConfig.getMaxSuspendedContinuations() != 0) {
+                inMessage.put(ContinuationProvider.class.getName(), 
+                              new JMSContinuationProvider(bus,
+                                                          inMessage,
+                                                          incomingObserver,
+                                                          continuations,
+                                                          jmsListener,
+                                                          jmsConfig));
+            }
             
             BusFactory.setThreadDefaultBus(bus);
 

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=766061&r1=766060&r2=766061&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
Fri Apr 17 15:44:11 2009
@@ -18,6 +18,8 @@
  */
 package org.apache.cxf.transport.jms;
 
+import java.util.logging.Logger;
+
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -26,6 +28,7 @@
 import javax.jms.Session;
 import javax.naming.NamingException;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapter;
 import org.springframework.jms.core.JmsTemplate;
@@ -40,6 +43,8 @@
  */
 public final class JMSFactory {
 
+    private static final Logger LOG = LogUtils.getL7dLogger(JMSFactory.class);
+    
     private JMSFactory() {
     }
 
@@ -141,6 +146,12 @@
         } else if (jmsConfig.getCacheLevel() != JMSConfiguration.DEFAULT_VALUE) {
             jmsListener.setCacheLevel(jmsConfig.getCacheLevel());
         }
+        if (jmsListener.getCacheLevel() >= DefaultMessageListenerContainer.CACHE_CONSUMER
+            && jmsConfig.getMaxSuspendedContinuations() > 0) {
+            LOG.info("maxSuspendedContinuations value will be ignored - "
+                     + ", please set cacheLevel to the value less than "
+                     + " org.springframework.jms.listener.DefaultMessageListenerContainer.CACHE_CONSUMER");
+        }
         String staticSelectorPrefix = jmsConfig.getConduitSelectorPrefix();
         if (!userCID && messageSelectorPrefix != null && jmsConfig.isUseConduitIdSelector())
{
             jmsListener.setMessageSelector("JMSCorrelationID LIKE '" 

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=766061&r1=766060&r2=766061&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 Apr 17 15:44:11 2009
@@ -87,7 +87,9 @@
             }
             jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName());
             jmsConfig.setExplicitQosEnabled(true);
-            jmsConfig.setMessageSelector(serverBehavior.getMessageSelector());        
+            if (jmsConfig.getMessageSelector() == null) {
+                jmsConfig.setMessageSelector(serverBehavior.getMessageSelector());
+            }
             if (isConduit && runtimePolicy.isSetMessageType()) {
                 jmsConfig.setMessageType(runtimePolicy.getMessageType().value());
             }        

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuation.java
Fri Apr 17 15:44:11 2009
@@ -22,20 +22,31 @@
 import java.util.Collection;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Logger;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.continuations.Continuation;
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.jms.JMSConfiguration;
+import org.springframework.jms.listener.DefaultMessageListenerContainer;
 
 public class JMSContinuation implements Continuation {
 
+    static final String BOGUS_MESSAGE_SELECTOR = "org.apache.cxf.transports.jms.continuations=too-many";
+    private static final Logger LOG = LogUtils.getL7dLogger(JMSContinuation.class);
+    
     private Bus bus;
     private Message inMessage;
     private MessageObserver incomingObserver;
     private Collection<JMSContinuation> continuations;
+    private DefaultMessageListenerContainer jmsListener;
+    private JMSConfiguration jmsConfig;
+    
+    private String currentMessageSelector = BOGUS_MESSAGE_SELECTOR;
     
     private Object userObject;
     
@@ -44,14 +55,16 @@
     private boolean isResumed;
     private Timer timer = new Timer();
     
-    public JMSContinuation(Bus b,
-                                  Message m, 
-                                  MessageObserver observer,
-                                  Collection<JMSContinuation> cList) {
+    public JMSContinuation(Bus b, Message m, MessageObserver observer,
+                           Collection<JMSContinuation> cList, 
+                           DefaultMessageListenerContainer jmsListener,
+                           JMSConfiguration jmsConfig) {
         bus = b;
         inMessage = m;    
         incomingObserver = observer;
         continuations = cList;
+        this.jmsListener = jmsListener;
+        this.jmsConfig = jmsConfig;
     }    
     
     public Object getObject() {
@@ -87,7 +100,8 @@
     }
     
     protected void doResume() {
-        continuations.remove(this);
+        
+        updateContinuations(true);
         
         BusFactory.setThreadDefaultBus(bus);
         try {
@@ -108,8 +122,8 @@
             return false;
         }
         
-        continuations.add(this);
-        
+        updateContinuations(false);
+                
         isNew = false;
         isResumed = false;
         isPending = true;
@@ -136,4 +150,47 @@
     protected void cancelTimerTask() {
         timer.cancel();
     }
+    
+    protected void updateContinuations(boolean remove) {
+
+        modifyList(remove);
+        
+        if (jmsConfig.getMaxSuspendedContinuations() < 0
+            || jmsListener.getCacheLevel() >= DefaultMessageListenerContainer.CACHE_CONSUMER)
{
+            return;
+        }
+        
+        // throttle the flow if there're too many continuation instances in memory
+        if (remove && !BOGUS_MESSAGE_SELECTOR.equals(currentMessageSelector)) {
+            LOG.fine("A number of continuations has dropped below the limit of "
+                     + jmsConfig.getMaxSuspendedContinuations()
+                     + ", resetting JMS MessageSelector to " + currentMessageSelector);
+            jmsListener.setMessageSelector(currentMessageSelector);
+            currentMessageSelector = BOGUS_MESSAGE_SELECTOR;
+        } else if (!remove && continuations.size() >= jmsConfig.getMaxSuspendedContinuations())
{
+            currentMessageSelector = jmsListener.getMessageSelector();
+            if (!BOGUS_MESSAGE_SELECTOR.equals(currentMessageSelector)) {
+                LOG.fine("A number of continuations has reached the limit of "
+                         + jmsConfig.getMaxSuspendedContinuations()
+                         + ", setting JMS MessageSelector to " + BOGUS_MESSAGE_SELECTOR);
+                jmsListener.setMessageSelector(BOGUS_MESSAGE_SELECTOR);
+                
+            }
+        }
+
+    }
+    
+    protected void modifyList(boolean remove) {
+        if (remove) {
+            continuations.remove(this);
+        } else {
+            continuations.add(this);
+        }
+    }
+    
+    String getCurrentMessageSelector() {
+        return currentMessageSelector;
+    }
+    
+    
 }

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProvider.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProvider.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProvider.java
Fri Apr 17 15:44:11 2009
@@ -26,6 +26,8 @@
 import org.apache.cxf.continuations.ContinuationProvider;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.jms.JMSConfiguration;
+import org.springframework.jms.listener.DefaultMessageListenerContainer;
 
 public class JMSContinuationProvider implements ContinuationProvider {
 
@@ -33,15 +35,21 @@
     private Message inMessage;
     private MessageObserver incomingObserver;
     private Collection<JMSContinuation> continuations;
+    private DefaultMessageListenerContainer jmsListener;
+    private JMSConfiguration jmsConfig;
     
     public JMSContinuationProvider(Bus b,
                                    Message m, 
                                    MessageObserver observer,
-                                   Collection<JMSContinuation> cList) {
+                                   Collection<JMSContinuation> cList,
+                                   DefaultMessageListenerContainer jmsListener,
+                                   JMSConfiguration jmsConfig) {
         bus = b;
         inMessage = m;    
         incomingObserver = observer;
         continuations = cList;
+        this.jmsListener = jmsListener;
+        this.jmsConfig = jmsConfig;
     }
     
     public Continuation getContinuation() {
@@ -50,10 +58,8 @@
         }
         JMSContinuation cw = inMessage.get(JMSContinuation.class);
         if (cw == null) {
-            cw = new JMSContinuation(bus,
-                                           inMessage, 
-                                           incomingObserver,
-                                           continuations);
+            cw = new JMSContinuation(bus, inMessage,  incomingObserver, continuations, 
+                                     jmsListener, jmsConfig);
             inMessage.put(JMSContinuation.class, cw);
         }
         return cw;

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
Fri Apr 17 15:44:11 2009
@@ -129,6 +129,8 @@
         jmsConfig = destination.getJmsConfig();*/
         assertEquals("The concurrentConsumer should be set", jmsConfig.getConcurrentConsumers(),
3);
         assertEquals("The maxConcurrentConsumer should be set", jmsConfig.getMaxConcurrentConsumers(),
5);
+        assertEquals("The maxSuspendedContinuations should be set", 
+                     jmsConfig.getMaxSuspendedContinuations(), 2);
         assertNotNull("The connectionFactory should not be null", jmsConfig.getConnectionFactory());
         assertTrue("Should get the instance of ActiveMQConnectionFactory", 
                    jmsConfig.getConnectionFactory() instanceof ActiveMQConnectionFactory);

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
Fri Apr 17 15:44:11 2009
@@ -36,7 +36,8 @@
         exchange.setOneWay(true);
         Message m = new MessageImpl();
         m.setExchange(exchange);
-        JMSContinuationProvider provider = new JMSContinuationProvider(null, m, null, null);
+        JMSContinuationProvider provider = 
+            new JMSContinuationProvider(null, m, null, null, null, null);
         assertNull(provider.getContinuation());
     }
     
@@ -44,7 +45,8 @@
     public void testGetNewContinuation() {
         Message m = new MessageImpl();
         m.setExchange(new ExchangeImpl());
-        JMSContinuationProvider provider = new JMSContinuationProvider(null, m, null, null);
+        JMSContinuationProvider provider = 
+            new JMSContinuationProvider(null, m, null, null, null, null);
         Continuation cw = provider.getContinuation(); 
         assertTrue(cw.isNew());
         assertSame(cw, m.get(JMSContinuation.class));
@@ -54,9 +56,9 @@
     public void testGetExistingContinuation() {
         Message m = new MessageImpl();
         m.setExchange(new ExchangeImpl());
-        JMSContinuation cw = new JMSContinuation(null, m, null, null);
+        JMSContinuation cw = new JMSContinuation(null, m, null, null, null, null);
         m.put(JMSContinuation.class, cw);
-        JMSContinuationProvider provider = new JMSContinuationProvider(null, m, null, null);
+        JMSContinuationProvider provider = new JMSContinuationProvider(null, m, null, null,
null, null);
         assertSame(cw, provider.getContinuation());
         assertSame(cw, m.get(JMSContinuation.class));
     }

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
Fri Apr 17 15:44:11 2009
@@ -28,10 +28,13 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.jms.JMSConfiguration;
 import org.easymock.classextension.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.jms.listener.DefaultMessageListenerContainer;
+
 
 
 public class JMSContinuationTest extends Assert {
@@ -52,7 +55,7 @@
     @Test
     public void testInitialStatus() {
         JMSContinuation cw = 
-            new JMSContinuation(b, m, observer, continuations);
+            new JMSContinuation(b, m, observer, continuations, null, null);
         assertTrue(cw.isNew());
         assertFalse(cw.isPending());
         assertFalse(cw.isResumed());
@@ -61,7 +64,7 @@
     @Test
     public void testSuspendResume() {
         TestJMSContinuationWrapper cw = 
-            new TestJMSContinuationWrapper(b, m, observer, continuations);
+            new TestJMSContinuationWrapper(b, m, observer, continuations, null, new JMSConfiguration());
         try {
             cw.suspend(5000);
             fail("SuspendInvocation exception expected");
@@ -96,9 +99,58 @@
     }
     
     @Test
+    public void testThrottleWithMessageSelector() {
+        
+        DefaultMessageListenerContainer springContainer = new DefaultMessageListenerContainer();
+        springContainer.setCacheLevel(2);
+        JMSConfiguration config = new JMSConfiguration();
+        config.setMaxSuspendedContinuations(1);
+        
+        TestJMSContinuationWrapper cw = 
+            new TestJMSContinuationWrapper(b, m, observer, continuations,
+                                           springContainer, config);
+        
+        assertNull(springContainer.getMessageSelector());
+        assertEquals(JMSContinuation.BOGUS_MESSAGE_SELECTOR, cw.getCurrentMessageSelector());
+        
+        suspendResumeCheckSelector(cw, springContainer);
+        EasyMock.reset(observer);
+        suspendResumeCheckSelector(cw, springContainer);
+        
+    }
+    
+    private void suspendResumeCheckSelector(JMSContinuation cw, 
+                                            DefaultMessageListenerContainer springContainer)
{
+        try {
+            cw.suspend(5000);
+            fail("SuspendInvocation exception expected");
+        } catch (SuspendedInvocationException ex) {
+            // ignore
+        }
+        assertEquals(continuations.size(), 1);
+        assertSame(continuations.get(0), cw);
+        
+        assertFalse(cw.suspend(1000));
+        
+        assertEquals(JMSContinuation.BOGUS_MESSAGE_SELECTOR, springContainer.getMessageSelector());
+        assertNull(cw.getCurrentMessageSelector());        
+        
+        observer.onMessage(m);
+        EasyMock.expectLastCall();
+        EasyMock.replay(observer);
+        
+        cw.resume();
+        
+        assertEquals(continuations.size(), 0);
+        EasyMock.verify(observer);
+        
+        assertNull(springContainer.getMessageSelector());
+        assertEquals(JMSContinuation.BOGUS_MESSAGE_SELECTOR, cw.getCurrentMessageSelector());
+    }
+    
+    @Test
     public void testUserObject() {
-        JMSContinuation cw = 
-            new JMSContinuation(b, m, observer, continuations);
+        JMSContinuation cw = new JMSContinuation(b, m, observer, continuations, null, null);
         assertNull(cw.getObject());
         Object userObject = new Object();
         cw.setObject(userObject);
@@ -113,8 +165,10 @@
         public TestJMSContinuationWrapper(Bus b,
                                           Message m, 
                                           MessageObserver observer,
-                                          List<JMSContinuation> cList) {
-            super(b, m, observer, cList);
+                                          List<JMSContinuation> cList,
+                                          DefaultMessageListenerContainer jmsListener,
+                                          JMSConfiguration jmsConfig) {
+            super(b, m, observer, cList, jmsListener, jmsConfig);
         }
         
         public void createTimerTask(long timeout) {

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/resources/jms_test_config.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/resources/jms_test_config.xml?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/resources/jms_test_config.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/resources/jms_test_config.xml Fri
Apr 17 15:44:11 2009
@@ -107,6 +107,7 @@
   	p:usingEndpointInfo="false"
   	p:concurrentConsumers="3"
   	p:maxConcurrentConsumers="5"
+  	p:maxSuspendedContinuations="2"
   />    
  
 <!--

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
Fri Apr 17 15:44:11 2009
@@ -61,7 +61,7 @@
                    launchServer(EmbeddedJMSBrokerLauncher.class, props, null));
 
         assertTrue("server did not launch correctly", 
-                   launchServer(Server2.class, false));
+                   launchServer(Server2.class));
         serversStarted = true;
     }
     

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml?rev=766061&r1=766060&r2=766061&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/continuations/jms_test_config.xml
Fri Apr 17 15:44:11 2009
@@ -31,6 +31,11 @@
     
     <jms:conduit name="{http://cxf.apache.org/systest/jaxws}HelloContinuationPort.jms-conduit">
       <jms:clientConfig clientReceiveTimeout="500000" messageTimeToLive="500000"/>
+      <jms:address jndiConnectionFactoryName="ConnectionFactory" 
+                   jndiDestinationName="dynamicQueues/test.jmstransport.text">
+                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
+               </jms:address>
       <jms:jmsConfig-ref>jmsConf1</jms:jmsConfig-ref>
     </jms:conduit>
     
@@ -44,7 +49,25 @@
     
   <bean id="jmsConf1" class="org.apache.cxf.transport.jms.JMSConfiguration"
     p:connectionFactory-ref="singleConnectionFactory" 
-  	p:concurrentConsumers="10"
-  	p:maxConcurrentConsumers="10"/>
+  	p:concurrentConsumers="1"
+  	p:maxConcurrentConsumers="1"/>
+
+  <jms:destination name="{http://cxf.apache.org/systest/jaxws}HelloContinuationPort.jms-destination">
    
+      <jms:address jndiConnectionFactoryName="ConnectionFactory" 
+                   jndiDestinationName="dynamicQueues/test.jmstransport.text">
+                   <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+                   <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61500"/>
+               </jms:address>
+      <jms:jmsConfig-ref>jmsConf2</jms:jmsConfig-ref>  
+  </jms:destination>
+
+  <bean id="jmsConf2" class="org.apache.cxf.transport.jms.JMSConfiguration"
+  	p:connectionFactory-ref="jmsConnectionFactory"
+  	p:timeToLive="500000"
+  	p:concurrentConsumers="1"
+  	p:maxConcurrentConsumers="1"
+  	p:maxSuspendedContinuations="1"
+  	p:cacheLevel="2"
+  />  
 
 </beans>



Mime
View raw message