You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/12/11 19:54:04 UTC
svn commit: r725778 - in /cxf/branches/2.0.x-fixes: ./
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Author: dkulp
Date: Thu Dec 11 10:54:04 2008
New Revision: 725778
URL: http://svn.apache.org/viewvc?rev=725778&view=rev
Log:
Merged revisions 725763 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r725763 | dkulp | 2008-12-11 13:16:42 -0500 (Thu, 11 Dec 2008) | 9 lines
Merged revisions 725754 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r725754 | dkulp | 2008-12-11 12:35:50 -0500 (Thu, 11 Dec 2008) | 2 lines
Add a flag to the old config to turn on the reconnectOnException support in the spring JMS connection stuff.
........
................
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/JMSOldConfigHolder.java
cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 10:54:04 2008
@@ -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,725774
-/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,725773
+/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
+/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
/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/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=725778&r1=725777&r2=725778&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 Thu Dec 11 10:54:04 2008
@@ -47,10 +47,16 @@
private ServerConfig serverConfig;
private ServerBehaviorPolicyType serverBehavior;
- private ConnectionFactory getConnectionFactoryFromJndi(String connectionFactoryName, String userName,
- String password, JndiTemplate jt,
- boolean use11,
+ private ConnectionFactory getConnectionFactoryFromJndi(JndiTemplate jt,
boolean pubSubDomain) {
+
+ String connectionFactoryName = address.getJndiConnectionFactoryName();
+ String userName = address.getConnectionUserName();
+ String password = address.getConnectionPassword();
+ boolean use11 = address.isSetUseJms11()
+ ? address.isUseJms11() : JMSConfiguration.DEFAULT_USEJMS11;
+
+
if (connectionFactoryName == null) {
return null;
}
@@ -62,15 +68,24 @@
uccf.setTargetConnectionFactory(connectionFactory);
if (use11) {
- return new SingleConnectionFactory(uccf);
+ SingleConnectionFactory cf = new SingleConnectionFactory(uccf);
+ if (address.isSetReconnectOnException() && address.isReconnectOnException()) {
+ cf.setReconnectOnException(true);
+ }
+ return cf;
}
- return new SingleConnectionFactory102(uccf, pubSubDomain);
+ SingleConnectionFactory102 cf = new SingleConnectionFactory102(uccf, pubSubDomain);
+ if (address.isSetReconnectOnException() && address.isReconnectOnException()) {
+ cf.setReconnectOnException(true);
+ }
+ return cf;
} catch (NamingException e) {
throw new RuntimeException(e);
}
}
- public JMSConfiguration createJMSConfigurationFromEndpointInfo(Bus bus, EndpointInfo endpointInfo,
+ public JMSConfiguration createJMSConfigurationFromEndpointInfo(Bus bus,
+ EndpointInfo endpointInfo,
boolean isConduit) {
jmsConfig = new JMSConfiguration();
@@ -99,10 +114,7 @@
if (address.isSetDestinationStyle()) {
pubSubDomain = DestinationStyleType.TOPIC == address.getDestinationStyle();
}
- ConnectionFactory cf = getConnectionFactoryFromJndi(address.getJndiConnectionFactoryName(), address
- .getConnectionUserName(), address.getConnectionPassword(), jt,
- address.isSetUseJms11() ? address.isUseJms11() : JMSConfiguration.DEFAULT_USEJMS11,
- pubSubDomain);
+ ConnectionFactory cf = getConnectionFactoryFromJndi(jt, pubSubDomain);
jmsConfig.setConnectionFactory(cf);
jmsConfig.setDurableSubscriptionName(serverBehavior.getDurableSubscriberName());
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=725778&r1=725777&r2=725778&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 Thu Dec 11 10:54:04 2008
@@ -215,7 +215,8 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="useJms11" type="xs:boolean" use="optional"></xs:attribute>
+ <xs:attribute name="useJms11" type="xs:boolean" use="optional"/>
+ <xs:attribute name="reconnectOnException" type="xs:boolean" use="optional"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>