cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r725763 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ rt/transports/jms/src/main/resources/schemas/wsdl/ tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/
Date Thu, 11 Dec 2008 18:16:43 GMT
Author: dkulp
Date: Thu Dec 11 10:16:42 2008
New Revision: 725763

URL: http://svn.apache.org/viewvc?rev=725763&view=rev
Log:
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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
  (props changed)

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 10:16:42 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=725763&r1=725762&r2=725763&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Thu Dec 11 10:16:42 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.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=725763&r1=725762&r2=725763&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Thu
Dec 11 10:16:42 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>

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 11 10:16:42 2008
@@ -1 +1 @@
-/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl:722412,722988,723378,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688
+/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_async_noservice.wsdl:722412,722988,723378,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754



Mime
View raw message