Author: dkulp Date: Thu Jul 16 19:45:52 2009 New Revision: 794811 URL: http://svn.apache.org/viewvc?rev=794811&view=rev Log: Merged revisions 794807 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r794807 | dkulp | 2009-07-16 15:41:56 -0400 (Thu, 16 Jul 2009) | 17 lines Merged revisions 794799 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r794799 | dkulp | 2009-07-16 15:35:27 -0400 (Thu, 16 Jul 2009) | 10 lines Merged revisions 794779 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r794779 | dkulp | 2009-07-16 15:02:36 -0400 (Thu, 16 Jul 2009) | 2 lines [CXF-2343] Change jms transport throttling to use a disconnect/reconnect instead of bogus message selector. Patch from Paul Hadrosek applied. ........ ................ ................ 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/continuations/JMSContinuation.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/JMSContinuationTest.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/test/resources/jms_test_config.xml Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 16 19:45:52 2009 @@ -1,4 +1,4 @@ -/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,758347,758404,759994-759996,760076,760154,760469,761762,761790,762395,764047-764048,764052,764058,764062,764147,764587,764892,766045,766119,766964,767152,767155,767160,767187,772161,772661-772662,772668,772686,772720,773080,773082,773086-773087,773147,773946-773950,774790,774800,774803,774818,774823,774827,775950,775952,776033,776235,777198,777200,777226,780202,780918,780960,781586,781843,783117,783415,784067,785305,785308,786029,786160,786600,786642,786663,787289,787296,787298,787373,789755,789757-789758,789760,789763,789918,789924-789925,790663,790671,790673,792305-792307,793011,793014,794411-794694,794805 -/cxf/branches/2.2.x-fixes:783099,783407,784064,785293,785299,786158,786592,786640,787272,787282-787283,787367,789423,789707,789709-789710,789712,789905,789908,789910,790647,790654-790655,792276,792288,792291,792995,792998,794404,794797 -/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,743446,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,758308,759963-759964,759966,760073,760150,760468,761759,761789,762393,763272,763495,763931,764034, 764581,764887,766013,766101,766860,766962-766963,767159,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773691,773693,774558,774851,774979,776024,776218,776459,777189,777224,780184,780902,781497,781841,783097,783396,784059,784895,785281,786142,786583,786638,786647,787277-787278,787366,789371,789527-789529,789704,789896,789898-789899,790638,790640-790642,792261-792263,792975,792985,794396,794778 +/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,758347,758404,759994-759996,760076,760154,760469,761762,761790,762395,764047-764048,764052,764058,764062,764147,764587,764892,766045,766119,766964,767152,767155,767160,767187,772161,772661-772662,772668,772686,772720,773080,773082,773086-773087,773147,773946-773950,774790,774800,774803,774818,774823,774827,775950,775952,776033,776235,777198,777200,777226,780202,780918,780960,781586,781843,783117,783415,784067,785305,785308,786029,786160,786600,786642,786663,787289,787296,787298,787373,789755,789757-789758,789760,789763,789918,789924-789925,790663,790671,790673,792305-792307,793011,793014,794411-794694,794805,794807 +/cxf/branches/2.2.x-fixes:783099,783407,784064,785293,785299,786158,786592,786640,787272,787282-787283,787367,789423,789707,789709-789710,789712,789905,789908,789910,790647,790654-790655,792276,792288,792291,792995,792998,794404,794797,794799 +/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,743446,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,758308,759963-759964,759966,760073,760150,760468,761759,761789,762393,763272,763495,763931,764034, 764581,764887,766013,766101,766860,766962-766963,767159,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773691,773693,774558,774851,774979,776024,776218,776459,777189,777224,780184,780902,781497,781841,783097,783396,784059,784895,785281,786142,786583,786638,786647,787277-787278,787366,789371,789527-789529,789704,789896,789898-789899,790638,790640-790642,792261-792263,792975,792985,794396,794778-794779 /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=794811&r1=794810&r2=794811&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 Thu Jul 16 19:45:52 2009 @@ -81,7 +81,8 @@ private int cacheLevel = DEFAULT_VALUE; private String cacheLevelName; private boolean enforceSpec = true; - + private boolean acceptMessagesWhileStopping; + private ConnectionFactory wrappedConnectionFactory; private JNDIConfiguration jndiConfig; @@ -381,7 +382,15 @@ public void setReconnectOnException(boolean reconnectOnException) { this.reconnectOnException = reconnectOnException; } - + + public boolean isAcceptMessagesWhileStopping() { + return acceptMessagesWhileStopping; + } + + public void setAcceptMessagesWhileStopping(boolean acceptMessagesWhileStopping) { + this.acceptMessagesWhileStopping = acceptMessagesWhileStopping; + } + /** * 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 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=794811&r1=794810&r2=794811&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 Thu Jul 16 19:45:52 2009 @@ -159,6 +159,9 @@ + ", please set cacheLevel to the value less than " + " org.springframework.jms.listener.DefaultMessageListenerContainer.CACHE_CONSUMER"); } + if (jmsConfig.isAcceptMessagesWhileStopping()) { + jmsListener.setAcceptMessagesWhileStopping(jmsConfig.isAcceptMessagesWhileStopping()); + } 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/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=794811&r1=794810&r2=794811&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 Thu Jul 16 19:45:52 2009 @@ -33,8 +33,6 @@ import org.springframework.jms.listener.DefaultMessageListenerContainer; public class JMSContinuation implements Continuation { - - static final String BOGUS_MESSAGE_SELECTOR = "orgApacheCxfTransportsJmsContinuations='too-many'"; private Bus bus; private Message inMessage; @@ -43,8 +41,6 @@ private DefaultMessageListenerContainer jmsListener; private JMSConfiguration jmsConfig; - private String currentMessageSelector = BOGUS_MESSAGE_SELECTOR; - private Object userObject; private boolean isNew = true; @@ -163,14 +159,11 @@ // throttle the flow if there're too many continuation instances in memory synchronized (continuations) { modifyList(remove); - if (remove && !BOGUS_MESSAGE_SELECTOR.equals(currentMessageSelector)) { - jmsListener.setMessageSelector(currentMessageSelector); - currentMessageSelector = BOGUS_MESSAGE_SELECTOR; - } else if (!remove && continuations.size() >= jmsConfig.getMaxSuspendedContinuations()) { - currentMessageSelector = jmsListener.getMessageSelector(); - if (!BOGUS_MESSAGE_SELECTOR.equals(currentMessageSelector)) { - jmsListener.setMessageSelector(BOGUS_MESSAGE_SELECTOR); - + if (continuations.size() >= jmsConfig.getMaxSuspendedContinuations()) { + jmsListener.stop(); + } else { + if (!jmsListener.isRunning()) { + jmsListener.start(); } } } @@ -185,9 +178,6 @@ } } - String getCurrentMessageSelector() { - return currentMessageSelector; - } } 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=794811&r1=794810&r2=794811&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 Thu Jul 16 19:45:52 2009 @@ -132,6 +132,8 @@ assertEquals("The maxConcurrentConsumer should be set", jmsConfig.getMaxConcurrentConsumers(), 5); assertEquals("The maxSuspendedContinuations should be set", jmsConfig.getMaxSuspendedContinuations(), 2); + assertTrue("The acceptMessagesWhileStopping should be set to true", + jmsConfig.isAcceptMessagesWhileStopping()); 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/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=794811&r1=794810&r2=794811&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 Thu Jul 16 19:45:52 2009 @@ -33,6 +33,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.springframework.jms.JmsException; import org.springframework.jms.listener.DefaultMessageListenerContainer; @@ -99,9 +100,9 @@ } @Test - public void testThrottleWithMessageSelector() { + public void testThrottleWithJmsStartAndStop() { - DefaultMessageListenerContainer springContainer = new DefaultMessageListenerContainer(); + DefaultMessageListenerContainerStub springContainer = new DefaultMessageListenerContainerStub(); springContainer.setCacheLevel(2); JMSConfiguration config = new JMSConfiguration(); config.setMaxSuspendedContinuations(1); @@ -110,17 +111,17 @@ new TestJMSContinuationWrapper(b, m, observer, continuations, springContainer, config); - assertNull(springContainer.getMessageSelector()); - assertEquals(JMSContinuation.BOGUS_MESSAGE_SELECTOR, cw.getCurrentMessageSelector()); + assertFalse(springContainer.isStart()); + assertFalse(springContainer.isStop()); - suspendResumeCheckSelector(cw, springContainer); + suspendResumeCheckStartAndStop(cw, config, springContainer); EasyMock.reset(observer); - suspendResumeCheckSelector(cw, springContainer); + suspendResumeCheckStartAndStop(cw, config, springContainer); } - private void suspendResumeCheckSelector(JMSContinuation cw, - DefaultMessageListenerContainer springContainer) { + private void suspendResumeCheckStartAndStop(JMSContinuation cw, JMSConfiguration config, + DefaultMessageListenerContainerStub springContainer) { try { cw.suspend(5000); fail("SuspendInvocation exception expected"); @@ -129,12 +130,10 @@ } assertEquals(continuations.size(), 1); assertSame(continuations.get(0), cw); + assertTrue(springContainer.isStop()); assertFalse(cw.suspend(1000)); - assertEquals(JMSContinuation.BOGUS_MESSAGE_SELECTOR, springContainer.getMessageSelector()); - assertNull(cw.getCurrentMessageSelector()); - observer.onMessage(m); EasyMock.expectLastCall(); EasyMock.replay(observer); @@ -142,10 +141,8 @@ cw.resume(); assertEquals(continuations.size(), 0); + assertTrue(springContainer.isStart()); EasyMock.verify(observer); - - assertNull(springContainer.getMessageSelector()); - assertEquals(JMSContinuation.BOGUS_MESSAGE_SELECTOR, cw.getCurrentMessageSelector()); } @Test @@ -191,4 +188,27 @@ return result; } } + + private class DefaultMessageListenerContainerStub extends DefaultMessageListenerContainer { + private boolean start; + private boolean stop; + + public void start() throws JmsException { + this.start = true; + this.stop = false; + } + + public void stop() throws JmsException { + this.stop = true; + this.start = false; + } + + public boolean isStart() { + return this.start; + } + + public boolean isStop() { + return this.stop; + } + } } 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=794811&r1=794810&r2=794811&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 Thu Jul 16 19:45:52 2009 @@ -109,6 +109,7 @@ p:concurrentConsumers="3" p:maxConcurrentConsumers="5" p:maxSuspendedContinuations="2" + p:acceptMessagesWhileStopping="true" /> <!--
