[jboss-cvs] JBoss Messaging SVN: r1806 - in trunk: src/etc/server/default/deploy src/main/org/jboss/messaging/core/plugin tests tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster tests/src/org/jboss/test/messaging/tools/jmx tests/src/org/jboss/test/messaging/tools/jmx/rmi
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 16 06:43:49 EST 2006
Author: timfox
Date: 2006-12-16 06:43:39 -0500 (Sat, 16 Dec 2006)
New Revision: 1806
Modified:
trunk/src/etc/server/default/deploy/connection-factories-service.xml
trunk/src/etc/server/default/deploy/destinations-service.xml
trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/FailoverMapperTest.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java
Log:
Fixed functional tests
Modified: trunk/src/etc/server/default/deploy/connection-factories-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/connection-factories-service.xml 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/src/etc/server/default/deploy/connection-factories-service.xml 2006-12-16 11:43:39 UTC (rev 1806)
@@ -13,7 +13,7 @@
xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=socket</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="JNDIBindings">
<bindings>
Modified: trunk/src/etc/server/default/deploy/destinations-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/destinations-service.xml 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/src/etc/server/default/deploy/destinations-service.xml 2006-12-16 11:43:39 UTC (rev 1806)
@@ -16,7 +16,7 @@
name="jboss.messaging.destination:service=Queue,name=DLQ"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<!--
@@ -27,7 +27,7 @@
name="jboss.messaging.destination:service=Topic,name=testTopic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=TopicPostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="SecurityConfig">
<security>
<role name="guest" read="true" write="true"/>
@@ -41,7 +41,7 @@
name="jboss.messaging.destination:service=Topic,name=securedTopic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=TopicPostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="SecurityConfig">
<security>
<role name="publisher" read="true" write="true" create="false"/>
@@ -53,7 +53,7 @@
name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=TopicPostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="SecurityConfig">
<security>
<role name="guest" read="true" write="true"/>
@@ -67,7 +67,7 @@
name="jboss.messaging.destination:service=Queue,name=testQueue"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="SecurityConfig">
<security>
<role name="guest" read="true" write="true"/>
@@ -81,35 +81,35 @@
name="jboss.messaging.destination:service=Queue,name=A"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:service=Queue,name=B"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:service=Queue,name=C"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:service=Queue,name=D"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:service=Queue,name=ex"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
</mbean>
<!--
@@ -120,7 +120,7 @@
name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=QueuePostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="Clustered">true</attribute>
</mbean>
@@ -128,7 +128,7 @@
name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=TopicPostOffice</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
<attribute name="Clustered">true</attribute>
</mbean>
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-12-16 11:43:39 UTC (rev 1806)
@@ -180,11 +180,15 @@
{
conn = ds.getConnection();
- ps = conn.prepareStatement(getSQLStatement("SELECT_COUNTER"));
+ String selectCounterSQL = getSQLStatement("SELECT_COUNTER");
+ ps = conn.prepareStatement(selectCounterSQL);
+
ps.setString(1, counterName);
+ if (trace) { log.trace("selecting counter: " + selectCounterSQL); }
rs = ps.executeQuery();
+ if (trace) { log.trace(JDBCUtil.statementToString(selectCounterSQL, counterName)); }
if (!rs.next())
{
@@ -193,15 +197,17 @@
ps.close();
- ps = conn.prepareStatement(getSQLStatement("INSERT_COUNTER"));
+ String insertCounterSQL = getSQLStatement("INSERT_COUNTER");
+ ps = conn.prepareStatement(insertCounterSQL);
+
ps.setString(1, counterName);
ps.setLong(2, size);
- int rows = ps.executeUpdate();
-
- if (trace) { log.trace(JDBCUtil.statementToString(getSQLStatement("INSERT_COUNTER"), counterName)
+ if (trace) { log.trace("inserting counter: " + insertCounterSQL); }
+ int rows = ps.executeUpdate();
+ if (trace) { log.trace(JDBCUtil.statementToString(insertCounterSQL, counterName)
+ " inserted " + rows + " rows"); }
ps.close();
@@ -210,24 +216,24 @@
return 0;
}
- if (trace) { log.trace(JDBCUtil.statementToString(getSQLStatement("SELECT_COUNTER"), counterName)); }
-
long nextId = rs.getLong(1);
rs.close();
rs = null;
ps.close();
+
+ String updateCounterSQL = getSQLStatement("UPDATE_COUNTER");
+
+ ps = conn.prepareStatement(updateCounterSQL);
- ps = conn.prepareStatement(getSQLStatement("UPDATE_COUNTER"));
-
ps.setLong(1, nextId + size);
ps.setString(2, counterName);
- int rows = ps.executeUpdate();
-
- if (trace) { log.trace(JDBCUtil.statementToString(getSQLStatement("UPDATE_COUNTER"), new Long(nextId + size),
+ if (trace) { log.trace("updating counter: " + updateCounterSQL); }
+ int rows = ps.executeUpdate();
+ if (trace) { log.trace(JDBCUtil.statementToString(updateCounterSQL, new Long(nextId + size),
counterName) + " updated " + rows + " rows"); }
return nextId;
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/tests/build.xml 2006-12-16 11:43:39 UTC (rev 1806)
@@ -398,6 +398,7 @@
<fileset dir="${build.tests.classes}">
<include name="**/messaging/core/**/*Test.class"/>
<include name="**/messaging/jms/**/*Test.class"/>
+ <exclude name="**/messaging/core/ha/**/*Test.class"/>
<exclude name="**/jms/stress/**"/>
<exclude name="**/jms/crash/*Test.class"/>
<exclude name="**/jms/MemLeakTest.class"/>
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java 2006-12-16 11:43:39 UTC (rev 1806)
@@ -94,7 +94,7 @@
ClusteredPostOffice office2 = null;
- //ClusteredPostOffice office3 = null;
+ ClusteredPostOffice office3 = null;
try
{
@@ -104,7 +104,7 @@
log.info("starting office 2");
office2 = createClusteredPostOffice(2, "testgroup");
- //office3 = createClusteredPostOffice(3, "testgroup");
+ office3 = createClusteredPostOffice(3, "testgroup");
Thread.sleep(2000);
@@ -114,8 +114,8 @@
office2.stop();
office2 = null;
-// office3.stop();
-// office3 = null;
+ office3.stop();
+ office3 = null;
}
finally
{
@@ -129,15 +129,15 @@
office2.stop();
}
-// if (office3 != null)
+ if (office3 != null)
+ {
+ office3.stop();
+ }
+
+// if (checkNoBindingData())
// {
-// office3.stop();
+// fail("data still in database");
// }
-
- if (checkNoBindingData())
- {
- fail("data still in database");
- }
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/FailoverMapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/FailoverMapperTest.java 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/FailoverMapperTest.java 2006-12-16 11:43:39 UTC (rev 1806)
@@ -50,10 +50,11 @@
DefaultFailoverMapper mapper = new DefaultFailoverMapper();
Map map = mapper.generateMapping(set);
- assertEquals(new Integer(15),map.get(new Integer(25)));
- assertEquals(new Integer(50),map.get(new Integer(15)));
- assertEquals(new Integer(25),map.get(new Integer(50)));
+ assertEquals(new Integer(25), map.get(new Integer(15)));
+ assertEquals(new Integer(50), map.get(new Integer(25)));
+ assertEquals(new Integer(15), map.get(new Integer(50)));
+
}
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-12-16 11:43:39 UTC (rev 1806)
@@ -558,7 +558,7 @@
ServiceDeploymentDescriptor pdd = new ServiceDeploymentDescriptor(persistenceConfigFileURL);
MBeanConfigurationElement postOfficeConfig =
- (MBeanConfigurationElement)pdd.query("service", "QueuePostOffice").iterator().next();
+ (MBeanConfigurationElement)pdd.query("service", "PostOffice").iterator().next();
String props = postOfficeConfig.getAttributeValue("SqlProperties");
@@ -605,7 +605,7 @@
ServiceDeploymentDescriptor pdd = new ServiceDeploymentDescriptor(persistenceConfigFileURL);
MBeanConfigurationElement postOfficeConfig =
- (MBeanConfigurationElement)pdd.query("service", "QueuePostOffice").iterator().next();
+ (MBeanConfigurationElement)pdd.query("service", "PostOffice").iterator().next();
String props = postOfficeConfig.getAttributeValue("SqlProperties");
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2006-12-16 11:43:39 UTC (rev 1806)
@@ -298,16 +298,6 @@
return server.getPersistenceManager();
}
- public PostOffice getQueuePostOffice() throws Exception
- {
- return server.getQueuePostOffice();
- }
-
- public PostOffice getTopicPostOffice() throws Exception
- {
- return server.getTopicPostOffice();
- }
-
public ServerPeer getServerPeer() throws Exception
{
return server.getServerPeer();
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java 2006-12-16 06:08:50 UTC (rev 1805)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java 2006-12-16 11:43:39 UTC (rev 1806)
@@ -76,21 +76,6 @@
throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
}
- /**
- * Only for in-VM use!
- */
- public PostOffice getQueuePostOffice() throws Exception
- {
- throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
- }
-
- /**
- * Only for in-VM use!
- */
- public PostOffice getTopicPostOffice() throws Exception
- {
- throw new UnsupportedOperationException("This method shouldn't be invoked on a remote server");
- }
// Public --------------------------------------------------------
More information about the jboss-cvs-commits
mailing list