You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/09/24 09:06:01 UTC
svn commit: r1389226 - in /cxf/branches/2.5.x-fixes: ./
services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml
Author: ningjiang
Date: Mon Sep 24 07:06:00 2012
New Revision: 1389226
URL: http://svn.apache.org/viewvc?rev=1389226&view=rev
Log:
Merged revisions 1387067 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................
r1387067 | ningjiang | 2012-09-18 17:19:54 +0800 (Tue, 18 Sep 2012) | 9 lines
Merged revisions 1387065 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1387065 | ningjiang | 2012-09-18 17:08:41 +0800 (Tue, 18 Sep 2012) | 1 line
CXF-4506 setup the default value on the username and password
........
................
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
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 Mon Sep 24 07:06:00 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.6.x-fixes:1387067
+/cxf/trunk:1387065
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1389226&r1=1389225&r2=1389226&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 Mon Sep 24 07:06:00 2012
@@ -26,6 +26,8 @@
<cm:property name="cxf.wsn.activemq" value="vm:localhost"/>
<cm:property name="cxf.wsn.rootUrl" value="http://0.0.0.0:8182" />
<cm:property name="cxf.wsn.context" value="/wsn" />
+ <cm:property name="cxf.wsn.activemq.username" value="user" />
+ <cm:property name="cxf.wsn.activemq.password" value="password" />
</cm:default-properties>
</cm:property-placeholder>