Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74E10DB90 for ; Sun, 16 Sep 2012 08:49:40 +0000 (UTC) Received: (qmail 35442 invoked by uid 500); 16 Sep 2012 08:49:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35209 invoked by uid 500); 16 Sep 2012 08:49:33 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 35147 invoked by uid 99); 16 Sep 2012 08:49:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Sep 2012 08:49:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Sep 2012 08:49:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 595B023888E3; Sun, 16 Sep 2012 08:48:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1385231 - in /cxf/trunk/services/wsn: wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Date: Sun, 16 Sep 2012 08:48:44 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120916084844.595B023888E3@eris.apache.org> Author: ningjiang Date: Sun Sep 16 08:48:43 2012 New Revision: 1385231 URL: http://svn.apache.org/viewvc?rev=1385231&view=rev Log: CXF-4506 Added the support to set the userName and password on WSN service Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java?rev=1385231&r1=1385230&r2=1385231&view=diff ============================================================================== --- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java (original) +++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/Service.java Sun Sep 16 08:48:43 2012 @@ -33,6 +33,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; @@ -42,6 +45,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])) { @@ -60,7 +67,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/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml?rev=1385231&r1=1385230&r2=1385231&view=diff ============================================================================== --- cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml (original) +++ cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Sun Sep 16 08:48:43 2012 @@ -31,7 +31,9 @@ - + + +