[jboss-cvs] JBoss Messaging SVN: r4945 - in branches/Branch_Stable: src/main/org/jboss/messaging/core/impl and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 15 12:42:20 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-09-15 12:42:19 -0400 (Mon, 15 Sep 2008)
New Revision: 4945
Added:
branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml
Modified:
branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
Log:
JBMESSAGING-1048 - Merging DB2 changes on Branch_Stable, few other tweaks equalising few other changes from Branch_CP
Added: branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml (rev 0)
+++ branches/Branch_Stable/src/etc/server/default/deploy/db2-persistence-service.xml 2008-09-15 16:42:19 UTC (rev 4945)
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ DB2 persistence deployment descriptor.
+
+ Tested with DB2 v9.1
+
+ $Id$
+ -->
+
+<server>
+
+ <!-- Persistence Manager MBean configuration
+ ======================================== -->
+
+ <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
+ name="jboss.messaging:service=PersistenceManager"
+ xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
+
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+ <!-- The datasource to use for the persistence manager -->
+
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+
+ <!-- If true will attempt to create tables and indexes on every start-up -->
+
+ <attribute name="CreateTablesOnStartup">true</attribute>
+
+ <!-- If true then we will automatically detect and reject duplicate messages sent during failover -->
+
+ <attribute name="DetectDuplicates">true</attribute>
+
+ <!-- The size of the id cache to use when detecting duplicate messages -->
+
+ <attribute name="IDCacheSize">500</attribute>
+
+ <attribute name="SupportsBlobOnSelect">false</attribute>
+
+ <attribute name="SqlProperties"><![CDATA[
+ CREATE_DUAL=CREATE TABLE JBM_DUAL (DUAL_DUMMY INTEGER NOT NULL, PRIMARY KEY (DUAL_DUMMY))
+ CREATE_MESSAGE_REFERENCE=CREATE TABLE JBM_MSG_REF (MESSAGE_ID DECIMAL(19, 0) NOT NULL, CHANNEL_ID DECIMAL(19, 0) NOT NULL, TRANSACTION_ID DECIMAL(19, 0), STATE CHAR(1), ORD DECIMAL(19, 0), PAGE_ORD DECIMAL(19, 0) , DELIVERY_COUNT INTEGER, SCHED_DELIVERY DECIMAL(19, 0), PRIMARY KEY(MESSAGE_ID, CHANNEL_ID))
+ CREATE_IDX_MESSAGE_REF_TX=CREATE INDEX JBM_MSG_REF_TX ON JBM_MSG_REF (TRANSACTION_ID, STATE)
+ CREATE_MESSAGE=CREATE TABLE JBM_MSG (MESSAGE_ID DECIMAL(19, 0) NOT NULL, RELIABLE CHAR(1), EXPIRATION DECIMAL(19, 0), TIMESTAMP DECIMAL(19, 0), PRIORITY SMALLINT, TYPE SMALLINT, HEADERS BLOB, PAYLOAD BLOB, PRIMARY KEY (MESSAGE_ID))
+ CREATE_TRANSACTION=CREATE TABLE JBM_TX (NODE_ID INTEGER, TRANSACTION_ID DECIMAL(19, 0) NOT NULL, BRANCH_QUAL BLOB(254), FORMAT_ID INTEGER, GLOBAL_TXID BLOB(254), PRIMARY KEY (TRANSACTION_ID))
+ CREATE_COUNTER=CREATE TABLE JBM_COUNTER (NAME VARCHAR(255) NOT NULL, NEXT_ID DECIMAL(19, 0), PRIMARY KEY(NAME))
+ CREATE_ID_CACHE=CREATE TABLE JBM_ID_CACHE (NODE_ID INTEGER NOT NULL, CNTR INTEGER NOT NULL, JBM_ID VARCHAR(255), PRIMARY KEY(NODE_ID, CNTR))
+ INSERT_DUAL=INSERT INTO JBM_DUAL VALUES (1)
+ CHECK_DUAL=SELECT 1 FROM JBM_DUAL
+ INSERT_MESSAGE_REF=INSERT INTO JBM_MSG_REF (CHANNEL_ID, MESSAGE_ID, TRANSACTION_ID, STATE, ORD, PAGE_ORD, DELIVERY_COUNT, SCHED_DELIVERY) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+ DELETE_MESSAGE_REF=DELETE FROM JBM_MSG_REF WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+ UPDATE_MESSAGE_REF=UPDATE JBM_MSG_REF SET TRANSACTION_ID=?, STATE='-' WHERE MESSAGE_ID=? AND CHANNEL_ID=? AND STATE='C'
+ UPDATE_PAGE_ORDER=UPDATE JBM_MSG_REF SET PAGE_ORD = ? WHERE MESSAGE_ID=? AND CHANNEL_ID=?
+ COMMIT_MESSAGE_REF1=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='+'
+ COMMIT_MESSAGE_REF2=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='-'
+ ROLLBACK_MESSAGE_REF1=DELETE FROM JBM_MSG_REF WHERE TRANSACTION_ID=? AND STATE='+'
+ ROLLBACK_MESSAGE_REF2=UPDATE JBM_MSG_REF SET STATE='C', TRANSACTION_ID = NULL WHERE TRANSACTION_ID=? AND STATE='-'
+ LOAD_PAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, PAGE_ORD, SCHED_DELIVERY FROM JBM_MSG_REF WHERE CHANNEL_ID = ? AND PAGE_ORD BETWEEN ? AND ? ORDER BY PAGE_ORD
+ LOAD_UNPAGED_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? AND PAGE_ORD IS NULL ORDER BY ORD
+ LOAD_REFS=SELECT MESSAGE_ID, DELIVERY_COUNT, SCHED_DELIVERY FROM JBM_MSG_REF WHERE STATE = 'C' AND CHANNEL_ID = ? ORDER BY ORD
+ UPDATE_REFS_NOT_PAGED=UPDATE JBM_MSG_REF SET PAGE_ORD = NULL WHERE PAGE_ORD BETWEEN ? AND ? AND CHANNEL_ID=?
+ SELECT_MIN_MAX_PAGE_ORD=SELECT MIN(PAGE_ORD), MAX(PAGE_ORD) FROM JBM_MSG_REF WHERE CHANNEL_ID = ?
+ UPDATE_DELIVERY_COUNT=UPDATE JBM_MSG_REF SET DELIVERY_COUNT = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+ UPDATE_CHANNEL_ID=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?
+ MOVE_REFERENCE=UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?
+ LOAD_MESSAGES=SELECT MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, HEADERS, PAYLOAD, TYPE FROM JBM_MSG
+ INSERT_MESSAGE=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+ INSERT_MESSAGE_CONDITIONAL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE) SELECT (CAST(? AS DECIMAL(19,0))), (CAST(? AS CHAR)), (CAST(? AS DECIMAL(19,0))), (CAST(? AS DECIMAL(19,0))), (CAST(? AS DECIMAL(19,0))), (CAST(? AS DECIMAL(19,0))) FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+ UPDATE_MESSAGE_4CONDITIONAL=UPDATE JBM_MSG SET HEADERS=?, PAYLOAD=? WHERE MESSAGE_ID=?
+ INSERT_MESSAGE_CONDITIONAL_FULL=INSERT INTO JBM_MSG (MESSAGE_ID, RELIABLE, EXPIRATION, TIMESTAMP, PRIORITY, TYPE, HEADERS, PAYLOAD) SELECT (CAST(? AS DECIMAL)), (CAST(? AS CHAR)), (CAST(? AS DECIMAL)), (CAST(? AS DECIMAL)), (CAST(? AS DECIMAL)), (CAST(? AS DECIMAL)), (CAST(? AS DECIMAL)), (CAST(? AS DECIMAL)) FROM JBM_DUAL WHERE NOT EXISTS (SELECT MESSAGE_ID FROM JBM_MSG WHERE MESSAGE_ID = ?)
+ MESSAGE_ID_COLUMN=MESSAGE_ID
+ DELETE_MESSAGE=DELETE FROM JBM_MSG WHERE MESSAGE_ID = ? AND NOT EXISTS (SELECT JBM_MSG_REF.MESSAGE_ID FROM JBM_MSG_REF WHERE JBM_MSG_REF.MESSAGE_ID = ?)
+ INSERT_TRANSACTION=INSERT INTO JBM_TX (NODE_ID, TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID) VALUES(?, ?, ?, ?, ?)
+ DELETE_TRANSACTION=DELETE FROM JBM_TX WHERE NODE_ID = ? AND TRANSACTION_ID = ?
+ SELECT_PREPARED_TRANSACTIONS=SELECT TRANSACTION_ID, BRANCH_QUAL, FORMAT_ID, GLOBAL_TXID FROM JBM_TX WHERE NODE_ID = ?
+ SELECT_MESSAGE_ID_FOR_REF=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '+' ORDER BY ORD
+ SELECT_MESSAGE_ID_FOR_ACK=SELECT MESSAGE_ID, CHANNEL_ID FROM JBM_MSG_REF WHERE TRANSACTION_ID = ? AND STATE = '-' ORDER BY ORD
+ UPDATE_COUNTER=UPDATE JBM_COUNTER SET NEXT_ID = ? WHERE NAME=?
+ SELECT_COUNTER=SELECT NEXT_ID FROM JBM_COUNTER HOLDLOCK WHERE NAME=?
+ INSERT_COUNTER=INSERT INTO JBM_COUNTER (NAME, NEXT_ID) VALUES (?, ?)
+ SELECT_ALL_CHANNELS=SELECT DISTINCT(CHANNEL_ID) FROM JBM_MSG_REF
+ UPDATE_TX=UPDATE JBM_TX SET NODE_ID=? WHERE NODE_ID=?
+ UPDATE_ID_IN_CACHE=UPDATE JBM_ID_CACHE SET JBM_ID = ? WHERE NODE_ID = ? AND CNTR = ?
+ INSERT_ID_IN_CACHE=INSERT INTO JBM_ID_CACHE (NODE_ID, CNTR, JBM_ID) VALUES (?, ?, ?)
+ LOAD_ID_CACHE=SELECT CNTR, JBM_ID FROM JBM_ID_CACHE WHERE NODE_ID = ?
+ ]]></attribute>
+
+ <!-- The maximum number of parameters to include in a prepared statement -->
+
+ <attribute name="MaxParams">500</attribute>
+
+ </mbean>
+
+ <!-- Messaging Post Office MBean configuration
+ ========================================= -->
+
+ <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
+ name="jboss.messaging:service=PostOffice"
+ xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
+
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+
+ <!-- The name of the post office -->
+
+ <attribute name="PostOfficeName">JMS post office</attribute>
+
+ <!-- The datasource used by the post office to access it's binding information -->
+
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+
+ <!-- If true will attempt to create tables and indexes on every start-up -->
+
+ <attribute name="CreateTablesOnStartup">true</attribute>
+
+ <attribute name="SqlProperties"><![CDATA[
+CREATE_POSTOFFICE_TABLE=CREATE TABLE JBM_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255) NOT NULL, NODE_ID SMALLINT NOT NULL, QUEUE_NAME VARCHAR(255) NOT NULL, COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID INTEGER, CLSTERED CHAR(1), ALL_NODES CHAR(1), PRIMARY KEY(POSTOFFICE_NAME, NODE_ID, QUEUE_NAME))
+INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
+LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
+ ]]></attribute>
+
+ <!-- This post office is clustered. If you don't want a clustered post office then set to false -->
+
+ <attribute name="Clustered">false</attribute>
+
+ <!-- All the remaining properties only have to be specified if the post office is clustered.
+ You can safely comment them out if your post office is non clustered -->
+
+ <!-- The JGroups group name that the post office will use -->
+
+ <attribute name="GroupName">${jboss.messaging.groupname:MessagingPostOffice}</attribute>
+
+ <!-- Max time to wait for state to arrive when the post office joins the cluster -->
+
+ <attribute name="StateTimeout">30000</attribute>
+
+ <!-- Max time to wait for a synchronous call to node members using the MessageDispatcher -->
+
+ <attribute name="CastTimeout">30000</attribute>
+
+ <!-- Set this to true if you want failover of connections to occur when a node is shut down -->
+
+ <attribute name="FailoverOnNodeLeave">false</attribute>
+
+ <!-- JGroups stack configuration for the data channel - used for sending data across the cluster -->
+
+ <!-- By default we use the TCP stack for data -->
+ <attribute name="DataChannelConfig">
+ <config>
+ <TCP start_port="7900"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"/>
+ <MPING timeout="4000"
+ mcast_addr="${jboss.messaging.datachanneludpaddress,jboss.partition.udpGroup:228.6.6.6}"
+ mcast_port="${jboss.messaging.datachanneludpport:45567}"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ num_initial_members="2"
+ num_ping_requests="1"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ down_thread="false" up_thread="false"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ down_thread="false" up_thread="false"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true"/>
+ </config>
+ </attribute>
+
+ <!-- JGroups stack configuration to use for the control channel - used for control messages -->
+
+ <!-- We use udp stack for the control channel -->
+ <attribute name="ControlChannelConfig">
+ <config>
+ <UDP
+ mcast_addr="${jboss.messaging.controlchanneludpaddress,jboss.partition.udpGroup:228.7.7.7}"
+ mcast_port="${jboss.messaging.controlchanneludpport:45568}"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ ip_ttl="${jboss.messaging.ipttl:8}"
+ down_thread="false" up_thread="false"
+ enable_bundling="false"/>
+ <PING timeout="2000"
+ down_thread="false" up_thread="false" num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"
+ down_thread="false" up_thread="false"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ down_thread="false" up_thread="false"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000"
+ down_thread="false" up_thread="false"
+ join_retry_timeout="2000" shun="false"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/>
+ <pbcast.FLUSH down_thread="false" up_thread="false" timeout="20000" auto_flush_conf="false"/>
+ </config>
+ </attribute>
+ </mbean>
+
+ <!-- Messaging JMS User Manager MBean config
+ ======================================= -->
+
+ <mbean code="org.jboss.jms.server.plugin.JDBCJMSUserManagerService"
+ name="jboss.messaging:service=JMSUserManager"
+ xmbean-dd="xmdesc/JMSUserManager-xmbean.xml">
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
+ <attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USER_ID))
+CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL, USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
+SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+POPULATE.TABLES.1 = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('guest', 'guest')
+POPULATE.TABLES.2 = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('j2ee', 'j2ee')
+POPULATE.TABLES.3 = INSERT INTO JBM_USER (USER_ID, PASSWD, CLIENTID) VALUES ('john', 'needle', 'DurableSubscriberExample')
+POPULATE.TABLES.4 = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('nobody', 'nobody')
+POPULATE.TABLES.5 = INSERT INTO JBM_USER (USER_ID, PASSWD) VALUES ('dynsub', 'dynsub')
+POPULATE.TABLES.6 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('guest','guest')
+POPULATE.TABLES.7 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('j2ee','guest')
+POPULATE.TABLES.8 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('john','guest')
+POPULATE.TABLES.9 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('subscriber','john')
+POPULATE.TABLES.10 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('publisher','john')
+POPULATE.TABLES.11 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('publisher','dynsub')
+POPULATE.TABLES.12 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('durpublisher','john')
+POPULATE.TABLES.13 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('durpublisher','dynsub')
+POPULATE.TABLES.14 = INSERT INTO JBM_ROLE (ROLE_ID, USER_ID) VALUES ('noacc','nobody')
+ ]]></attribute>
+ </mbean>
+
+</server>
Modified: branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -194,8 +194,7 @@
try
{
selectCount = conn.createStatement();
- rset = selectCount.executeQuery(this
- .getSQLStatement("CHECK_DUAL"));
+ rset = selectCount.executeQuery(this.getSQLStatement("CHECK_DUAL"));
// if JBM_DUAL is empty, and if an exception happened, we should
// warn!
@@ -222,8 +221,20 @@
}
finally
{
- closeResultSet(rset);
- closeStatement(selectCount);
+ try
+ {
+ closeResultSet(rset);
+ }
+ catch (Throwable ignored)
+ {
+ }
+ try
+ {
+ closeStatement(selectCount);
+ }
+ catch (Throwable ignored)
+ {
+ }
}
}
}
@@ -958,7 +969,7 @@
}
rs.close();
-
+
ps.close();
ps = conn.prepareStatement(getSQLStatement("LOAD_UNPAGED_REFS"));
@@ -998,7 +1009,6 @@
{
// Take any overflow and convert them to paged refs
- rs.close();
ps.close();
ps = conn.prepareStatement(getSQLStatement("UPDATE_PAGE_ORDER"));
@@ -2365,7 +2375,7 @@
}
else
{
- ps.setNull(headerPosition, Types.LONGVARBINARY);
+ ps.setBinaryStream(headerPosition, null, 0);
}
byte[] payload = m.getPayloadAsByteArray();
@@ -2375,7 +2385,7 @@
}
else
{
- ps.setNull(payloadPosition, Types.LONGVARBINARY);
+ ps.setBinaryStream(payloadPosition, null, 0);
}
}
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -69,7 +69,7 @@
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
true, true, true, false, 100,
- !sc.getDatabaseName().equals("oracle"));
+ !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -99,7 +99,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, useBinaryStream, trailingByte, maxParams, !sc.getDatabaseName().equals("oracle"));
+ true, batch, useBinaryStream, trailingByte, maxParams, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)p).injectNodeID(1);
p.start();
return p;
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -105,7 +105,7 @@
pm = new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -65,13 +65,13 @@
// Static ---------------------------------------------------------------------------------------
protected static PostOffice createClusteredPostOffice(int nodeID,
- String groupName,
- long stateTimeout,
- long castTimeout,
- ServiceContainer sc,
- MessageStore ms,
- TransactionRepository tr,
- PersistenceManager pm)
+ String groupName,
+ long stateTimeout,
+ long castTimeout,
+ ServiceContainer sc,
+ MessageStore ms,
+ TransactionRepository tr,
+ PersistenceManager pm)
throws Exception
{
FilterFactory ff = new SimpleFilterFactory();
@@ -84,10 +84,8 @@
String configFilePath = sc.getPersistenceConfigFile(true);
- boolean ignoreMultiplexer = false;
ChannelFactory jChannelFactory =
new ClusteredPersistenceServiceConfigFileJChannelFactory(configFilePath,
- ignoreMultiplexer,
sc.getMBeanServer());
MessagingPostOffice postOffice =
@@ -103,22 +101,22 @@
}
protected static PostOffice createNonClusteredPostOffice(ServiceContainer sc, MessageStore ms, TransactionRepository tr,
- PersistenceManager pm)
- throws Exception
+ PersistenceManager pm)
+ throws Exception
{
- FilterFactory ff = new SimpleFilterFactory();
- ConditionFactory cf = new SimpleConditionFactory();
+ FilterFactory ff = new SimpleFilterFactory();
+ ConditionFactory cf = new SimpleConditionFactory();
IDManager idm = new IDManager("channel_id", 10, pm);
ClusterNotifier cn = new DefaultClusterNotifier();
- MessagingPostOffice postOffice =
- new MessagingPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getPostOfficeSQLProperties(),
- true, 1, "NonClustered", ms, pm, tr, ff, cf, idm, cn);
+ MessagingPostOffice postOffice =
+ new MessagingPostOffice(sc.getDataSource(), sc.getTransactionManager(),
+ sc.getPostOfficeSQLProperties(),
+ true, 1, "NonClustered", ms, pm, tr, ff, cf, idm, cn);
- postOffice.start();
+ postOffice.start();
- return postOffice;
+ return postOffice;
}
// Attributes -----------------------------------------------------------------------------------
@@ -149,12 +147,12 @@
// Protected --------------------------------------------------------
- protected PostOffice createNonClusteredPostOffice() throws Exception
- {
- return createNonClusteredPostOffice(sc, ms, tr, pm);
- }
+ protected PostOffice createNonClusteredPostOffice() throws Exception
+ {
+ return createNonClusteredPostOffice(sc, ms, tr, pm);
+ }
- protected PostOffice createClusteredPostOffice(int nodeID) throws Exception
+ protected PostOffice createClusteredPostOffice(int nodeID) throws Exception
{
//System property provides group name so we can run concurrently in QA lab
String groupName = System.getProperty("jboss.messaging.groupname");
@@ -240,7 +238,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -260,7 +258,7 @@
protected void tearDown() throws Exception
{
- Thread.sleep(2000);
+ Thread.sleep(2000);
try
{
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -92,7 +92,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -87,7 +87,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -112,7 +112,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -204,7 +204,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -346,7 +346,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -63,12 +63,11 @@
* Irrelevant if skipMultiplex is true.
*/
public ClusteredPersistenceServiceConfigFileJChannelFactory(String configFilePath,
- boolean skipMultiplex,
MBeanServer mbeanServer)
throws Exception
{
this.configFilePath = configFilePath;
- init(configFilePath, skipMultiplex, mbeanServer);
+ init(configFilePath, mbeanServer);
}
// ChannelFactory ------------------------------------------------------------------------------
@@ -110,7 +109,7 @@
// Private --------------------------------------------------------------------------------------
- private void init(String configFilePath, boolean skipMultiplex, MBeanServer mbeanServer)
+ private void init(String configFilePath, MBeanServer mbeanServer)
throws Exception
{
log.debug("using configuration file " + configFilePath);
@@ -121,7 +120,7 @@
// first, we try to use a channel factory service, if we find one configured
String s = (String)postOfficeConfig.getAttributeValue("ChannelFactoryName");
- if (s != null && !skipMultiplex)
+ if (s != null)
{
// there's a chance we can use a multiplexer service
ObjectName channelFactoryName = new ObjectName(s);
Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2008-09-15 16:39:30 UTC (rev 4944)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2008-09-15 16:42:19 UTC (rev 4945)
@@ -73,7 +73,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, true, false, maxParams, !sc.getDatabaseName().equals("oracle"));
+ true, batch, true, false, maxParams, !sc.getDatabaseName().equals("oracle") && !sc.getDatabaseName().equals("db2"));
((JDBCPersistenceManager)pm).injectNodeID(1);
p.start();
return p;
More information about the jboss-cvs-commits
mailing list