[jboss-cvs] JBossAS SVN: r58302 - branches/Branch_4_2/messaging/src/etc/server/examples/deploy

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

Author: adrian at jboss.org
Date: 2006-11-13 12:11:17 -0500 (Mon, 13 Nov 2006)
New Revision: 58302

Modified:
   branches/Branch_4_2/messaging/src/etc/server/examples/deploy/derby-jdbc2-service.xml
Log:
Port JBAS-3784 and JBAS-3785 from jboss-4.0

Modified: branches/Branch_4_2/messaging/src/etc/server/examples/deploy/derby-jdbc2-service.xml
===================================================================
--- branches/Branch_4_2/messaging/src/etc/server/examples/deploy/derby-jdbc2-service.xml	2006-11-13 16:52:45 UTC (rev 58301)
+++ branches/Branch_4_2/messaging/src/etc/server/examples/deploy/derby-jdbc2-service.xml	2006-11-13 17:11:17 UTC (rev 58302)
@@ -48,7 +48,7 @@
    -->
   <mbean code="org.jboss.mq.pm.jdbc2.PersistenceManager"
    name="jboss.mq:service=PersistenceManager">
-    <depends optional-attribute-name="ConnectionManager">jboss.jca:service=LocalTxCM,name=DerbyDS</depends>
+    <depends optional-attribute-name="ConnectionManager">jboss.jca:service=DataSourceBinding,name=DerbyDS</depends>
     <attribute name="SqlProperties">
       BLOB_TYPE=BYTES_BLOB
       INSERT_TX = INSERT INTO JMS_TRANSACTIONS (TXID) values(?)
@@ -63,7 +63,7 @@
       UPDATE_MESSAGE = UPDATE JMS_MESSAGES SET MESSAGEBLOB=? WHERE MESSAGEID=? AND DESTINATION=?
       UPDATE_MARKED_MESSAGES = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=?
       UPDATE_MARKED_MESSAGES_WITH_TX = UPDATE JMS_MESSAGES SET TXID=?, TXOP=? WHERE TXOP=? AND TXID=?
-      DELETE_MARKED_MESSAGES_WITH_TX = DELETE FROM JMS_MESSAGES WHERE EXITS (SELECT JMS_TRANSACTIONS.TXID FROM JMS_TRANSACTIONS \
+      DELETE_MARKED_MESSAGES_WITH_TX = DELETE FROM JMS_MESSAGES WHERE EXISTS (SELECT JMS_TRANSACTIONS.TXID FROM JMS_TRANSACTIONS \
                                                                               WHERE JMS_TRANSACTIONS.TXID = JMS_MESSAGES.TXID) \
                                                                                AND JMS_MESSAGES.TXOP = ?
       DELETE_TX = DELETE FROM JMS_TRANSACTIONS WHERE TXID = ?