[jboss-cvs] JBoss Messaging SVN: r3420 - in branches/Branch_MC_Integration_New: src/etc/server/standalone and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2007-12-06 04:33:37 -0500 (Thu, 06 Dec 2007)
New Revision: 3420

Modified:
   branches/Branch_MC_Integration_New/build-messaging.xml
   branches/Branch_MC_Integration_New/src/etc/server/standalone/config/local/local.xml
   branches/Branch_MC_Integration_New/src/etc/server/standalone/config/remote/remote.xml
   branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh
   branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/JDBCSupport.java
Log:
fixes to config

Modified: branches/Branch_MC_Integration_New/build-messaging.xml
===================================================================
--- branches/Branch_MC_Integration_New/build-messaging.xml	2007-12-06 09:11:24 UTC (rev 3419)
+++ branches/Branch_MC_Integration_New/build-messaging.xml	2007-12-06 09:33:37 UTC (rev 3420)
@@ -470,6 +470,9 @@
          <fileset dir="${javassist.lib}">
             <include name="javassist.jar"/>
          </fileset>
+         <fileset dir="${jboss.jnpserver.lib}">
+            <include name="jnpserver.jar"/>
+         </fileset>
       </copy>
    </target>
 

Modified: branches/Branch_MC_Integration_New/src/etc/server/standalone/config/local/local.xml
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/standalone/config/local/local.xml	2007-12-06 09:11:24 UTC (rev 3419)
+++ branches/Branch_MC_Integration_New/src/etc/server/standalone/config/local/local.xml	2007-12-06 09:33:37 UTC (rev 3420)
@@ -29,8 +29,8 @@
 
    <bean name="Jaas" class="org.jboss.jms.server.microcontainer.AuthenticationManager"/>
 
-   <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="org.hsqldb.jdbc.jdbcDataSource">
-      <property name="database">jdbc:hsqldb:file:myHSQLDBInstance</property>
+   <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
+      <property name="url">jdbc:mysql://localhost/messaging</property>
       <property name="user">sa</property>
    </bean>
 

Modified: branches/Branch_MC_Integration_New/src/etc/server/standalone/config/remote/remote.xml
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/standalone/config/remote/remote.xml	2007-12-06 09:11:24 UTC (rev 3419)
+++ branches/Branch_MC_Integration_New/src/etc/server/standalone/config/remote/remote.xml	2007-12-06 09:33:37 UTC (rev 3420)
@@ -41,8 +41,8 @@
 
    <bean name="Jaas" class="org.jboss.jms.server.microcontainer.AuthenticationManager"/>
 
-   <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="org.hsqldb.jdbc.jdbcDataSource">
-      <property name="database">jdbc:hsqldb:file:myHSQLDBInstance</property>
+   <bean name="jboss.jca:name=DefaultDS,service=DataSourceBinding" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
+      <property name="url">jdbc:mysql://localhost/messaging</property>
       <property name="user">sa</property>
    </bean>
 

Modified: branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh	2007-12-06 09:11:24 UTC (rev 3419)
+++ branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh	2007-12-06 09:33:37 UTC (rev 3420)
@@ -1,3 +1,3 @@
 CONFIG=$1
 echo running Server with config ${CONFIG}
-java -classpath config/:config/${CONFIG}:lib/jboss-messaging.jar org.jboss.jms.server.microcontainer.JBMBootstrapServer ${CONFIG}.xml jbm-beans.xml
\ No newline at end of file
+java -classpath config/:config/${CONFIG}:lib/mysql-connector-java-5.0.7-bin.jar:lib/jboss-messaging.jar org.jboss.jms.server.microcontainer.JBMBootstrapServer ${CONFIG}.xml jbm-beans.xml
\ No newline at end of file

Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/JDBCSupport.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/JDBCSupport.java	2007-12-06 09:11:24 UTC (rev 3419)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/JDBCSupport.java	2007-12-06 09:33:37 UTC (rev 3420)
@@ -482,7 +482,7 @@
                if (tries == MAX_TRIES)
                {
                   log.error("Retried " + tries + " times, now giving up");
-                  throw new IllegalStateException("Failed to excecute transaction");
+                  throw new IllegalStateException("Failed to excecute transaction", e);
                }
                log.warn("Trying again after a pause");
                //Now we wait for a random amount of time to minimise risk of deadlock