Author: gnodet
Date: Wed May 3 02:15:02 2006
New Revision: 399218
URL: http://svn.apache.org/viewcvs?rev=399218&view=rev
Log:
Fix jndi once more
Modified:
incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties
incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml
incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties?rev=399218&r1=399217&r2=399218&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.properties Wed
May 3 02:15:02 2006
@@ -1,2 +1,2 @@
java.naming.factory.initial=org.apache.xbean.spring.jndi.SpringInitialContextFactory
-java.naming.provider.url=
+java.naming.provider.url=jndi.xml
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml?rev=399218&r1=399217&r2=399218&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml Wed May
3 02:15:02 2006
@@ -3,6 +3,8 @@
<!-- START SNIPPET: jndi -->
<beans>
+ <import resource="tx.xml" />
+
<bean id="jndi"
class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
factory-method="makeInitialContext"
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml?rev=399218&r1=399217&r2=399218&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/servicemix.xml Wed
May 3 02:15:02 2006
@@ -2,7 +2,6 @@
<beans xmlns:sm="http://servicemix.apache.org/config/1.0">
<import resource="classpath:jmx.xml" />
- <import resource="classpath:tx.xml" />
<import resource="classpath:activemq.xml" />
<import resource="classpath:jndi.xml" />
@@ -15,10 +14,11 @@
dumpStats="true"
statsInterval="10"
flowName="seda"
- transactionManager="#transactionManager">
+ transactionManager="#transactionManager"
+ namingContext="#jndi">
<sm:activationSpecs>
-
+
</sm:activationSpecs>
</sm:container>
|