[jboss-cvs] JBoss Messaging SVN: r1708 - in branches/Branch_Client_Failover_Experiment: src/etc/server/default/deploy src/main/org/jboss/jms/server/connectionfactory src/main/org/jboss/messaging/core/plugin/postoffice tests tests/bin tests/src/org/jboss/test/messaging/jms/clustering tests/src/org/jboss/test/messaging/tools/jndi
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 5 12:21:05 EST 2006
Author: timfox
Date: 2006-12-05 12:20:56 -0500 (Tue, 05 Dec 2006)
New Revision: 1708
Modified:
branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/mysql-persistence-service.xml
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java
branches/Branch_Client_Failover_Experiment/tests/bin/runtest
branches/Branch_Client_Failover_Experiment/tests/build.xml
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java
Log:
More tweaks
Modified: branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/mysql-persistence-service.xml 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/mysql-persistence-service.xml 2006-12-05 17:20:56 UTC (rev 1708)
@@ -67,8 +67,8 @@
<attribute name="DataSource">java:/DefaultDS</attribute>
<attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="SqlProperties"><![CDATA[
-CREATE_POSTOFFICE_TABLE=CREATE TABLE JMS_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT)
-INSERT_BINDING=INSERT INTO JMS_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID) VALUES (?, ?, ?, ?, ?, ?)
+CREATE_POSTOFFICE_TABLE=CREATE TABLE JMS_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, IS_FAILED_OVER CHAR(1))
+INSERT_BINDING=INSERT INTO JMS_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER) VALUES (?, ?, ?, ?, ?, ?, ?)
DELETE_BINDING=DELETE FROM JMS_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
LOAD_BINDINGS=SELECT NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID FROM JMS_POSTOFFICE WHERE POSTOFFICE_NAME = ?
]]></attribute>
@@ -84,8 +84,8 @@
<attribute name="DataSource">java:/DefaultDS</attribute>
<attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="SqlProperties"><![CDATA[
-CREATE_POSTOFFICE_TABLE=CREATE TABLE JMS_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT)
-INSERT_BINDING=INSERT INTO JMS_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID) VALUES (?, ?, ?, ?, ?, ?)
+CREATE_POSTOFFICE_TABLE=CREATE TABLE JMS_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER, QUEUE_NAME VARCHAR(1023), COND VARCHAR(1023), SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, IS_FAILED_OVER CHAR(1))
+INSERT_BINDING=INSERT INTO JMS_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, IS_FAILED_OVER) VALUES (?, ?, ?, ?, ?, ?, ?)
DELETE_BINDING=DELETE FROM JMS_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
LOAD_BINDINGS=SELECT NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID FROM JMS_POSTOFFICE WHERE POSTOFFICE_NAME = ?
]]></attribute>
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2006-12-05 17:20:56 UTC (rev 1708)
@@ -100,6 +100,12 @@
{
log.info("Registering connection factory with name " + uniqueName + " bindings " + jndiBindings);
+ //Sanity check
+ if (delegates.containsKey(uniqueName))
+ {
+ throw new IllegalArgumentException("There's already a connection factory registered with name " + uniqueName);
+ }
+
int id = serverPeer.getNextObjectID();
Version version = serverPeer.getVersion();
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java 2006-12-05 17:20:56 UTC (rev 1708)
@@ -545,7 +545,7 @@
ps.setNull(5, Types.VARCHAR);
}
ps.setLong(6, binding.getQueue().getChannelID());
- ps.setString(7,binding.isFailed()?"Y":"N");
+ ps.setString(7,binding.isFailed() ? "Y":"N");
ps.executeUpdate();
}
@@ -801,7 +801,7 @@
map.put("CREATE_POSTOFFICE_TABLE",
"CREATE TABLE JMS_POSTOFFICE (POSTOFFICE_NAME VARCHAR(255), NODE_ID INTEGER," +
"QUEUE_NAME VARCHAR(1023), CONDITION VARCHAR(1023), " +
- "SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, IS_FAILED_OVER VARCHAR(1))");
+ "SELECTOR VARCHAR(1023), CHANNEL_ID BIGINT, IS_FAILED_OVER CHAR(1))");
return map;
}
Modified: branches/Branch_Client_Failover_Experiment/tests/bin/runtest
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/bin/runtest 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/tests/bin/runtest 2006-12-05 17:20:56 UTC (rev 1708)
@@ -42,6 +42,7 @@
TEST_CLUSTERED=$ENV_TEST_CLUSTERED
fi
+TEST_DATABASE=mysql
#
# We should use the same test execution classpath as the ant <junit> task, so we run ant to get
Modified: branches/Branch_Client_Failover_Experiment/tests/build.xml
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/build.xml 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/tests/build.xml 2006-12-05 17:20:56 UTC (rev 1708)
@@ -647,6 +647,7 @@
<antcall target="start-rmi-server-clustering">
<param name="test.registry.index" value="0"/>
</antcall>
+
<antcall target="start-rmi-server-clustering">
<param name="test.registry.index" value="1"/>
</antcall>
@@ -654,6 +655,7 @@
<param name="test.registry.index" value="2"/>
</antcall>
+
<mkdir dir="${build.tests.reports}"/>
<echo message=""/>
@@ -703,7 +705,7 @@
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<fileset dir="${build.tests.classes}">
- <include name="**/jms/clustering/*Test.class"/>
+ <include name="**/jms/clustering/ManualClusteringTest.class"/>
</fileset>
</batchtest>
</junit>
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringBase.java 2006-12-05 17:20:56 UTC (rev 1708)
@@ -83,10 +83,10 @@
try
{
- ServerManagement.start("all", 0);
- ServerManagement.start("all", 1);
+ ServerManagement.start("all", 0);
+ ServerManagement.start("all", 1);
ServerManagement.start("all", 2);
-
+
ServerManagement.deployClusteredQueue("testDistributedQueue", 0);
ServerManagement.deployClusteredTopic("testDistributedTopic", 0);
@@ -99,6 +99,8 @@
ic1 = new InitialContext(ServerManagement.getJNDIEnvironment(0));
ic2 = new InitialContext(ServerManagement.getJNDIEnvironment(1));
ic3 = new InitialContext(ServerManagement.getJNDIEnvironment(2));
+
+ log.info("Deployed destinations ok");
queue1 = (Queue)ic1.lookup("queue/testDistributedQueue");
queue2 = (Queue)ic2.lookup("queue/testDistributedQueue");
@@ -112,7 +114,7 @@
cf2 = (ConnectionFactory)ic2.lookup("/ConnectionFactory");
cf3 = (ConnectionFactory)ic3.lookup("/ConnectionFactory");
- drainQueues();
+ drainQueues();
}
catch (Exception e)
{
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java 2006-12-05 17:20:56 UTC (rev 1708)
@@ -54,6 +54,9 @@
{
String n =
"//localhost:" + RMITestServer.RMI_REGISTRY_PORTS[remoteServerIndex] + "/" + RMITestServer.NAMING_SERVER_NAME;
+
+ log.info("Using this url for rmi server lookup " + n);
+
namingDelegate = (NamingDelegate)Naming.lookup(n);
}
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java 2006-12-05 16:35:36 UTC (rev 1707)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java 2006-12-05 17:20:56 UTC (rev 1708)
@@ -50,6 +50,8 @@
*/
public static Hashtable getJNDIEnvironment(int serverIndex)
{
+ log.info("Returning remote context... server index:" + serverIndex);
+
Hashtable env = new Hashtable();
env.put("java.naming.factory.initial",
"org.jboss.test.messaging.tools.jndi.RemoteInitialContextFactory");
@@ -69,6 +71,8 @@
{
String s = (String)environment.get(Constants.SERVER_INDEX_PROPERTY_NAME);
+ log.info("Created initial context for " + s);
+
if (s == null)
{
throw new IllegalArgumentException("Initial context environment must contain " +
More information about the jboss-cvs-commits
mailing list