cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1385236 - in /cxf/branches/2.5.x-fixes: ./ services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
Date Sun, 16 Sep 2012 09:25:22 GMT
Author: ningjiang
Date: Sun Sep 16 09:25:22 2012
New Revision: 1385236

URL: http://svn.apache.org/viewvc?rev=1385236&view=rev
Log:
Merged revisions 1385235 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1385235 | ningjiang | 2012-09-16 17:04:08 +0800 (Sun, 16 Sep 2012) | 9 lines
  
  Merged revisions 1385231 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1385231 | ningjiang | 2012-09-16 16:48:43 +0800 (Sun, 16 Sep 2012) | 1 line
    
    CXF-4506 Added the support to set the userName and password on WSN service
  ........
................

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java
    cxf/branches/2.5.x-fixes/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Sep 16 09:25:22 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.6.x-fixes:1385235
+/cxf/trunk:1385231

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

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java?rev=1385236&r1=1385235&r2=1385236&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java
(original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java
Sun Sep 16 09:25:22 2012
@@ -34,6 +34,9 @@ import org.apache.cxf.wsn.AbstractNotifi
 public class Service {
     String rootURL = "http://0.0.0.0:9000/wsn";
     String activeMqUrl = "vm:(broker:(tcp://localhost:6000)?persistent=false)";
+    String userName;
+    String password;
+    
     boolean jmxEnable = true;
 
     AbstractCreatePullPoint createPullPointServer;
@@ -43,6 +46,10 @@ public class Service {
         for (int x = 0; x < args.length; x++) {
             if ("-brokerUrl".equals(args[x])) {
                 activeMqUrl = args[++x];
+            } else if ("-userName".equals(args[x])) {
+                userName = args[++x];
+            } else if ("-password".equals(args[x])) {
+                password = args[++x];
             } else if ("-rootUrl".equals(args[x])) {
                 rootURL = args[++x];
             } else if ("-jmxEnable".equals(args[x])) {
@@ -61,7 +68,7 @@ public class Service {
     }
 
     public void start() throws Exception {
-        ActiveMQConnectionFactory activemq = new ActiveMQConnectionFactory(activeMqUrl);
+        ActiveMQConnectionFactory activemq = new ActiveMQConnectionFactory(userName, password,
activeMqUrl);
 
         notificationBrokerServer = new JaxwsNotificationBroker("WSNotificationBroker", activemq);
         notificationBrokerServer.setAddress(rootURL + "/NotificationBroker");

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml?rev=1385236&r1=1385235&r2=1385236&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
(original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
Sun Sep 16 09:25:22 2012
@@ -31,7 +31,9 @@
 
     <!-- ActiveMQ connection factory -->
     <bean id="activemq" class="org.apache.activemq.ActiveMQConnectionFactory">
-        <argument value="${cxf.wsn.activemq}" />
+        <property name="brokerURL" value="${cxf.wsn.activemq}" />
+        <property name="userName" value="${cxf.wsn.activemq.username}" />
+        <property name="password" value="${cxf.wsn.activemq.password}" />
     </bean>
 
     <!-- NotificationBroker -->



Mime
View raw message