[jboss-cvs] JBossAS SVN: r61574 - in trunk/jbossmq/src/etc/server: examples/deploy and 1 other directory.

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

Author: adrian at jboss.org
Date: 2007-03-22 10:33:33 -0400 (Thu, 22 Mar 2007)
New Revision: 61574

Modified:
   trunk/jbossmq/src/etc/server/default/deploy/hsqldb-jdbc-state-service.xml
   trunk/jbossmq/src/etc/server/examples/deploy/sybase-jdbc2-service.xml
Log:
Port JBAS-4225 and JBAS-4230 from JBoss4.2

Modified: trunk/jbossmq/src/etc/server/default/deploy/hsqldb-jdbc-state-service.xml
===================================================================
--- trunk/jbossmq/src/etc/server/default/deploy/hsqldb-jdbc-state-service.xml	2007-03-22 14:32:52 UTC (rev 61573)
+++ trunk/jbossmq/src/etc/server/default/deploy/hsqldb-jdbc-state-service.xml	2007-03-22 14:33:33 UTC (rev 61574)
@@ -16,12 +16,12 @@
     <attribute name="SqlProperties">
       CREATE_TABLES_ON_STARTUP = TRUE
       CREATE_USER_TABLE = CREATE TABLE JMS_USERS (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, \
-                                                 CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
+                                                 CLIENTID VARCHAR(128) NULL, PRIMARY KEY(USERID))
       CREATE_ROLE_TABLE = CREATE TABLE JMS_ROLES (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, \
                                                  PRIMARY KEY(USERID, ROLEID))
       CREATE_SUBSCRIPTION_TABLE = CREATE TABLE JMS_SUBSCRIPTIONS (CLIENTID VARCHAR(128) NOT NULL, \
                                                  SUBNAME VARCHAR(128) NOT NULL, TOPIC VARCHAR(255) NOT NULL, \
-                                                 SELECTOR VARCHAR(255), PRIMARY KEY(CLIENTID, SUBNAME))
+                                                 SELECTOR VARCHAR(255) NULL, PRIMARY KEY(CLIENTID, SUBNAME))
       GET_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
       LOCK_SUBSCRIPTION = SELECT TOPIC, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE CLIENTID=? AND SUBNAME=?
       GET_SUBSCRIPTIONS_FOR_TOPIC = SELECT CLIENTID, SUBNAME, SELECTOR FROM JMS_SUBSCRIPTIONS WHERE TOPIC=?

Modified: trunk/jbossmq/src/etc/server/examples/deploy/sybase-jdbc2-service.xml
===================================================================
--- trunk/jbossmq/src/etc/server/examples/deploy/sybase-jdbc2-service.xml	2007-03-22 14:32:52 UTC (rev 61573)
+++ trunk/jbossmq/src/etc/server/examples/deploy/sybase-jdbc2-service.xml	2007-03-22 14:33:33 UTC (rev 61574)
@@ -69,11 +69,11 @@
       DELETE_TEMPORARY_MESSAGES = DELETE FROM dbo.JMS_MESSAGES WHERE TXOP='T'
       DELETE_MESSAGE = DELETE FROM dbo.JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
       CREATE_MESSAGE_TABLE = CREATE TABLE dbo.JMS_MESSAGES ( MESSAGEID INTEGER NOT NULL, \
-         DESTINATION VARCHAR(255) NOT NULL, TXID INTEGER NULL, TXOP CHAR(1), \
-         MESSAGEBLOB IMAGE, PRIMARY KEY (MESSAGEID, DESTINATION) ) LOCK DATAROWS
+         DESTINATION VARCHAR(255) NOT NULL, TXID INTEGER NULL, TXOP CHAR(1) NOT NULL, \
+         MESSAGEBLOB IMAGE NOT NULL, PRIMARY KEY (MESSAGEID, DESTINATION) ) LOCK DATAROWS
       CREATE_IDX_MESSAGE_TXOP_TXID = CREATE INDEX dbo.JMS_MESSAGES_TXOP_TXID ON dbo.JMS_MESSAGES (TXOP, TXID)
       CREATE_IDX_MESSAGE_DESTINATION = CREATE INDEX dbo.JMS_MESSAGES_DESTINATION ON dbo.JMS_MESSAGES (DESTINATION)
-      CREATE_TX_TABLE = CREATE TABLE dbo.JMS_TRANSACTIONS ( TXID INTEGER, PRIMARY KEY (TXID) ) \
+      CREATE_TX_TABLE = CREATE TABLE dbo.JMS_TRANSACTIONS ( TXID INTEGER NOT NULL, PRIMARY KEY (TXID) ) \
          LOCK DATAROWS
       CREATE_TABLES_ON_STARTUP = TRUE
       </attribute>