Author: dkulp
Date: Wed Jul 8 20:53:01 2009
New Revision: 792315
URL:
http://svn.apache.org/viewvc?rev=792315&view=revLog:
Merged revisions 792306 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes................
r792306 | dkulp | 2009-07-08 16:38:26 -0400 (Wed, 08 Jul 2009) | 18 lines
Merged revisions 792288 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r792288 | dkulp | 2009-07-08 16:16:35 -0400 (Wed, 08 Jul 2009) | 11 lines
Merged revisions 792262 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r792262 | dkulp | 2009-07-08 15:01:58 -0400 (Wed, 08 Jul 2009) | 3 lines
[CXF-2316] Support for replyTo header even on one-ways (a bit against
spec, but some older servers expect it). Patch from Marat Bedretdinov
applied.
........
................
................
Added:
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWays.java
- copied unchanged from r792306, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWays.java
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWaysDeferredReply.java
- copied unchanged from r792306, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueDecoupledOneWaysDeferredReply.java
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/JMSConduit.java
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
cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 8 20:53:01 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
-/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
-/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
+/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-792306
+/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
+/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-792262
/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/JMSConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=792315&r1=792314&r2=792315&view=diff==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Wed Jul 8 20:53:01 2009
@@ -32,6 +32,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageListener;
import javax.jms.Session;
@@ -112,7 +113,7 @@
if (outMessage == null) {
throw new RuntimeException("Exchange to be sent has no outMessage");
}
-
+
boolean isTextPayload = JMSConstants.TEXT_MESSAGE_TYPE.equals(jmsConfig.getMessageType());
if (isTextPayload && MessageUtils.isTrue(outMessage.getContextualProperty(
org.apache.cxf.message.Message.MTOM_ENABLED))
@@ -122,10 +123,10 @@
throw new ConfigurationException(msg);
}
- JMSMessageHeadersType headers = (JMSMessageHeadersType)outMessage
+ final JMSMessageHeadersType headers = (JMSMessageHeadersType)outMessage
.get(JMSConstants.JMS_CLIENT_REQUEST_HEADERS);
- JmsTemplate jmsTemplate = JMSFactory.createJmsTemplate(jmsConfig, headers);
+ final JmsTemplate jmsTemplate = JMSFactory.createJmsTemplate(jmsConfig, headers);
String userCID = headers != null ? headers.getJMSCorrelationID() : null;
DefaultMessageListenerContainer jmsList = jmsListener;
if (!exchange.isOneWay()) {
@@ -162,8 +163,19 @@
public javax.jms.Message createMessage(Session session) throws JMSException {
String messageType = jmsConfig.getMessageType();
final javax.jms.Message jmsMessage;
- jmsMessage = JMSUtils.buildJMSMessageFromCXFMessage(outMessage, request, messageType,
- session, replyTo,
+ Destination replyToDestination = replyTo;
+ if (exchange.isOneWay() && !jmsConfig.isEnforceSpec()) {
+ final String contextReplyToName =
+ (headers != null) ? headers.getJMSReplyTo() : null;
+ if (contextReplyToName != null) {
+ replyToDestination =
+ JMSFactory.resolveOrCreateDestination(jmsTemplate,
+ contextReplyToName,
+ jmsConfig.isPubSubDomain());
+ }
+ }
+ jmsMessage = JMSUtils.buildJMSMessageFromCXFMessage(outMessage, request,
+ messageType, session, replyToDestination,
correlationId);
LOG.log(Level.FINE, "client sending request: ", jmsMessage);
return jmsMessage;
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=792315&r1=792314&r2=792315&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 Jul 8 20:53:01 2009
@@ -80,6 +80,7 @@
private long recoveryInterval = DEFAULT_VALUE;
private int cacheLevel = DEFAULT_VALUE;
private String cacheLevelName;
+ private boolean enforceSpec = true;
private ConnectionFactory wrappedConnectionFactory;
@@ -437,4 +438,11 @@
this.durableSubscriptionClientId = durableSubscriptionClientId;
}
+ public boolean isEnforceSpec() {
+ return enforceSpec;
+ }
+
+ public void setEnforceSpec(boolean enforceSpec) {
+ this.enforceSpec = enforceSpec;
+ }
}
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=792315&r1=792314&r2=792315&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 Jul 8 20:53:01 2009
@@ -196,7 +196,7 @@
* @param pubSubDomain true=pubSub, false=Queues
* @return resolved destination
*/
- private static Destination resolveOrCreateDestination(final JmsTemplate jmsTemplate,
+ protected static Destination resolveOrCreateDestination(final JmsTemplate jmsTemplate,
final String replyToDestinationName,
final boolean pubSubDomain) {
return (Destination)jmsTemplate.execute(new SessionCallback() {
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=792315&r1=792314&r2=792315&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 Jul 8 20:53:01 2009
@@ -104,6 +104,7 @@
if (clientConfig.isSetConduitSelectorPrefix()) {
jmsConfig.setConduitSelectorPrefix(clientConfig.getConduitSelectorPrefix());
}
+ jmsConfig.setEnforceSpec(clientConfig.isEnforceSpec());
jmsConfig.setSubscriptionDurable(serverBehavior.isSetDurableSubscriberName());
jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName());
jmsConfig.setDurableSubscriptionClientId(serverConfig.getDurableSubscriptionClientId());
Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=792315&r1=792314&r2=792315&view=diff==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Wed Jul 8 20:53:01 2009
@@ -35,7 +35,9 @@
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.ObjectMessage;
+import javax.jms.Queue;
import javax.jms.Session;
+import javax.jms.Topic;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
@@ -150,6 +152,15 @@
headers.setJMSTimeStamp(new Long(message.getJMSTimestamp()));
headers.setJMSType(message.getJMSType());
+ if (message.getJMSReplyTo() != null) {
+ Destination replyTo = message.getJMSReplyTo();
+ if (replyTo instanceof Queue) {
+ headers.setJMSReplyTo(((Queue)replyTo).getQueueName());
+ } else if (replyTo instanceof Topic) {
+ headers.setJMSReplyTo(((Topic)replyTo).getTopicName());
+ }
+ }
+
Map<String, List<String>> protHeaders = new HashMap<String, List<String>>();
List<JMSPropertyType> props = headers.getProperty();
Enumeration enm = message.getPropertyNames();
Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=792315&r1=792314&r2=792315&view=diff==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Wed Jul 8 20:53:01 2009
@@ -56,6 +56,7 @@
default="0" />
<xs:attribute name="conduitSelectorPrefix" type="xs:string" use="optional" default=""/>
<xs:attribute name="useConduitIdSelector" type="xs:boolean" use="optional"/>
+ <xs:attribute name="enforceSpec" type="xs:boolean" use="optional" default="true"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -89,6 +90,7 @@
<xs:attribute name="JMSMessageID" type="xs:string"/>
<xs:attribute name="JMSPriority" type="xs:int"/>
<xs:attribute name="JMSRedelivered" type="xs:boolean"/>
+ <xs:attribute name="JMSReplyTo" type="xs:string"/>
<xs:attribute name="JMSTimeStamp" type="xs:long"/>
<xs:attribute name="JMSType" type="xs:string"/>
<xs:attribute name="TimeToLive" type="xs:long"/>
Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=792315&r1=792314&r2=792315&view=diff==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Wed Jul 8 20:53:01 2009
@@ -32,10 +32,13 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Endpoint;
import javax.xml.ws.Holder;
import javax.xml.ws.soap.SOAPBinding;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.hello_world_jms.BadRecordLitFault;
import org.apache.cxf.hello_world_jms.HWByteMsgService;
import org.apache.cxf.hello_world_jms.HelloWorldOneWayPort;
@@ -43,6 +46,7 @@
import org.apache.cxf.hello_world_jms.HelloWorldPortType;
import org.apache.cxf.hello_world_jms.HelloWorldPubSubPort;
import org.apache.cxf.hello_world_jms.HelloWorldPubSubService;
+import org.apache.cxf.hello_world_jms.HelloWorldQueueDecoupledOneWaysService;
import org.apache.cxf.hello_world_jms.HelloWorldService;
import org.apache.cxf.hello_world_jms.HelloWorldServiceAppCorrelationIDNoPrefix;
import org.apache.cxf.hello_world_jms.HelloWorldServiceAppCorrelationIDStaticPrefix;
@@ -51,27 +55,26 @@
import org.apache.cxf.hello_world_jms.NoSuchCodeLitFault;
import org.apache.cxf.jms_mtom.JMSMTOMPortType;
import org.apache.cxf.jms_mtom.JMSMTOMService;
+import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.transport.jms.AddressType;
+import org.apache.cxf.transport.jms.JMSConduit;
import org.apache.cxf.transport.jms.JMSConstants;
import org.apache.cxf.transport.jms.JMSMessageHeadersType;
+import org.apache.cxf.transport.jms.JMSNamingPropertyType;
import org.apache.cxf.transport.jms.JMSPropertyType;
import org.apache.hello_world_doc_lit.Greeter;
import org.apache.hello_world_doc_lit.PingMeFault;
import org.apache.hello_world_doc_lit.SOAPService2;
-import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JMSClientServerTest extends AbstractBusClientServerTestBase {
- protected static boolean serversStarted;
-
- @Before
- public void startServers() throws Exception {
- if (serversStarted) {
- return;
- }
+ @BeforeClass
+ public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
if (System.getProperty("activemq.store.dir") != null) {
props.put("activemq.store.dir", System.getProperty("activemq.store.dir"));
@@ -84,7 +87,6 @@
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
- serversStarted = true;
}
public URL getWSDLURL(String s) throws Exception {
@@ -112,6 +114,17 @@
String response2 = new String("Bonjour");
try {
Greeter greeter = service.getPort(portName, Greeter.class);
+ Client client = ClientProxy.getClient(greeter);
+ EndpointInfo ei = client.getEndpoint().getEndpointInfo();
+ AddressType address = ei.getTraversedExtensor(new AddressType(), AddressType.class);
+ JMSNamingPropertyType name = new JMSNamingPropertyType();
+ JMSNamingPropertyType password = new JMSNamingPropertyType();
+ name.setName("java.naming.security.principal");
+ name.setValue("ivan");
+ password.setName("java.naming.security.credentials");
+ password.setValue("the-terrible");
+ address.getJMSNamingProperty().add(name);
+ address.getJMSNamingProperty().add(password);
for (int idx = 0; idx < 5; idx++) {
greeter.greetMeOneWay("test String");
@@ -225,6 +238,8 @@
}
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
+ } catch (Exception t) {
+ throw t;
}
}
@@ -275,7 +290,7 @@
greeter.greetMeOneWay("JMS:PubSub:Milestone-" + idx);
}
//Give some time to complete one-way calls.
- Thread.sleep(100L);
+ Thread.sleep(50L);
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
}
@@ -299,7 +314,7 @@
greeter.greetMeOneWay("JMS:PubSub:Milestone-" + idx);
}
//Give some time to complete one-way calls.
- Thread.sleep(100L);
+ Thread.sleep(50L);
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
}
@@ -381,6 +396,131 @@
}
}
+ @Test
+ public void testQueueDecoupledOneWaysConnection() throws Exception {
+ QName serviceName = getServiceName(new QName("
http://cxf.apache.org/hello_world_jms",
+ "HelloWorldQueueDecoupledOneWaysService"));
+ QName portName = getPortName(new QName("
http://cxf.apache.org/hello_world_jms",
+ "HelloWorldQueueDecoupledOneWaysPort"));
+ URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+ assertNotNull(wsdl);
+
+ HelloWorldQueueDecoupledOneWaysService service =
+ new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
+ assertNotNull(service);
+ Endpoint requestEndpoint = null;
+ Endpoint replyEndpoint = null;
+ try {
+ HelloWorldOneWayPort greeter = service.getPort(portName, HelloWorldOneWayPort.class);
+ GreeterImplQueueDecoupledOneWays requestServant = new GreeterImplQueueDecoupledOneWays();
+ requestEndpoint = Endpoint.publish("", requestServant);
+ GreeterImplQueueDecoupledOneWaysDeferredReply replyServant =
+ new GreeterImplQueueDecoupledOneWaysDeferredReply();
+ replyEndpoint = Endpoint.publish("", replyServant);
+
+ InvocationHandler handler = Proxy.getInvocationHandler(greeter);
+ BindingProvider bp = (BindingProvider)handler;
+ Map<String, Object> requestContext = bp.getRequestContext();
+ JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
+ requestHeader.setJMSReplyTo("dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply");
+ requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, requestHeader);
+ String expectedRequest = "JMS:Queue:Request";
+ greeter.greetMeOneWay(expectedRequest);
+ String request = requestServant.ackRequestReceived(5000);
+ if (request == null) {
+ if (requestServant.getException() != null) {
+ fail(requestServant.getException().getMessage());
+ } else {
+ fail("The oneway call didn't reach its intended endpoint");
+ }
+ }
+ assertEquals(expectedRequest, request);
+ requestServant.proceedWithReply();
+ String expectedReply = requestServant.ackReplySent(5000);
+ if (expectedReply == null) {
+ if (requestServant.getException() != null) {
+ fail(requestServant.getException().getMessage());
+ } else {
+ fail("The decoupled one-way reply was not sent");
+ }
+ }
+ String reply = replyServant.ackRequest(5000);
+ if (reply == null) {
+ if (replyServant.getException() != null) {
+ fail(replyServant.getException().getMessage());
+ } else {
+ fail("The decoupled one-way reply didn't reach its intended endpoint");
+ }
+ }
+ assertEquals(expectedReply, reply);
+ } catch (Exception ex) {
+ throw ex;
+ } finally {
+ if (requestEndpoint != null) {
+ requestEndpoint.stop();
+ }
+ if (replyEndpoint != null) {
+ replyEndpoint.stop();
+ }
+ }
+ }
+
+ @Test
+ public void testQueueOneWaySpecCompliantConnection() throws Exception {
+ QName serviceName = getServiceName(new QName("
http://cxf.apache.org/hello_world_jms",
+ "HelloWorldQueueDecoupledOneWaysService"));
+ QName portName = getPortName(new QName("
http://cxf.apache.org/hello_world_jms",
+ "HelloWorldQueueDecoupledOneWaysPort"));
+ URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+ assertNotNull(wsdl);
+
+ HelloWorldQueueDecoupledOneWaysService service =
+ new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
+ assertNotNull(service);
+ Endpoint requestEndpoint = null;
+ try {
+ HelloWorldOneWayPort greeter = service.getPort(portName, HelloWorldOneWayPort.class);
+ GreeterImplQueueDecoupledOneWays requestServant = new GreeterImplQueueDecoupledOneWays(true);
+ requestEndpoint = Endpoint.publish("", requestServant);
+
+ Client client = ClientProxy.getClient(greeter);
+ ((JMSConduit)client.getConduit()).getJmsConfig().setEnforceSpec(true);
+ InvocationHandler handler = Proxy.getInvocationHandler(greeter);
+ BindingProvider bp = (BindingProvider)handler;
+ Map<String, Object> requestContext = bp.getRequestContext();
+ JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
+ requestHeader.setJMSReplyTo("dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply");
+ requestContext.put(JMSConstants.JMS_CLIENT_REQUEST_HEADERS, requestHeader);
+ String expectedRequest = "JMS:Queue:Request";
+ greeter.greetMeOneWay(expectedRequest);
+ String request = requestServant.ackRequestReceived(5000);
+ if (request == null) {
+ if (requestServant.getException() != null) {
+ fail(requestServant.getException().getMessage());
+ } else {
+ fail("The oneway call didn't reach its intended endpoint");
+ }
+ }
+ assertEquals(expectedRequest, request);
+ requestServant.proceedWithReply();
+ boolean ack = requestServant.ackNoReplySent(5000);
+ if (!ack) {
+ if (requestServant.getException() != null) {
+ fail(requestServant.getException().getMessage());
+ } else {
+ fail("The decoupled one-way reply was sent");
+ }
+ }
+ } catch (Exception ex) {
+ throw ex;
+ } finally {
+ if (requestEndpoint != null) {
+ requestEndpoint.stop();
+ }
+ }
+
+ }
+
private static interface CorrelationIDFactory {
String createCorrealtionID();
}
@@ -527,7 +667,7 @@
HelloWorldPortType port = service.getPort(portName, HelloWorldPortType.class);
- for (int i = 0; i < 100; ++i) {
+ for (int i = 0; i < 10; ++i) {
ClientRunnable client =
new ClientRunnable(port,
new CorrelationIDFactory() {
@@ -609,7 +749,7 @@
HelloWorldPortType portEng = service.getPort(portNameEng, HelloWorldPortType.class);
HelloWorldPortType portSales = service.getPort(portNameSales, HelloWorldPortType.class);
- for (int i = 0; i < 100; ++i) {
+ for (int i = 0; i < 10; ++i) {
ClientRunnable client = new ClientRunnable(portEng, "com.mycompany.eng:");
Thread thread = new Thread(client);
threads.add(thread);
@@ -654,7 +794,7 @@
HelloWorldPortType port = service.getPort(portName, HelloWorldPortType.class);
- for (int i = 0; i < 100; ++i) {
+ for (int i = 0; i < 10; ++i) {
ClientRunnable client =
new ClientRunnable(port);
Modified: cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl?rev=792315&r1=792314&r2=792315&view=diff==============================================================================
--- cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl (original)
+++ cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/jms_test.wsdl Wed Jul 8 20:53:01 2009
@@ -504,6 +504,27 @@
</port>
</service>
+ <service name="HelloWorldQueueDecoupledOneWaysService">
+ <port binding="tns:HelloWorldOneWayBinding" name="HelloWorldQueueDecoupledOneWaysPort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.oneway.with.set.replyto">
+ <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:clientConfig enforceSpec="false"/>
+ </port>
+ <port binding="tns:HelloWorldOneWayBinding" name="HelloWorldQueueDecoupledOneWaysReplyPort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.oneway.with.set.replyto.reply">
+ <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>
+ </port>
+
+ </service>
+
<service name="HelloWorldPubSubService">
<port binding="tns:HelloWorldPubSubBinding" name="HelloWorldPubSubPort">
<jms:address
