svn commit: r1182076 - in /cxf/trunk: osgi/karaf/features/src/main/resources/features.xml services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml

[dkulp]

Author: dkulp
Date: Tue Oct 11 20:30:46 2011
New Revision: 1182076

URL: http://svn.apache.org/viewvc?rev=1182076&view=rev
Log:
The broker URL when using tcp seems to require a port with recent
versions of ActiveMQ.  Since we don't need it exposed on a port, just
use the pure vm url.

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    
cxf/trunk/services/wsn/wsn-osgi/src/main/resources/OSGI-INF/blueprint/cxf-wsn.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1182076&r1=1182075&r2=1182076&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Oct 11 
20:30:46 2011
@@ -120,7 +120,7 @@
     <feature name="wsn" version="${project.version}" resolver="(obr)">
 
         <config name="org.apache.cxf.wsn">
-            cxf.wsn.activemq = 
vm:broker:(tcp://localhost)?persistent=false&amp;jmx=false
+            cxf.wsn.activemq = vm:localhost?persistent=false&amp;jmx=false
             cxf.wsn.port = 8182
         </config>
 

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=1182076&r1=1182075&r2=1182076&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
 Tue Oct 11 20:30:46 2011
@@ -23,7 +23,7 @@
     <!-- AdminConfig property place holder for the org.apache.cxf.wsn  -->
     <cm:property-placeholder persistent-id="org.apache.cxf.wsn" 
update-strategy="reload">
         <cm:default-properties>
-            <cm:property name="cxf.wsn.activemq" 
value="vm:broker:(tcp://localhost)?persistent=false&amp;jmx=false"/>
+            <cm:property name="cxf.wsn.activemq" 
value="vm:localhost?persistent=false&amp;jmx=false"/>
             <cm:property name="cxf.wsn.port" value="8182" />
         </cm:default-properties>
     </cm:property-placeholder>