Author: gnodet
Date: Wed May  3 05:19:27 2006
New Revision: 399281

URL: http://svn.apache.org/viewcvs?rev=399281&view=rev
Log:
Fix jndi one more time

Modified:
    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.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/conf/jndi.xml?rev=399281&r1=399280&r2=399281&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 05:19:27 2006
@@ -13,6 +13,7 @@
       <map>
       
         <!-- PXE DB datasource -->
+        <!--
         <entry key="java:comp/env/jdbc/pxe__pm">
           <bean class="org.hsqldb.jdbc.jdbcDataSource">
             <property name="database" value="jdbc:hsqldb:mem:pxe"/>
@@ -20,6 +21,7 @@
             <property name="password" value = ""/>
           </bean>
         </entry>
+        -->
         
         <!-- wsn2005 jms connection factory -->
         <entry key="java:comp/env/jms/wsnotificationCF">

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=399281&r1=399280&r2=399281&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 05:19:27 2006
@@ -15,7 +15,7 @@
                 statsInterval="10" 
                 flowName="seda"
                 transactionManager="#transactionManager"
-                namingContext="#jndi">
+                depends-on="jndi">
 
     <sm:activationSpecs>