[jboss-cvs] JBoss Messaging SVN: r2223 - in trunk: tests/etc and 1 other directories.

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

Author: timfox
Date: 2007-02-08 19:13:24 -0500 (Thu, 08 Feb 2007)
New Revision: 2223

Modified:
   trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
   trunk/tests/etc/container.xml
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
removed loaded column + reinstated local mysql config + clean up drop tables


Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-02-09 00:02:40 UTC (rev 2222)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-02-09 00:13:24 UTC (rev 2223)
@@ -3195,7 +3195,7 @@
       map.put("CREATE_MESSAGE_REFERENCE",
               "CREATE TABLE JBM_MSG_REF (CHANNEL_ID BIGINT, " +
               "MESSAGE_ID BIGINT, TRANSACTION_ID BIGINT, STATE CHAR(1), ORD BIGINT, PAGE_ORD BIGINT, " +
-              "DELIVERY_COUNT INTEGER, LOADED CHAR(1), SCHED_DELIVERY BIGINT, PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))"); //CHANGED
+              "DELIVERY_COUNT INTEGER, SCHED_DELIVERY BIGINT, PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))");
       map.put("CREATE_IDX_MESSAGE_REF_TX", "CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID)");
       map.put("CREATE_IDX_MESSAGE_REF_ORD", "CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)");
       map.put("CREATE_IDX_MESSAGE_REF_PAGE_ORD", "CREATE INDEX JBM_MSG_REF__PAGE_ORD ON JBM_MSG_REF (PAGE_ORD)");

Modified: trunk/tests/etc/container.xml
===================================================================
--- trunk/tests/etc/container.xml	2007-02-09 00:02:40 UTC (rev 2222)
+++ trunk/tests/etc/container.xml	2007-02-09 00:13:24 UTC (rev 2223)
@@ -26,13 +26,13 @@
       </database-configuration>
 
       <database-configuration name="mysql">
-         <url>jdbc:mysql://dev01-priv/messaging</url>
+         <url>jdbc:mysql://localhost/messaging</url>
          <driver>com.mysql.jdbc.Driver</driver>
          <isolation>TRANSACTION_READ_COMMITTED</isolation>
-         <username>messaging</username>
-         <password>messaging</password>
+         <username>sa</username>
       </database-configuration>
 
+
       <database-configuration name="oracle">
          <url>jdbc:oracle:thin:@dev01-priv:1521/qadb01</url>
          <driver>oracle.jdbc.driver.OracleDriver</driver>

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-02-09 00:02:40 UTC (rev 2222)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-02-09 00:13:24 UTC (rev 2223)
@@ -426,7 +426,7 @@
          {
             // We make sure the database is clean (only if we have all dependencies the database,
             // othewise we'll get an access error)
-            deleteAllData();
+            dropAllTables();
          }
 
          if (xarecovery)
@@ -1396,11 +1396,11 @@
       ic.close();
    }
 
-   protected void deleteAllData() throws Exception
+   protected void dropAllTables() throws Exception
    {
       try
       {
-         log.info("DELETING ALL DATA FROM DATABASE!");
+         log.info("DROPPING ALL TABLES FROM DATABASE!");
 
          InitialContext ctx = new InitialContext();
 
@@ -1415,61 +1415,61 @@
          String sql = "DROP TABLE JBM_POSTOFFICE";
          PreparedStatement ps = conn.prepareStatement(sql);
 
-         int rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_POSTOFFICE: deleted " + rows);
+         log.debug("JBM_POSTOFFICE: dropped ");
 
          ps.close();
 
          sql = "DROP TABLE JBM_MSG_REF";
          ps = conn.prepareStatement(sql);
 
-         rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_MSG_REF: deleted " + rows);
+         log.debug("JBM_MSG_REF: dropped ");
 
          ps.close();
 
          sql = "DROP TABLE JBM_MSG";
          ps = conn.prepareStatement(sql);
 
-         rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_MSG: deleted " + rows);
+         log.debug("JBM_MSG: dropped ");
 
          ps.close();
 
          sql = "DROP TABLE JBM_TX";
          ps = conn.prepareStatement(sql);
 
-         rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_TX: deleted " + rows);
+         log.debug("JBM_TX: dropped ");
 
          ps.close();
 
          sql = "DROP TABLE JBM_COUNTER";
          ps = conn.prepareStatement(sql);
 
-         rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_COUNTER: deleted " + rows);
+         log.debug("JBM_COUNTER: dropped ");
 
          ps.close();
 
          sql = "DROP TABLE JBM_USER";
          ps = conn.prepareStatement(sql);
 
-         rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_USER: deleted " + rows);
+         log.debug("JBM_USER: dropped ");
          
          sql = "DROP TABLE JBM_ROLE";
          ps = conn.prepareStatement(sql);
 
-         rows = ps.executeUpdate();
+         ps.executeUpdate();
 
-         log.debug("JBM_ROLE: deleted " + rows);
+         log.debug("JBM_ROLE: dropped ");
 
          ps.close();
          conn.close();