servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1099390 - in /servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release: conf/jndi.xml examples/wsn-cxf-binding/servicemix.xml examples/wsn-http-binding/servicemix.xml
Date Wed, 04 May 2011 10:01:21 GMT
Author: jbonofre
Date: Wed May  4 10:01:21 2011
New Revision: 1099390

URL: http://svn.apache.org/viewvc?rev=1099390&view=rev
Log:
[SM-2077] ServiceMix WSN2005 component doesn't start correctly on SMX3.

Modified:
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-cxf-binding/servicemix.xml
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml?rev=1099390&r1=1099389&r2=1099390&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/jndi.xml Wed
May  4 10:01:21 2011
@@ -44,25 +44,28 @@
     -->
     
     <!-- wsn2005 jms connection factory -->
-    <entry key="org/apache/servicemix/jms/wsnotificationCF">
+    <entry key="java:org/apache/servicemix/jms/wsnotificationCF">
+      <amq:connectionFactory brokerURL="${activemq.url}" />
+    </entry>
+    <entry key="java:comp/env/jms/wsnotificationCF">
       <amq:connectionFactory brokerURL="${activemq.url}" />
     </entry>
 
     <!-- transaction manager -->
-    <entry key="javax.transaction.TransactionManager" value-ref="transactionManager" />
-    <entry key="org/apache/servicemix/TransactionManager" value-ref="transactionManager"
/>
+    <entry key="java:javax.transaction.TransactionManager" value-ref="transactionManager"
/>
+    <entry key="java:org/apache/servicemix/TransactionManager" value-ref="transactionManager"
/>
     
     <!-- bootstrap context -->
-    <entry key="org/apache/servicemix/BootstrapContext" value-ref="bootstrapContext" />
+    <entry key="java:org/apache/servicemix/BootstrapContext" value-ref="bootstrapContext"
/>
     
     <!-- connection context -->
-    <entry key="org/apache/servicemix/ConnectionManager" value-ref="connectionManager"
/>
+    <entry key="java:org/apache/servicemix/ConnectionManager" value-ref="connectionManager"
/>
     
     <!-- Authentication service -->
-    <entry key="org/apache/servicemix/AuthenticationService" value-ref="authenticationService"
/>
+    <entry key="java:org/apache/servicemix/AuthenticationService" value-ref="authenticationService"
/>
     
     <!-- Keystore manager -->
-    <entry key="org/apache/servicemix/KeystoreManager" value-ref="keystoreManager" />
+    <entry key="java:org/apache/servicemix/KeystoreManager" value-ref="keystoreManager"
/>
   </util:map>
 
   <!-- A managed JDBC DataSource for derby -->

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-cxf-binding/servicemix.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-cxf-binding/servicemix.xml?rev=1099390&r1=1099389&r2=1099390&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-cxf-binding/servicemix.xml
(original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-cxf-binding/servicemix.xml
Wed May  4 10:01:21 2011
@@ -41,7 +41,10 @@
   </bean>
 
   <util:map id="jndiEntries">
-    <entry key="org/apache/servicemix/jms/wsnotificationCF">
+    <entry key="java:org/apache/servicemix/jms/wsnotificationCF">
+      <amq:connectionFactory brokerURL="tcp://localhost:61616" />
+    </entry>
+    <entry key="java:comp/env/jms/wsnotificationCF">
       <amq:connectionFactory brokerURL="tcp://localhost:61616" />
     </entry>
   </util:map>

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml?rev=1099390&r1=1099389&r2=1099390&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
(original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
Wed May  4 10:01:21 2011
@@ -41,7 +41,10 @@
   </bean>
 
   <util:map id="jndiEntries">
-    <entry key="org/apache/servicemix/jms/wsnotificationCF">
+    <entry key="java:org/apache/servicemix/jms/wsnotificationCF">
+      <amq:connectionFactory brokerURL="tcp://localhost:61616" />
+    </entry>
+    <entry key="java:comp/env/jms/wsnotificationCF">
       <amq:connectionFactory brokerURL="tcp://localhost:61616" />
     </entry>
   </util:map>



Mime
View raw message