[jboss-cvs] JBoss Messaging SVN: r3411 - in branches/Branch_MC_Integration_New: src/main/org/jboss/jms/server/microcontainer and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 5 10:15:37 EST 2007
Author: ataylor
Date: 2007-12-05 10:15:37 -0500 (Wed, 05 Dec 2007)
New Revision: 3411
Removed:
branches/Branch_MC_Integration_New/tests/etc/remote.xml
Modified:
branches/Branch_MC_Integration_New/build-thirdparty.xml
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/security/Role.java
branches/Branch_MC_Integration_New/tests/build.xml
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/InVMContext.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
fixes for tests
Modified: branches/Branch_MC_Integration_New/build-thirdparty.xml
===================================================================
--- branches/Branch_MC_Integration_New/build-thirdparty.xml 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/build-thirdparty.xml 2007-12-05 15:15:37 UTC (rev 3411)
@@ -124,6 +124,7 @@
<componentref name="jboss/jboss-retro" version="1.1.2"/>
<!-- This is a non declared dependency of jboss/test14 -->
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+ <componentref name="jboss/jnpserver" version="5.0.0.Beta3"/>
</build>
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -55,9 +55,7 @@
{
if(tm == null)
{
- Object o = kernelControllerContext.getController().getInstalledContext("jboss:service=TransactionManager").getTarget();
tm = TransactionManagerLocator.locateTransactionManager();
-
}
return tm;
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/security/Role.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/security/Role.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/security/Role.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -21,10 +21,12 @@
*/
package org.jboss.jms.server.security;
+import java.io.Serializable;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class Role
+public class Role implements Serializable
{
String name;
private boolean read = false;
Modified: branches/Branch_MC_Integration_New/tests/build.xml
===================================================================
--- branches/Branch_MC_Integration_New/tests/build.xml 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/build.xml 2007-12-05 15:15:37 UTC (rev 3411)
@@ -187,6 +187,7 @@
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.common.classpath"/>
<path refid="jboss.common.core.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
</path>
<path id="stress.test.execution.classpath">
@@ -301,7 +302,7 @@
<target name="short-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
- <!--<antcall target="invm-tests"/>-->
+ <antcall target="invm-tests"/>
<antcall target="remote-tests"/>
@@ -374,6 +375,7 @@
<exclude name="**/postoffice/**"/>
<exclude name="**/jms/JCAWrapperTest.class"/>
<exclude name="**/jms/server/ServerPeerTest.class"/>
+ <exclude name="**/jms/SecurityTest.class"/>
</fileset>
</batchtest>
</junit>
@@ -455,9 +457,7 @@
<sysproperty key="test.logfile.suffix" value="remote-client"/>
<sysproperty key="objectstore.dir" value="${objectstore.dir}"/>
<jvmarg value="-Xmx512M"/>
- <!--
- <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=n,suspend=n,address=antjunit"/>
- -->
+ <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/>-->
<classpath>
<path refid="test.execution.classpath"/>
</classpath>
@@ -491,6 +491,12 @@
<exclude name="**/jms/ManifestTest.class"/>
<exclude name="**/jms/JCAWrapperTest.class"/>
<exclude name="**/jms/ClientExitTest.class"/>
+
+ <exclude name="**/jms/ExpiryQueueTest.class"/>
+ <exclude name="**/jms/DLQTest.class"/>
+ <exclude name="**/jms/SecurityTest.class"/>
+ <exclude name="**/jms/crash/*Test.class"/>
+ <exclude name="**/jms/XAResourceRecoveryTest.class"/>
</fileset>
</batchtest>
</junit>
Deleted: branches/Branch_MC_Integration_New/tests/etc/remote.xml
===================================================================
--- branches/Branch_MC_Integration_New/tests/etc/remote.xml 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/etc/remote.xml 2007-12-05 15:15:37 UTC (rev 3411)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="ServerPeerBinding" class="org.jboss.jms.server.microcontainer.JndiBinder">
- <property name="jndiProperties">
- <inject bean="ConfigurationHelper" property="environment"/>
- </property>
- <property name="target">
- <inject bean="ServerPeer"/>
- </property>
- <property name="bindTo">java:/ServerPeer</property>
- </bean>
-
- <bean name="ServerPeerStatisticsBinding" class="org.jboss.jms.server.microcontainer.JndiBinder">
- <property name="jndiProperties">
- <inject bean="ConfigurationHelper" property="environment"/>
- </property>
- <property name="target">
- <inject bean="ServerPeerStatistics"/>
- </property>
- <property name="bindTo">java:/ServerPeerStatistics</property>
- </bean>
-
-</deployment>
\ No newline at end of file
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -40,6 +40,9 @@
import java.util.Properties;
/**
+ * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:tim.fox at jboss.org">Tim Fox</a>
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
public class JBMBaseTestCase extends ProxyAssertSupport
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -25,7 +25,6 @@
import org.jboss.jms.message.MessageIdGeneratorFactory;
import org.jboss.jms.server.JmsServer;
import org.jboss.jms.server.JmsServerStatistics;
-import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.microcontainer.JBMBootstrapServer;
import org.jboss.jms.server.security.Role;
import org.jboss.jms.tx.ResourceManagerFactory;
@@ -50,6 +49,9 @@
import java.util.List;
/**
+ * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:tim.fox at jboss.org">Tim Fox</a>
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
public class JBMServerTestCase extends JBMBaseTestCase
@@ -97,21 +99,65 @@
}
try
{
+ //create any new server we need
for (int i = servers.size(); i < getServerCount(); i++)
{
servers.add(ServerManagement.create(i));
}
- for (int i = 0; i < getServerCount(); i++)
+ //kill off any servers we dont need anymore
+ for (int i = getServerCount(); i < servers.size();)
{
- if (!servers.get(i).isStarted())
+ try
{
- servers.get(i).start(getContainerConfig(), getConfiguration(), getClearDatabase() && i == 0);
- deployAndLookupAdministeredObjects();
+
+ servers.get(i).stop();
}
+ catch (Exception e)
+ {
+ //ignore, as it meay be remote and stopped anyway
+ }
+ servers.remove(i);
}
+ //start the servers if needed
+ for (int i = 0; i < servers.size(); i++)
+ {
+ boolean started = false;
+ try
+ {
+ started = servers.get(i).isStarted();
+ }
+ catch (Exception e)
+ {
+ //ignore, incase its a remote server
+ }
+ if (!started)
+ {
+ if(i > getServerCount())
+ {
+ servers.get(i).stop();
+ }
+ else
+ {
+ try
+ {
+ servers.get(i).start(getContainerConfig(), getConfiguration(), getClearDatabase() && i == 0);
+ }
+ catch (Exception e)
+ {
+ //if we are remote we will need recreating if we get here
+ servers.set(i, ServerManagement.create(i));
+ servers.get(i).start(getContainerConfig(), getConfiguration(), getClearDatabase() && i == 0);
+ }
+ }
+ //deploy the objects for this test
+ deployAdministeredObjects(i);
+ }
+ }
+ lookUp();
}
catch (Exception e)
{
+ //if we get here we need to clean up for the next test
e.printStackTrace();
for (int i = 0; i < getServerCount(); i++)
{
@@ -119,7 +165,7 @@
}
throw e;
}
- //undeployAdministeredObjects();
+ //empty the queues
checkEmpty(queue1);
checkEmpty(queue2);
checkEmpty(queue3);
@@ -130,17 +176,20 @@
checkNoSubscriptions(topic1);
checkNoSubscriptions(topic2);
checkNoSubscriptions(topic3);
-
+ //some clean up between tests
+ for (int i = 0; i < getServerCount(); i++)
+ {
+ servers.get(i).clear();
+ }
ResourceManagerFactory.instance.clear();
MessageIdGeneratorFactory.instance.clear();
- ((ServerPeer) getJmsServer()).getTxRepository().stop();
- ((ServerPeer) getJmsServer()).getTxRepository().start();
}
protected void tearDown() throws Exception
{
super.tearDown();
+ //this will make sure there arent any connection hanging around
assertEquals(0, ResourceManagerFactory.instance.size());
}
@@ -159,7 +208,7 @@
{
servers.get(i).start(getContainerConfig(), getConfiguration(), i != 0);
}
- //deployAndLookupAdministeredObjects();
+ //deployAdministeredObjects();
}
public void stopServerPeer() throws Exception
@@ -177,7 +226,7 @@
{
servers.get(i).startServerPeer(i, null, null, null, false);
}
- //deployAndLookupAdministeredObjects();
+ //deployAdministeredObjects();
}
public synchronized void stopDestinationManager() throws Exception
@@ -216,6 +265,23 @@
deployQueue("Queue3");
deployQueue("Queue4");
+ lookUp();
+ }
+
+ protected void deployAdministeredObjects(int i) throws Exception
+ {
+ deployTopic("Topic1", i);
+ deployTopic("Topic2", i);
+ deployTopic("Topic3", i);
+ deployQueue("Queue1", i);
+ deployQueue("Queue2", i);
+ deployQueue("Queue3", i);
+ deployQueue("Queue4", i);
+ }
+
+ private void lookUp()
+ throws Exception
+ {
InitialContext ic = getInitialContext();
topic1 = (Topic) ic.lookup("/topic/Topic1");
topic2 = (Topic) ic.lookup("/topic/Topic2");
@@ -245,12 +311,10 @@
undeployQueue("Queue4");
}
+
public String[] getContainerConfig()
{
- if(ServerManagement.isLocal())
return new String[]{"datasource.xml", "transaction-manager.xml", "invm-beans.xml", "jbm-beans.xml"};
- else
- return new String[]{"datasource.xml", "transaction-manager.xml", "invm-beans.xml", "jbm-beans.xml", "remote.xml"};
}
protected JmsServer getJmsServer() throws Exception
@@ -438,7 +502,7 @@
public boolean checkEmpty(Queue queue) throws Exception
{
- Integer messageCount = getJmsServerStatistics().getMessageCountForQueue(queue.getQueueName());
+ Integer messageCount = servers.get(0).getMessageCountForQueue(queue.getQueueName());
if (messageCount > 0)
{
removeAllMessages(queue.getQueueName(), true);
@@ -479,9 +543,9 @@
protected void removeAllMessages(String destName, boolean isQueue, int server) throws Exception
{
if (isQueue)
- servers.get(server).getJmsServer().removeAllMessagesForQueue(destName);
+ servers.get(server).removeAllMessagesForQueue(destName);
else
- servers.get(server).getJmsServer().removeAllMessagesForTopic(destName);
+ servers.get(server).removeAllMessagesForTopic(destName);
}
public void dropTables() throws Exception
@@ -608,7 +672,7 @@
protected boolean assertRemainingMessages(int expected) throws Exception
{
- Integer messageCount = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer messageCount = servers.get(0).getMessageCountForQueue("Queue1");
log.trace("There are " + messageCount + " messages");
assertEquals(expected, messageCount.intValue());
@@ -728,4 +792,137 @@
databaseClearer.deleteData();
}
}
+
+ /*protected void deployAdministeredObjects() throws Exception
+ {
+
+ ServerManagement.deployTopic("Topic1");
+ ServerManagement.deployTopic("Topic2");
+ ServerManagement.deployTopic("Topic3");
+ ServerManagement.deployQueue("Queue1");
+ ServerManagement.deployQueue("Queue2");
+ ServerManagement.deployQueue("Queue3");
+ ServerManagement.deployQueue("Queue4");
+
+ ic = getInitialContext();
+ cf = (JBossConnectionFactory) ic.lookup("/ConnectionFactory");
+ topic1 = (Topic) ic.lookup("/topic/Topic1");
+ topic2 = (Topic) ic.lookup("/topic/Topic2");
+ topic3 = (Topic) ic.lookup("/topic/Topic3");
+ queue1 = (Queue) ic.lookup("/queue/Queue1");
+ queue2 = (Queue) ic.lookup("/queue/Queue2");
+ queue3 = (Queue) ic.lookup("/queue/Queue3");
+ queue4 = (Queue) ic.lookup("/queue/Queue4");
+ }*/
+ protected List listAllSubscriptionsForTopic(String s) throws Exception
+ {
+ return servers.get(0).listAllSubscriptionsForTopic(s);
+ }
+
+ protected Integer getMessageCountForQueue(String s) throws Exception
+ {
+ return servers.get(0).getMessageCountForQueue(s);
+ }
+
+ protected Integer getMessageCountForQueue(String s, int server) throws Exception
+ {
+ return servers.get(server).getMessageCountForQueue(s);
+ }
+
+ protected HashSet<Role> getSecurityConfig() throws Exception
+ {
+ return servers.get(0).getSecurityConfig();
+ }
+
+ protected void setSecurityConfig(HashSet<Role> defConfig) throws Exception
+ {
+ servers.get(0).setSecurityConfig(defConfig);
+ }
+
+ protected void setSecurityConfigOnManager(boolean b, String s, HashSet<Role> lockedConf) throws Exception
+ {
+ servers.get(0).setSecurityConfigOnManager(b, s, lockedConf);
+ }
+
+ protected void setRedeliveryDelayOnDestination(String dest, boolean isQueue, long delay) throws Exception
+ {
+ servers.get(0).setRedeliveryDelayOnDestination(dest, isQueue, delay);
+ }
+
+ protected void setDefaultRedeliveryDelay(long delay) throws Exception
+ {
+ servers.get(0).setDefaultRedeliveryDelay(delay);
+ }
+
+ protected void kill(int i) throws Exception
+ {
+ log.info("Attempting to kill server " + i);
+
+ if (i == 0)
+ {
+ //Cannot kill server 0 if there are any other servers since it has the rmi registry in it
+ for (int j = 1; j < servers.size(); j++)
+ {
+ if (servers.get(j) != null)
+ {
+ throw new IllegalStateException("Cannot kill server 0, since server[" + j + "] still exists");
+ }
+ }
+ }
+
+ if (i >= servers.size())
+ {
+ log.info("server " + i + " has not been created or has already been killed, so it cannot be killed");
+ }
+ else
+ {
+ Server server = servers.get(i);
+ log.info("invoking kill() on server " + i);
+ try
+ {
+ server.kill();
+ }
+ catch (Throwable t)
+ {
+ // This is likely to throw an exception since the server dies before the response is received
+ }
+
+ log.info("Waiting for server to die");
+
+ try
+ {
+ while (true)
+ {
+ server.ping();
+ log.debug("server " + i + " still alive ...");
+ Thread.sleep(100);
+ }
+ }
+ catch (Throwable e)
+ {
+ //Ok
+ }
+
+ Thread.sleep(300);
+
+ log.info("server " + i + " killed and dead");
+ }
+ }
+
+ protected Server poisonTheServer(int serverIndex, int type) throws Exception
+ {
+ Server poisoned = servers.get(serverIndex);
+
+ //We set the server to null so it can be recreated again, but ONLY for those poisons that cause the server to get killed
+ //We do not do this for other poisons that don't
+
+ /*if (type != PoisonInterceptor.LONG_SEND && type != PoisonInterceptor.NULL)
+ {
+ servers.get(0) = null;
+ }*/
+
+ poisoned.poisonTheServer(type);
+
+ return poisoned;
+ }
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -21,17 +21,7 @@
*/
package org.jboss.test.messaging.jms;
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
-import javax.jms.TopicSubscriber;
+import javax.jms.*;
/**
@@ -106,7 +96,7 @@
int count = 0;
while (true)
{
- TextMessage tm = (TextMessage)sub1.receive(1000);
+ TextMessage tm = (TextMessage)sub1.receive(10000);
if (tm == null)
{
break;
@@ -125,7 +115,7 @@
count = 0;
while (true)
{
- TextMessage tm = (TextMessage)sub2.receive(200);
+ TextMessage tm = (TextMessage)sub2.receive(10000);
if (tm == null)
{
break;
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -71,7 +71,7 @@
s.createDurableSubscriber(topic1, "monicabelucci");
- List subs = getJmsServerStatistics().listAllSubscriptionsForTopic("Topic1");
+ List subs = listAllSubscriptionsForTopic("Topic1");
assertNotNull(subs);
@@ -85,7 +85,7 @@
conn.close();
- subs = getJmsServerStatistics().listAllSubscriptionsForTopic("Topic1");
+ subs = listAllSubscriptionsForTopic("Topic1");
assertEquals(1, subs.size());
@@ -122,8 +122,8 @@
}
}
}
-
+
/**
* JMS 1.1 6.11.1: A client can change an existing durable subscription by creating a durable
* TopicSubscriber with the same name and a new topic and/or message selector, or NoLocal
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -35,7 +35,7 @@
cf = getConnectionFactory();
//ServerManagement.create();
//ServerManagement.startServerPeer(0, "invm-beans.xml");
- //deployAndLookupAdministeredObjects();
+ //deployAdministeredObjects();
/*checkEmpty(queue1);
checkEmpty(queue2);
@@ -60,25 +60,4 @@
super(name);
}
- /*protected void deployAndLookupAdministeredObjects() throws Exception
- {
-
- ServerManagement.deployTopic("Topic1");
- ServerManagement.deployTopic("Topic2");
- ServerManagement.deployTopic("Topic3");
- ServerManagement.deployQueue("Queue1");
- ServerManagement.deployQueue("Queue2");
- ServerManagement.deployQueue("Queue3");
- ServerManagement.deployQueue("Queue4");
-
- ic = getInitialContext();
- cf = (JBossConnectionFactory) ic.lookup("/ConnectionFactory");
- topic1 = (Topic) ic.lookup("/topic/Topic1");
- topic2 = (Topic) ic.lookup("/topic/Topic2");
- topic3 = (Topic) ic.lookup("/topic/Topic3");
- queue1 = (Queue) ic.lookup("/queue/Queue1");
- queue2 = (Queue) ic.lookup("/queue/Queue2");
- queue3 = (Queue) ic.lookup("/queue/Queue3");
- queue4 = (Queue) ic.lookup("/queue/Queue4");
- }*/
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -84,7 +84,7 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons.receive(500);
+ TextMessage tm = (TextMessage)cons.receive(10000);
assertNotNull(tm);
@@ -223,7 +223,7 @@
prod.send(tm);
- TextMessage tm2 = (TextMessage)cons1.receive(2000);
+ TextMessage tm2 = (TextMessage)cons1.receive(10000);
assertNotNull(tm2);
@@ -260,7 +260,7 @@
/**
- * The simplest possible receive(2000) test for a non-persistent message.
+ * The simplest possible receive(10000) test for a non-persistent message.
*/
public void testReceive() throws Exception
{
@@ -291,7 +291,7 @@
queueProducer.send(tm);
- TextMessage m = (TextMessage)queueConsumer.receive(2000);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals(tm.getText(), m.getText());
}
@@ -338,7 +338,7 @@
queueProducer.send(tm);
- TextMessage m = (TextMessage)queueConsumer.receive(2000);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals(tm.getText(), m.getText());
}
@@ -386,7 +386,7 @@
// startServerPeer consumer connection after the message is submitted
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(2000);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals(tm.getText(), m.getText());
}
@@ -584,7 +584,7 @@
MessageConsumer cons = sessReceive.createConsumer(queue1);
- TextMessage m2 = (TextMessage)cons.receive(1500);
+ TextMessage m2 = (TextMessage)cons.receive(10000);
assertNotNull(m2);
@@ -637,7 +637,7 @@
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(1500);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals(m.getText(), "One");
@@ -647,7 +647,7 @@
try
{
- queueConsumer.receive(2000);
+ queueConsumer.receive(10000);
fail("should throw exception");
}
catch(javax.jms.IllegalStateException e)
@@ -701,7 +701,7 @@
consumerConnection.start();
- Message r = queueConsumer.receive(2000);
+ Message r = queueConsumer.receive(10000);
assertEquals(m.getJMSMessageID(), r.getJMSMessageID());
}
@@ -757,7 +757,7 @@
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(1500);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals("One", m.getText());
@@ -769,7 +769,7 @@
MessageConsumer queueConsumer2 = consumerSession.createConsumer(queue1);
- m = (TextMessage)queueConsumer2.receive(1500);
+ m = (TextMessage)queueConsumer2.receive(10000);
assertNotNull(m);
@@ -811,7 +811,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(2000);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("a", rm1.getText());
@@ -821,11 +821,11 @@
sess.commit();
- TextMessage rm2 = (TextMessage)cons2.receive(1500);
+ TextMessage rm2 = (TextMessage)cons2.receive(10000);
assertNotNull(rm2);
assertEquals("b", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(1500);
+ TextMessage rm3 = (TextMessage)cons2.receive(10000);
assertNotNull(rm3);
assertEquals("c", rm3.getText());
@@ -866,7 +866,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(1500);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -876,11 +876,11 @@
sess.commit();
- TextMessage rm2 = (TextMessage)cons2.receive(1500);
+ TextMessage rm2 = (TextMessage)cons2.receive(10000);
assertNotNull(rm2);
assertEquals("hello2", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(1500);
+ TextMessage rm3 = (TextMessage)cons2.receive(10000);
assertNotNull(rm3);
assertEquals("hello3", rm3.getText());
@@ -920,7 +920,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(1500);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -930,11 +930,11 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- TextMessage rm2 = (TextMessage)cons2.receive(1500);
+ TextMessage rm2 = (TextMessage)cons2.receive(10000);
assertNotNull(rm2);
assertEquals("hello2", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(1500);
+ TextMessage rm3 = (TextMessage)cons2.receive(10000);
assertNotNull(rm3);
assertEquals("hello3", rm3.getText());
@@ -975,7 +975,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(1500);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
log.trace(rm1.getJMSMessageID());
@@ -985,14 +985,14 @@
sess.rollback();
log.trace("rolled back");
- TextMessage rm2 = (TextMessage)cons1.receive(1500);
+ TextMessage rm2 = (TextMessage)cons1.receive(10000);
assertEquals("hello1", rm2.getText());
log.trace(rm1.getJMSMessageID());
- TextMessage rm3 = (TextMessage)cons1.receive(1500);
+ TextMessage rm3 = (TextMessage)cons1.receive(10000);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons1.receive(1500);
+ TextMessage rm4 = (TextMessage)cons1.receive(10000);
assertEquals("hello3", rm4.getText());
sess.commit();
@@ -1032,7 +1032,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(1500);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -1046,15 +1046,15 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- TextMessage rm2 = (TextMessage)cons2.receive(1500);
+ TextMessage rm2 = (TextMessage)cons2.receive(10000);
assertNotNull(rm2);
assertEquals("hello1", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(1500);
+ TextMessage rm3 = (TextMessage)cons2.receive(10000);
assertNotNull(rm3);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons2.receive(1500);
+ TextMessage rm4 = (TextMessage)cons2.receive(10000);
assertNotNull(rm4);
assertEquals("hello3", rm4.getText());
@@ -1095,22 +1095,22 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(1500);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
//redeliver
sess.recover();
- TextMessage rm2 = (TextMessage)cons1.receive(1500);
+ TextMessage rm2 = (TextMessage)cons1.receive(10000);
assertNotNull(rm2);
assertEquals("hello1", rm2.getText());
- TextMessage rm3 = (TextMessage)cons1.receive(1500);
+ TextMessage rm3 = (TextMessage)cons1.receive(10000);
assertNotNull(rm3);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons1.receive(1500);
+ TextMessage rm4 = (TextMessage)cons1.receive(10000);
assertNotNull(rm4);
assertEquals("hello3", rm4.getText());
@@ -1150,7 +1150,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(1500);
+ TextMessage rm1 = (TextMessage)cons1.receive(10000);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -1165,15 +1165,15 @@
log.debug("receiving ...");
- TextMessage rm2 = (TextMessage)cons2.receive(1500);
+ TextMessage rm2 = (TextMessage)cons2.receive(10000);
assertNotNull(rm2);
assertEquals("hello1", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(1500);
+ TextMessage rm3 = (TextMessage)cons2.receive(10000);
assertNotNull(rm3);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons2.receive(1500);
+ TextMessage rm4 = (TextMessage)cons2.receive(10000);
assertNotNull(rm4);
assertEquals("hello3", rm4.getText());
@@ -1221,7 +1221,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage r1 = (TextMessage)cons1.receive(2000);
+ TextMessage r1 = (TextMessage)cons1.receive(10000);
assertEquals(tm1.getText(), r1.getText());
@@ -1230,11 +1230,11 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- TextMessage r2 = (TextMessage)cons2.receive(2000);
+ TextMessage r2 = (TextMessage)cons2.receive(10000);
assertEquals(tm2.getText(), r2.getText());
- TextMessage r3 = (TextMessage)cons2.receive(2000);
+ TextMessage r3 = (TextMessage)cons2.receive(10000);
assertEquals(tm3.getText(), r3.getText());
@@ -1281,9 +1281,9 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- Message r1 = cons2.receive(2000);
- Message r2 = cons2.receive(2000);
- Message r3 = cons2.receive(2000);
+ Message r1 = cons2.receive(10000);
+ Message r2 = cons2.receive(10000);
+ Message r3 = cons2.receive(10000);
//Messages should be received?
assertNotNull(r1);
@@ -1330,7 +1330,7 @@
MessageConsumer cons = sessReceive.createConsumer(queue1);
- TextMessage m2 = (TextMessage)cons.receive(1500);
+ TextMessage m2 = (TextMessage)cons.receive(10000);
assertNotNull(m2);
@@ -1397,14 +1397,14 @@
{
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage m = (TextMessage)cons.receive(5000);
+ TextMessage m = (TextMessage)cons.receive(10000);
if (m == null)
{
log.error("Didn't receive all the messages");
failed = true;
break;
}
- log.trace("received message");
+ log.info("received message");
if (!m.getText().equals("testing"))
{
failed = true;
@@ -1714,7 +1714,7 @@
}
}, "Producer").start();
- assertNull(topicConsumer.receive(1500));
+ assertNull(topicConsumer.receive(10000));
}
finally
{
@@ -1770,7 +1770,7 @@
}
}, "Producer").start();
- Message m2 = topicConsumer.receive(1500);
+ Message m2 = topicConsumer.receive(10000);
assertEquals(m1.getJMSMessageID(), m2.getJMSMessageID());
}
finally
@@ -1941,7 +1941,7 @@
for (int i = 0; i < count; i++)
{
- Message m = queueConsumer.receive(1500);
+ Message m = queueConsumer.receive(10000);
assertNotNull(m);
}
}
@@ -2067,7 +2067,7 @@
}, "closing thread");
closerThread.start();
- assertNull(topicConsumer.receive(1500));
+ assertNull(topicConsumer.receive(10000));
// wait for the closing thread to finish
latch.acquire();
@@ -2592,7 +2592,7 @@
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(1500);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals("One", m.getText());
consumerConnection.close();
@@ -2604,7 +2604,7 @@
queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- m = (TextMessage)queueConsumer.receive(1500);
+ m = (TextMessage)queueConsumer.receive(10000);
assertEquals("Two", m.getText());
}
finally
@@ -2646,7 +2646,7 @@
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(1500);
+ TextMessage m = (TextMessage)queueConsumer.receive(10000);
assertEquals("One", m.getText());
consumerSession.commit();
@@ -2659,7 +2659,7 @@
queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- m = (TextMessage)queueConsumer.receive(1500);
+ m = (TextMessage)queueConsumer.receive(10000);
assertEquals("Two", m.getText());
}
finally
@@ -2727,7 +2727,7 @@
{
try
{
- m = consumer.receive(1500);
+ m = consumer.receive(10000);
}
catch (Exception e)
{
@@ -2845,8 +2845,8 @@
TextMessage tm = sess3.createTextMessage("nurse!");
prod.send(tm);
- TextMessage tm1 = (TextMessage)cons1.receive(1500);
- TextMessage tm2 = (TextMessage)cons2.receive(1500);
+ TextMessage tm1 = (TextMessage)cons1.receive(10000);
+ TextMessage tm2 = (TextMessage)cons2.receive(10000);
assertNotNull(tm1);
assertNotNull(tm2);
@@ -2861,12 +2861,12 @@
sess2.recover();
- tm2 = (TextMessage)cons2.receive(1500);
+ tm2 = (TextMessage)cons2.receive(10000);
assertNotNull(tm2);
assertEquals("nurse!", tm2.getText());
//but tm1 should not be redelivered
- tm1 = (TextMessage)cons1.receive(1500);
+ tm1 = (TextMessage)cons1.receive(10000);
assertNull(tm1);
}
finally
@@ -2992,7 +2992,7 @@
MessageConsumer theConsumer = sessReceive.createConsumer(queue1);
- Message m2 = theConsumer.receive(1500);
+ Message m2 = theConsumer.receive(10000);
log.trace("m2 is " + m2);
@@ -3000,19 +3000,19 @@
assertEquals("aardvark", m2.getStringProperty("p1"));
- BytesMessage bm2 = (BytesMessage)theConsumer.receive(1500);
+ BytesMessage bm2 = (BytesMessage)theConsumer.receive(10000);
assertEquals("aardvark", bm2.readUTF());
- MapMessage mm2 = (MapMessage)theConsumer.receive(1500);
+ MapMessage mm2 = (MapMessage)theConsumer.receive(10000);
assertEquals("aardvark", mm2.getString("s1"));
- ObjectMessage om2 = (ObjectMessage)theConsumer.receive(1500);
+ ObjectMessage om2 = (ObjectMessage)theConsumer.receive(10000);
assertEquals("aardvark", (String)om2.getObject());
- StreamMessage sm2 = (StreamMessage)theConsumer.receive(1500);
+ StreamMessage sm2 = (StreamMessage)theConsumer.receive(10000);
assertEquals("aardvark", sm2.readString());
- TextMessage tm2 = (TextMessage)theConsumer.receive(1500);
+ TextMessage tm2 = (TextMessage)theConsumer.receive(10000);
assertEquals("aardvark", tm2.getText());
}
finally
@@ -3059,7 +3059,7 @@
int count = 0;
while (true)
{
- TextMessage tm = (TextMessage)durable.receive(1500);
+ TextMessage tm = (TextMessage)durable.receive(10000);
if (tm == null)
{
break;
@@ -3368,7 +3368,7 @@
int count = 0;
while (true)
{
- TextMessage tm = (TextMessage)durable2.receive(1500);
+ TextMessage tm = (TextMessage)durable2.receive(10000);
if (tm == null)
{
break;
@@ -3430,7 +3430,7 @@
for (int i = 0; i < NUM_TO_RECEIVE1; i++)
{
- TextMessage tm = (TextMessage)durable.receive(1500);
+ TextMessage tm = (TextMessage)durable.receive(10000);
if (tm == null)
{
fail();
@@ -3452,7 +3452,7 @@
conn2.start();
- TextMessage tm = (TextMessage)durable2.receive(1500);
+ TextMessage tm = (TextMessage)durable2.receive(10000);
assertNull(tm);
durable2.close();
@@ -4034,7 +4034,9 @@
/** Blocks the calling thread until at least a message is received */
public void waitForMessages() throws InterruptedException
{
+ log.info("waiting for messages");
latch.acquire();
+ log.info("waiting for messages done");
}
public void onMessage(Message m)
@@ -4043,26 +4045,26 @@
{
TextMessage tm = (TextMessage)m;
- log.trace("Got message:" + tm.getText() + " count is " + count);
+ log.info("Got message:" + tm.getText() + " count is " + count);
if (count == 0)
{
if (!("a".equals(tm.getText())))
{
- log.trace("Should be a but was " + tm.getText());
+ log.info("Should be a but was " + tm.getText());
failed = true;
latch.release();
}
if (transacted)
{
sess.rollback();
- log.trace("rollback() called");
+ log.info("rollback() called");
}
else
{
- log.trace("Calling recover");
+ log.info("Calling recover");
sess.recover();
- log.trace("recover() called");
+ log.info("recover() called");
}
}
@@ -4070,7 +4072,7 @@
{
if (!("a".equals(tm.getText())))
{
- log.trace("Should be a but was " + tm.getText());
+ log.info("Should be a but was " + tm.getText());
failed = true;
latch.release();
}
@@ -4084,7 +4086,7 @@
{
if (!("b".equals(tm.getText())))
{
- log.trace("Should be b but was " + tm.getText());
+ log.info("Should be b but was " + tm.getText());
failed = true;
latch.release();
}
@@ -4093,7 +4095,7 @@
{
if (!("c".equals(tm.getText())))
{
- log.trace("Should be c but was " + tm.getText());
+ log.info("Should be c but was " + tm.getText());
failed = true;
latch.release();
}
@@ -4103,7 +4105,7 @@
}
else
{
- log.trace("Acknowledging session");
+ log.info("Acknowledging session");
tm.acknowledge();
}
latch.release();
@@ -4112,7 +4114,7 @@
}
catch (JMSException e)
{
- log.trace("Caught JMSException", e);
+ log.info("Caught JMSException", e);
failed = true;
latch.release();
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -22,7 +22,6 @@
package org.jboss.test.messaging.jms;
import org.jboss.jms.message.JBossMessage;
-import org.jboss.jms.server.ServerPeer;
import javax.jms.*;
@@ -219,23 +218,23 @@
try
{
- ((ServerPeer)getJmsServer()).getDestinationManager().getDestination("Queue1", true).setRedeliveryDelay(-1);
+ setRedeliveryDelayOnDestination("Queue1", true, -1);
long delay = 3000;
- getJmsServer().getConfiguration().setDefaultRedeliveryDelay(delay);
+ setDefaultRedeliveryDelay(delay);
this.delayedRedeliveryDefaultOnClose(delay);
this.delayedRedeliveryDefaultOnRollback(delay);
}
finally
{
- getJmsServer().getConfiguration().setDefaultRedeliveryDelay(0);
+ setDefaultRedeliveryDelay(0);
removeAllMessages(queue1.getQueueName(), true, 0);
}
}
-
+
public void testDelayedRedeliveryOverride() throws Exception
{
@@ -243,9 +242,9 @@
{
long delay = 6000;
- ((ServerPeer)getJmsServer()).getDestinationManager().getDestination("Queue1", true).setRedeliveryDelay(delay);
+ setRedeliveryDelayOnDestination("Queue1", true, delay);
- getJmsServer().getConfiguration().setDefaultRedeliveryDelay(3000);
+ setDefaultRedeliveryDelay(3000);
this.delayedRedeliveryDefaultOnClose(delay);
@@ -253,9 +252,9 @@
}
finally
{
- getJmsServer().getConfiguration().setDefaultRedeliveryDelay(0);
+ setDefaultRedeliveryDelay(0);
- ((ServerPeer)getJmsServer()).getDestinationManager().getDestination("Queue1", true).setRedeliveryDelay(-1);
+ setRedeliveryDelayOnDestination("Queue1", true, -1);
removeAllMessages(queue1.getQueueName(), true, 0);
}
@@ -272,7 +271,7 @@
// Some tests here are changing this attribute.. what would affect tests later
// Instead of restart the ServerPeer I'm just restoring the default
- getJmsServer().getConfiguration().setDefaultRedeliveryDelay(0);
+ setDefaultRedeliveryDelay(0);
}
// Private -------------------------------------------------------
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -22,7 +22,6 @@
package org.jboss.test.messaging.jms;
import org.jboss.jms.exception.MessagingXAException;
-import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.security.Role;
import org.jboss.jms.tx.MessagingXid;
import org.jboss.logging.Logger;
@@ -258,7 +257,7 @@
Connection conn = null;
try
{
- getJmsServer().getConfiguration().setSecurityConfig(oldDefaultConfig);
+ setSecurityConfig(oldDefaultConfig);
conn = cf.createConnection();
assertTrue(canWriteDestination(conn, queue1));
}
@@ -437,7 +436,7 @@
{
deployConnectionFactory("dilbert-id", "preConfcf", new String[]{"preConfcf"});
ConnectionFactory cf = (ConnectionFactory) getInitialContext().lookup("preConfcf");
- getJmsServer().getConfiguration().setSecurityConfig(oldDefaultConfig);
+ setSecurityConfig(oldDefaultConfig);
conn = cf.createConnection("dilbert", "dogbert");
assertTrue(this.canCreateDurableSub(conn, topic1, "sub2"));
}
@@ -544,7 +543,7 @@
*/
public void testDefaultSecurityUpdate() throws Exception
{
- HashSet<Role> defSecConf = getJmsServer().getConfiguration().getSecurityConfig();
+ HashSet<Role> defSecConf = getSecurityConfig();
// "john" has the role def, so he should be able to create a producer and a consumer on a queue
@@ -559,7 +558,7 @@
HashSet<Role> newSecurityConfig = new HashSet<Role>();
newSecurityConfig.add(new Role("someotherrole", true, true, false));
- getJmsServer().getConfiguration().setSecurityConfig(newSecurityConfig);
+ setSecurityConfig(newSecurityConfig);
assertFalse(canReadDestination(conn, queue2));
// we should only look non transacted, as looking on connection would require the test
@@ -569,7 +568,7 @@
newSecurityConfig = new HashSet<Role>();
newSecurityConfig.add(new Role("def", true, false, false));
- getJmsServer().getConfiguration().setSecurityConfig(newSecurityConfig);
+ setSecurityConfig(newSecurityConfig);
assertTrue(canReadDestination(conn, queue2));
// to avoid cache evict timeout
@@ -581,7 +580,7 @@
{
conn.close();
}
- getJmsServer().getConfiguration().setSecurityConfig(defSecConf);
+ setSecurityConfig(defSecConf);
}
}
@@ -633,12 +632,12 @@
HashSet<Role> lockedConf = new HashSet<Role>();
lockedConf.add(new Role("alien", true, true, true));
- ((ServerPeer)getJmsServer()).getSecurityManager().setSecurityConfig(true, "Queue2", lockedConf);
+ setSecurityConfigOnManager(true, "Queue2", lockedConf);
assertFalse(canReadDestination(conn, queue2));
assertFalse(canWriteDestination(conn, queue2, false));
- ((ServerPeer)getJmsServer()).getSecurityManager().setSecurityConfig(true, "Queue2", defConfig);
+ setSecurityConfigOnManager(true, "Queue2", defConfig);
assertTrue(canReadDestination(conn, queue2));
assertTrue(canWriteDestination(conn, queue2, false));
@@ -651,7 +650,7 @@
}
}
}
-
+
/**
* This test makes sure that changing the topic security configuration on the server has effect
* over already deployed destinations.
@@ -701,12 +700,12 @@
HashSet<Role> lockedConf = new HashSet<Role>();
lockedConf.add(new Role("alien", true, true, true)) ;
- getJmsServer().getConfiguration().setSecurityConfig(lockedConf);
+ setSecurityConfig(lockedConf);
assertFalse(canReadDestination(conn, topic2));
assertFalse(canWriteDestination(conn, topic2, false));
- getJmsServer().getConfiguration().setSecurityConfig(defConfig);
+ setSecurityConfig(defConfig);
assertTrue(canReadDestination(conn, topic2));
assertTrue(canWriteDestination(conn, topic2, false));
@@ -776,7 +775,7 @@
{
super.setUp();
- oldDefaultConfig = getJmsServer().getConfiguration().getSecurityConfig();
+ oldDefaultConfig = getSecurityConfig();
HashSet<Role> roles = new HashSet<Role>();
roles.add(new Role("guest", true, true, false));
@@ -795,14 +794,14 @@
roles3.add(new Role("publisher", true, true, false));
configureSecurityForDestination("Topic2", false, roles3);
- getJmsServer().getConfiguration().setSecurityConfig(defConfig);
+ setSecurityConfig(defConfig);
}
protected void tearDown() throws Exception
{
super.tearDown();
- getJmsServer().getConfiguration().setSecurityConfig(oldDefaultConfig);
+ setSecurityConfig(oldDefaultConfig);
configureSecurityForDestination("Queue1",true, null);
configureSecurityForDestination("Queue2", true, null);
configureSecurityForDestination("Topic1", false, null);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -173,7 +173,7 @@
conn.close();
ObjectName on = new ObjectName("jboss.messaging.destination:service=Queue,name=Queue1");
- Integer i = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer i = getMessageCountForQueue("Queue1");
assertEquals(1, i.intValue());
}
@@ -186,7 +186,7 @@
removeAllMessages(queue1.getQueueName(), true, 0);
}
}
-
+
public void testRedeliveredFlagTopic() throws Exception
{
Connection conn = null;
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -31,7 +31,6 @@
import org.jboss.tm.TxUtils;
import javax.jms.*;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -64,7 +63,13 @@
super(name);
}
- protected void setUp() throws Exception
+
+ public int getServerCount()
+ {
+ return 2;
+ }
+
+ protected void setUp() throws Exception
{
super.setUp();
@@ -79,18 +84,24 @@
// have deleted the database and the recovery manager may attempt to
// recover transactions
- InitialContext localIc = getInitialContext();
+ if (ServerManagement.isRemote())
+ {
+ tm = new TransactionManagerImple();
+ }
+ else
+ {
+ InitialContext localIc = getInitialContext();
- tm = (TransactionManager) localIc
- .lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
+ tm = (TransactionManager)localIc.lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
+ }
assertTrue(tm instanceof TransactionManagerImple);
- deployQueue("OtherQueue");
+ deployQueue("OtherQueue", 1);
//Hashtable props1 = ServerManagement.getJNDIEnvironment(1);
- InitialContext ic1 = getInitialContext();
+ InitialContext ic1 = getInitialContext(1);
cf1 = (JBossConnectionFactory) ic1.lookup("/XAConnectionFactory");
@@ -212,7 +223,7 @@
// but the branch on dest won't be - it will remain prepared
// This corresponds to a HeuristicMixedException
- ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
+ poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
tx.delistResource(res0, XAResource.TMSUCCESS);
@@ -228,7 +239,7 @@
//ServerManagement.startServerPeer(1, "all", false);
- deployQueue("OtherQueue");
+ deployQueue("OtherQueue", 1);
//Hashtable props1 = ServerManagement.getJNDIEnvironment(1);
@@ -295,7 +306,7 @@
}
}
- public void testRecoveryOnAck() throws Exception
+ public void testRecoveryOnAck() throws Exception
{
XAConnection conn0 = null;
@@ -456,11 +467,8 @@
private void checkOtherQueueEmpty() throws Exception
{
- ObjectName destObjectName = new ObjectName(
- "jboss.messaging.destination:service=Queue,name=OtherQueue");
- Integer messageCount = (Integer) ServerManagement.getServer(1)
- .getAttribute(destObjectName, "MessageCount");
+ Integer messageCount = getMessageCountForQueue("OtherQueue", 1);
assertEquals(0, messageCount.intValue());
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -90,16 +90,16 @@
//Also need a local tx mgr if test is running remote
if (ServerManagement.isRemote())
{
- //sc = new ServiceContainer("transaction");
+ tm = new TransactionManagerImple();
+ }
+ else
+ {
+ InitialContext localIc = getInitialContext();
- //Don't drop the tables again!
- //sc.startServerPeer(false);
+ tm = (TransactionManager)localIc.lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
}
- InitialContext localIc = getInitialContext();
- tm = (TransactionManager)localIc.lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
-
assertTrue(tm instanceof TransactionManagerImple);
if (!ServerManagement.isRemote())
@@ -158,7 +158,7 @@
{
// make sure there's no active JTA transaction
- suspended = TransactionManagerLocator.getInstance().locate().suspend();
+ suspended = tm.suspend();
// send a message to the queue using an XASession that's not enlisted in a global tx
@@ -238,7 +238,7 @@
XAConnection xaconn = null;
try
{
- Integer count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer count = getMessageCountForQueue("Queue1");
assertEquals(1, count.intValue());
// using XA with a ConnectionConsumer (testing the transaction behavior under MDBs)
@@ -258,7 +258,7 @@
assertEquals(1, listener.messages.size());
// Message should still be on server
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(1, count.intValue());
XAResource resource = xasession.getXAResource();
@@ -286,7 +286,7 @@
trans.commit();
// After commit the message should be consumed
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(0, count.intValue());
}
finally
@@ -340,11 +340,11 @@
// make sure there's no active JTA transaction
- Transaction suspended = TransactionManagerLocator.getInstance().locate().suspend();
+ Transaction suspended = tm.suspend();
try
{
- Integer count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer count = getMessageCountForQueue("Queue1");
assertEquals(1, count.intValue());
XAConnectionFactory xcf = (XAConnectionFactory)cf;
@@ -363,7 +363,7 @@
assertEquals("one", rm.getText());
// messages should be acked
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(0, count.intValue());
xconn.close();
@@ -418,7 +418,7 @@
p.send(m);
conn.close();
- Integer count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer count = getMessageCountForQueue("Queue1");
assertEquals(1, count.intValue());
tm.begin();
@@ -447,7 +447,7 @@
assertNull(consumer.receive(1000));
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(1, count.intValue());
@@ -465,12 +465,12 @@
assertEquals("one", messageReceived.getText());
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(1, count.intValue());
trans.commit();
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(0, count.intValue());
}
@@ -515,7 +515,7 @@
p.send(m);
conn.close();
- Integer count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer count = getMessageCountForQueue("Queue1");
assertEquals(2, count.intValue());
XAConnectionFactory xacf = (XAConnectionFactory)cf;
@@ -546,7 +546,7 @@
// So.. keep this close commented!
//xasession.close();
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(0, count.intValue());
}
finally
@@ -694,7 +694,7 @@
//First send some messages to a queue
- Integer count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ Integer count = getMessageCountForQueue("Queue1");
assertEquals(0, count.intValue());
conn = cf.createConnection();
@@ -711,7 +711,7 @@
prod.send(tm2);
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(2, count.intValue());
xaConn = cf.createXAConnection();
@@ -735,7 +735,7 @@
assertEquals("message1", ((TextMessage)(listener.messages.get(0))).getText());
assertEquals("message2", ((TextMessage)(listener.messages.get(1))).getText());
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(2, count.intValue());
listener.messages.clear();
@@ -767,7 +767,7 @@
//Now rollback the tx - this should cause redelivery of the two messages
tm.rollback();
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(2, count.intValue());
Thread.sleep(1000);
@@ -787,7 +787,7 @@
assertEquals(0, listener.messages.size());
- count = getJmsServerStatistics().getMessageCountForQueue("Queue1");
+ count = getMessageCountForQueue("Queue1");
assertEquals(0, count.intValue());
assertNull(tm.getTransaction());
@@ -1079,9 +1079,9 @@
//Now "crash" the server
- ServerManagement.stopServerPeer();
+ stopServerPeer();
- ServerManagement.startServerPeer();
+ startServerPeer();
deployAndLookupAdministeredObjects();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -70,12 +70,13 @@
public void setUp() throws Exception
{
//Server might have been left around by other tests
- ServerManagement.kill(1);
+ kill(1);
- ServerManagement.stop();
+ //stop();
// Start the local server
- localServer = new LocalTestServer();
+ localServer = new LocalTestServer(1);
+ localServer.start(getContainerConfig(), getConfiguration(), false);
// Start all the services locally
//localServer.startServerPeer("all", true);
@@ -89,9 +90,9 @@
// Connect to the remote server, but don't startServerPeer a servicecontainer on it. We are only using
// the remote server to open a client connection to the local server.
- ServerManagement.create();
+ //ServerManagement.create();
- remoteServer = ServerManagement.getServer();
+ remoteServer = servers.get(0);
super.setUp();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSXDeliveryCountTest.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -21,10 +21,13 @@
*/
package org.jboss.test.messaging.jms.message;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import org.jboss.test.messaging.JBMServerTestCase;
-import org.jboss.tm.TransactionManagerLocator;
+import org.jboss.test.messaging.tools.ServerManagement;
+import org.jboss.test.messaging.tools.container.ServiceContainer;
import javax.jms.*;
+import javax.naming.InitialContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.xa.XAException;
@@ -411,9 +414,18 @@
XAConnection xaConn = null;
Connection conn = null;
+ TransactionManager mgr;
+ if (ServerManagement.isRemote())
+ {
+ mgr = new TransactionManagerImple();
+ }
+ else
+ {
+ InitialContext localIc = getInitialContext();
+
+ mgr = (TransactionManager)localIc.lookup(ServiceContainer.TRANSACTION_MANAGER_JNDI_NAME);
+ }
- TransactionManager mgr = TransactionManagerLocator.getInstance().locate();
-
Transaction toResume = null;
Transaction tx = null;
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -218,6 +218,10 @@
}
}
+ if (i > servers.size())
+ {
+ log.info("server " + i + " has not been created or has already been killed, so it cannot be killed");
+ }
else
{
Server server = servers.get(i);
@@ -308,7 +312,7 @@
if (remoteDebugIndex != null)
{
- sb.append("-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006 ");
+ //sb.append("-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006 ");
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/InVMContext.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/InVMContext.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/InVMContext.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -266,7 +266,11 @@
public Hashtable getEnvironment() throws NamingException
{
- throw new NotYetImplementedException();
+ Hashtable env = new Hashtable();
+ env.put("java.naming.factory.initial",
+ "org.jboss.test.messaging.tools.container.InVMInitialContextFactory");
+ env.put("java.naming.provider.url", "org.jboss.naming:org.jnp.interface");
+ return env;
}
public void close() throws NamingException
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -22,6 +22,7 @@
package org.jboss.test.messaging.tools.container;
import org.jboss.aop.AspectXmlLoader;
+import org.jboss.jms.message.MessageIdGeneratorFactory;
import org.jboss.jms.server.DestinationManager;
import org.jboss.jms.server.JmsServer;
import org.jboss.jms.server.JmsServerStatistics;
@@ -29,6 +30,7 @@
import org.jboss.jms.server.connectionfactory.ConnectionFactory;
import org.jboss.jms.server.microcontainer.JBMBootstrapServer;
import org.jboss.jms.server.security.Role;
+import org.jboss.jms.tx.ResourceManagerFactory;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.contract.MessageStore;
import org.jboss.messaging.core.contract.PersistenceManager;
@@ -756,11 +758,72 @@
}
+
+ public Integer getMessageCountForQueue(String queueName) throws Exception
+ {
+ return getJmsServerStatistics().getMessageCountForQueue(queueName);
+ }
+
+ public void removeAllMessagesForQueue(String destName) throws Exception
+ {
+ getJmsServer().removeAllMessagesForQueue(destName);
+ }
+
+ public void removeAllMessagesForTopic(String destName) throws Exception
+ {
+ getJmsServer().removeAllMessagesForTopic(destName);
+ }
+
+
+ public List listAllSubscriptionsForTopic(String s) throws Exception
+ {
+ return getJmsServerStatistics().listAllSubscriptionsForTopic(s);
+ }
+
+
+ public HashSet<Role> getSecurityConfig() throws Exception
+ {
+ return getJmsServer().getConfiguration().getSecurityConfig();
+ }
+
+ public void setSecurityConfig(HashSet<Role> defConfig) throws Exception
+ {
+ getJmsServer().getConfiguration().setSecurityConfig(defConfig);
+ }
+
+
+ public void setSecurityConfigOnManager(boolean b, String s, HashSet<Role> conf) throws Exception
+ {
+ ((ServerPeer)getJmsServer()).getSecurityManager().setSecurityConfig(b, s, conf);
+ }
+
+
+ public void setRedeliveryDelayOnDestination(String dest, boolean queue, long delay) throws Exception
+ {
+ ((ServerPeer)getJmsServer()).getDestinationManager().getDestination(dest, queue).setRedeliveryDelay(delay);
+ }
+
+
+ public void setDefaultRedeliveryDelay(long delay) throws Exception
+ {
+ getJmsServer().getConfiguration().setDefaultRedeliveryDelay(delay);
+ }
+
+
+ public void clear() throws Exception
+ {
+ ResourceManagerFactory.instance.clear();
+ MessageIdGeneratorFactory.instance.clear();
+ ((ServerPeer) getJmsServer()).getTxRepository().stop();
+ ((ServerPeer) getJmsServer()).getTxRepository().start();
+ }
+
public void setDataSource(DataSource dataSource)
{
LocalTestServer.dataSource = dataSource;
}
+
public void setTransactionManager(TransactionManager transactionManager)
{
LocalTestServer.transactionManager = transactionManager;
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -395,7 +395,7 @@
public void deployConnectionFactory(String clientID, String objectName, String[] jndiBindings) throws Exception
{
- //To change body of implemented methods use File | Settings | File Templates.
+ server.deployConnectionFactory(clientID, objectName, jndiBindings);
}
public void deployConnectionFactory(String objectName, String[] jndiBindings, int prefetchSize)
@@ -423,7 +423,8 @@
boolean strictTck,
int dupsOkBatchSize) throws Exception
{
-
+ server.deployConnectionFactory(clientId, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize,
+ supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize);
}
public void deployConnectionFactory(String objectName,
String[] jndiBindings,
@@ -449,7 +450,7 @@
public void configureSecurityForDestination(String destName, boolean isQueue, HashSet<Role> roles) throws Exception
{
- //server.configureSecurityForDestination(destName, config);
+ server.configureSecurityForDestination(destName, isQueue, roles);
}
public void setDefaultSecurityConfig(String config) throws Exception
@@ -539,15 +540,73 @@
public JmsServer getJmsServer() throws Exception
{
- return (JmsServer) getInitialContext().lookup("java:/ServerPeer");
+ return server.getJmsServer();
}
public JmsServerStatistics getJmsServerStatistics() throws Exception
{
- return (JmsServerStatistics) getInitialContext().lookup("java:/ServerPeerStatistics");
+ return server.getJmsServerStatistics();
}
+
+ public void removeAllMessagesForQueue(String destName) throws Exception
+ {
+ getJmsServer().removeAllMessagesForQueue(destName);
+ }
+
+ public void removeAllMessagesForTopic(String destName) throws Exception
+ {
+ getJmsServer().removeAllMessagesForTopic(destName);
+ }
+
+
+ public Integer getMessageCountForQueue(String queueName) throws Exception
+ {
+ return getJmsServerStatistics().getMessageCountForQueue(queueName);
+ }
+
+
+ public List listAllSubscriptionsForTopic(String s) throws Exception
+ {
+ return server.listAllSubscriptionsForTopic(s);
+ }
+
+
+ public HashSet<Role> getSecurityConfig() throws Exception
+ {
+ return server.getSecurityConfig();
+ }
+
+ public void setSecurityConfig(HashSet<Role> defConfig) throws Exception
+ {
+ server.setSecurityConfig(defConfig);
+ }
+
+
+ public void setSecurityConfigOnManager(boolean b, String s, HashSet<Role> conf) throws Exception
+ {
+ server.setSecurityConfigOnManager(b, s, conf);
+ }
+
+
+ public void setRedeliveryDelayOnDestination(String dest, boolean queue, long delay) throws Exception
+ {
+ server.setRedeliveryDelayOnDestination(dest, queue, delay);
+ }
+
+
+ public void setDefaultRedeliveryDelay(long delay) throws Exception
+ {
+ server.setDefaultRedeliveryDelay(delay);
+ }
+
+
+ public void clear() throws Exception
+ {
+ server.clear();
+ }
+
public InitialContext getInitialContext() throws Exception
{
Hashtable env = new Hashtable();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java 2007-12-05 09:04:37 UTC (rev 3410)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java 2007-12-05 15:15:37 UTC (rev 3411)
@@ -304,4 +304,24 @@
JmsServerStatistics getJmsServerStatistics() throws Exception;
InitialContext getInitialContext() throws Exception;
+
+ void removeAllMessagesForQueue(String destName) throws Exception;
+
+ void removeAllMessagesForTopic(String destName) throws Exception;
+
+ Integer getMessageCountForQueue(String queueName) throws Exception;
+
+ List listAllSubscriptionsForTopic(String s) throws Exception;
+
+ HashSet<Role> getSecurityConfig() throws Exception;
+
+ void setSecurityConfig(HashSet<Role> defConfig) throws Exception;
+
+ void setSecurityConfigOnManager(boolean b, String s, HashSet<Role> lockedConf) throws Exception;
+
+ void setRedeliveryDelayOnDestination(String dest, boolean queue, long delay) throws Exception;
+
+ void setDefaultRedeliveryDelay(long delay) throws Exception;
+
+ void clear() throws Exception;
}
More information about the jboss-cvs-commits
mailing list