Author: ningjiang Date: Tue Sep 25 03:14:06 2012 New Revision: 1389695 URL: http://svn.apache.org/viewvc?rev=1389695&view=rev Log: Merged revisions 1389693 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1389693 | ningjiang | 2012-09-25 11:05:41 +0800 (Tue, 25 Sep 2012) | 9 lines Merged revisions 1389691 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1389691 | ningjiang | 2012-09-25 10:52:03 +0800 (Tue, 25 Sep 2012) | 1 line CXF-4506 update the activemq connector configuration on the wsn-core ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1389691 Merged /cxf/branches/2.6.x-fixes:r1389693 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/resources/OSGI-INF/blueprint/cxf-wsn.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml?rev=1389695&r1=1389694&r2=1389695&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml (original) +++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml Tue Sep 25 03:14:06 2012 @@ -26,12 +26,16 @@ <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> <!-- 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 -->
