cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r702649 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
Date Tue, 07 Oct 2008 21:44:20 GMT
Author: dkulp
Date: Tue Oct  7 14:44:19 2008
New Revision: 702649

URL: http://svn.apache.org/viewvc?rev=702649&view=rev
Log:
Merged revisions 701862 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r701862 | cschneider | 2008-10-05 15:24:44 -0400 (Sun, 05 Oct 2008) | 1 line
  
  CXF-1832 JMSConfigFeature Server part
........

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/JMSConfigFeature.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  7 14:44:19 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,702267,702547,702561,702580,702602,702609
+/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,702267,702547,702561,702580,702602,702609

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/JMSConfigFeature.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java?rev=702649&r1=702648&r2=702649&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java
Tue Oct  7 14:44:19 2008
@@ -20,12 +20,14 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.Destination;
 import org.springframework.beans.factory.annotation.Required;
 
 /**
- * Allows to configure the JMSConfiguration directly at the Client or Endpoint. Simply add
this class to the
+ * Allows to configure the JMSConfiguration directly at the Client or Server. Simply add
this class to the
  * Features and reference a JMSConfiguration. The configuration inside this class takes precedence
over a
  * configuration that is generated from the old configuration style.
  */
@@ -42,6 +44,16 @@
         super.initialize(client, bus);
     }
 
+    @Override
+    public void initialize(Server server, Bus bus) {
+        Destination destination = server.getDestination();
+        if (destination instanceof JMSDestination && jmsConfig != null) {
+            JMSDestination jmsConduit = (JMSDestination)destination;
+            jmsConduit.setJmsConfig(jmsConfig);
+        }
+        super.initialize(server, bus);
+    }
+    
     public JMSConfiguration getJmsConfig() {
         return jmsConfig;
     }



Mime
View raw message