[jboss-cvs] JBoss Messaging SVN: r2222 - in trunk: tests/etc and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 8 19:02:41 EST 2007
Author: timfox
Date: 2007-02-08 19:02:40 -0500 (Thu, 08 Feb 2007)
New Revision: 2222
Modified:
trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/tests/etc/container.xml
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
A few more updates
Modified: trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml 2007-02-08 23:48:27 UTC (rev 2221)
+++ trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml 2007-02-09 00:02:40 UTC (rev 2222)
@@ -17,7 +17,7 @@
<attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="UsingBatchUpdates">true</attribute>
<attribute name="SqlProperties"><![CDATA[
- CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (CHANNEL_ID DECIMAL(19, 0), MESSAGE_ID DECIMAL(19, 0), TRANSACTION_ID DECIMAL(19, 0) NULL, STATE CHAR(1), ORD DECIMAL(19, 0), PAGE_ORD DECIMAL(19, 0), DELIVERY_COUNT INTEGER, SCHED_DELIVERY DECIMAL(19, 0), PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))
+ CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (CHANNEL_ID DECIMAL(19, 0), MESSAGE_ID DECIMAL(19, 0), TRANSACTION_ID DECIMAL(19, 0) NULL, STATE CHAR(1), ORD DECIMAL(19, 0), PAGE_ORD DECIMAL(19, 0) NULL, DELIVERY_COUNT INTEGER, SCHED_DELIVERY DECIMAL(19, 0), PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))
CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID)
CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)
CREATE_IDX_MESSAGE_REF_PAGE_ORD=CREATE INDEX JBM_MSG_REF_PAGE_ORD ON JBM_MSG_REF (PAGE_ORD)
Modified: trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-02-08 23:48:27 UTC (rev 2221)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-02-09 00:02:40 UTC (rev 2222)
@@ -17,7 +17,7 @@
<attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="UsingBatchUpdates">true</attribute>
<attribute name="SqlProperties"><![CDATA[
- CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (CHANNEL_ID DECIMAL(19, 0), MESSAGE_ID DECIMAL(19, 0), TRANSACTION_ID DECIMAL(19, 0) NULL, STATE CHAR(1), ORD DECIMAL(19, 0), PAGE_ORD DECIMAL(19, 0), DELIVERY_COUNT INTEGER, SCHED_DELIVERY DECIMAL(19, 0), PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))
+ CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (CHANNEL_ID DECIMAL(19, 0), MESSAGE_ID DECIMAL(19, 0), TRANSACTION_ID DECIMAL(19, 0) NULL, STATE CHAR(1), ORD DECIMAL(19, 0), PAGE_ORD DECIMAL(19, 0) NULL, DELIVERY_COUNT INTEGER, SCHED_DELIVERY DECIMAL(19, 0), PRIMARY KEY(CHANNEL_ID, MESSAGE_ID))
CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID)
CREATE_IDX_MESSAGE_REF_ORD=CREATE INDEX JBM_MSG_REF_ORD ON JBM_MSG_REF (ORD)
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-08 23:48:27 UTC (rev 2221)
+++ trunk/tests/etc/container.xml 2007-02-09 00:02:40 UTC (rev 2222)
@@ -9,7 +9,7 @@
<!--
The value of "test.database" system property, if set, takes precedence.
-->
- <database>mysql</database>
+ <database>sybase</database>
<database-configurations>
@@ -26,36 +26,44 @@
</database-configuration>
<database-configuration name="mysql">
- <url>jdbc:mysql://localhost:3306/messaging</url>
+ <url>jdbc:mysql://dev01-priv/messaging</url>
<driver>com.mysql.jdbc.Driver</driver>
<isolation>TRANSACTION_READ_COMMITTED</isolation>
- <username>sa</username>
+ <username>messaging</username>
+ <password>messaging</password>
</database-configuration>
<database-configuration name="oracle">
- <url>jdbc:oracle:thin:@localhost:1521/XE</url>
+ <url>jdbc:oracle:thin:@dev01-priv:1521/qadb01</url>
<driver>oracle.jdbc.driver.OracleDriver</driver>
<isolation>TRANSACTION_READ_COMMITTED</isolation>
<username>messaging</username>
<password>messaging</password>
</database-configuration>
- <database-configuration name="postgres">
- <url>jdbc:postgresql://localhost:5432/jboss</url>
+ <database-configuration name="postgresql">
+ <url>jdbc:postgresql://dev01-priv:5432/messaging</url>
<driver>org.postgresql.Driver</driver>
<isolation>TRANSACTION_READ_COMMITTED</isolation>
- <username>jboss</username>
- <password>jboss</password>
+ <username>messaging</username>
+ <password>messaging</password>
</database-configuration>
<database-configuration name="mssql">
- <url>jdbc:jtds:sqlserver://localhost:1433/messaging</url>
+ <url>jdbc:jtds:sqlserver://dev16-priv:3918/messaging</url>
<driver>net.sourceforge.jtds.jdbc.Driver</driver>
<isolation>TRANSACTION_READ_COMMITTED</isolation>
<username>messaging</username>
<password>messaging</password>
</database-configuration>
+ <database-configuration name="sybase">
+ <url>jdbc:sybase:Tds:dev01-priv:4100/messaging</url>
+ <driver>com.sybase.jdbc3.jdbc.SybDriver</driver>
+ <isolation>TRANSACTION_READ_COMMITTED</isolation>
+ <username>messaging</username>
+ <password>messaging</password>
+ </database-configuration>
</database-configurations>
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-08 23:48:27 UTC (rev 2221)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-02-09 00:02:40 UTC (rev 2222)
@@ -1133,6 +1133,11 @@
{
LocalManagedConnectionFactory mcf = new LocalManagedConnectionFactory();
+
+log.info("connection url:" + config.getDatabaseConnectionURL());
+log.info("driver:" + config.getDatabaseConnectionURL());
+log.info("username:" + config.getDatabaseUserName());
+log.info("password:" + config.getDatabasePassword());
mcf.setConnectionURL(config.getDatabaseConnectionURL());
mcf.setDriverClass(config.getDatabaseDriverClass());
mcf.setUserName(config.getDatabaseUserName());
@@ -1407,7 +1412,7 @@
Connection conn = ds.getConnection();
- String sql = "DELETE FROM JBM_POSTOFFICE";
+ String sql = "DROP TABLE JBM_POSTOFFICE";
PreparedStatement ps = conn.prepareStatement(sql);
int rows = ps.executeUpdate();
@@ -1416,7 +1421,7 @@
ps.close();
- sql = "DELETE FROM JBM_MSG_REF";
+ sql = "DROP TABLE JBM_MSG_REF";
ps = conn.prepareStatement(sql);
rows = ps.executeUpdate();
@@ -1425,7 +1430,7 @@
ps.close();
- sql = "DELETE FROM JBM_MSG";
+ sql = "DROP TABLE JBM_MSG";
ps = conn.prepareStatement(sql);
rows = ps.executeUpdate();
@@ -1434,7 +1439,7 @@
ps.close();
- sql = "DELETE FROM JBM_TX";
+ sql = "DROP TABLE JBM_TX";
ps = conn.prepareStatement(sql);
rows = ps.executeUpdate();
@@ -1443,7 +1448,7 @@
ps.close();
- sql = "DELETE FROM JBM_COUNTER";
+ sql = "DROP TABLE JBM_COUNTER";
ps = conn.prepareStatement(sql);
rows = ps.executeUpdate();
@@ -1452,14 +1457,14 @@
ps.close();
- sql = "DELETE FROM JBM_USER";
+ sql = "DROP TABLE JBM_USER";
ps = conn.prepareStatement(sql);
rows = ps.executeUpdate();
log.debug("JBM_USER: deleted " + rows);
- sql = "DELETE FROM JBM_ROLE";
+ sql = "DROP TABLE JBM_ROLE";
ps = conn.prepareStatement(sql);
rows = ps.executeUpdate();
More information about the jboss-cvs-commits
mailing list