[jboss-cvs] JBossAS SVN: r101665 - in branches/Branch_Hornet_Temporary_2/testsuite: src/main/org/jboss/test/jbossmessaging and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 1 11:21:12 EST 2010
Author: ataylor
Date: 2010-03-01 11:21:11 -0500 (Mon, 01 Mar 2010)
New Revision: 101665
Added:
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-roles.properties
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-users.properties
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-configuration.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-jms.xml
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/imports/server-config.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java
Log:
fixed tests and added resources
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/server-config.xml 2010-03-01 16:11:14 UTC (rev 101664)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/server-config.xml 2010-03-01 16:21:11 UTC (rev 101665)
@@ -912,12 +912,13 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
- <server name="jbossmessaging" host="${node0}">
+ <server name="hornetq" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+ <jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006"/>
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java 2010-03-01 16:11:14 UTC (rev 101664)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java 2010-03-01 16:21:11 UTC (rev 101665)
@@ -665,7 +665,24 @@
super(type, transacted, creator, number);
}
+ public TopicWorker(int type,
+ int transacted,
+ MessageCreator creator,
+ int number,
+ String factoryName
+ ) throws Exception
+ {
+ super(type, transacted, creator, number);
+ topicFactory = (TopicConnectionFactory) context.lookup(factoryName);
+ }
+ public TopicWorker(int type, int transacted, MessageFilter filter, String factoryName) throws Exception
+ {
+ super(type, transacted, filter);
+ topicFactory = (TopicConnectionFactory) context.lookup(factoryName);
+ }
+
+
public void publish() throws JMSException
{
publish(number);
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-03-01 16:11:14 UTC (rev 101664)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-03-01 16:21:11 UTC (rev 101665)
@@ -989,6 +989,7 @@
getLog().debug("Closing the subscriber");
getLog().debug("Removing the subscription");
+ subscriber.close();
subSession = topicConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
subSession.unsubscribe("test");
subSession.close();
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java 2010-03-01 16:11:14 UTC (rev 101664)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java 2010-03-01 16:21:11 UTC (rev 101665)
@@ -34,6 +34,8 @@
*/
public class SecurityUnitTestCase extends JMSBase
{
+ private static final String PRECONF_CLIENT_IDCONNECTIONFACTORY = "PreconfClientIDConnectionfactory";
+
public SecurityUnitTestCase(String name)
{
super(name);
@@ -280,7 +282,7 @@
int ic = 5;
// Publish
IntRangeMessageCreator c1 = new IntRangeMessageCreator("USER_NR", 0);
- pub1 = new TopicWorker(PUBLISHER, TRANS_NONE, c1, ic);
+ pub1 = new TopicWorker(PUBLISHER, TRANS_NONE, c1, ic, PRECONF_CLIENT_IDCONNECTIONFACTORY);
pub1.setUser("john", "needle");
pub1.connect();
pub1.publish();
@@ -1007,7 +1009,7 @@
int ic = 5;
// Set up a durable subscriber
IntRangeMessageFilter f1 = new IntRangeMessageFilter(javax.jms.Message.class, "DURABLE_NR", 0, ic);
- sub1 = new TopicWorker(SUBSCRIBER, TRANS_NONE, f1);
+ sub1 = new TopicWorker(SUBSCRIBER, TRANS_NONE, f1, PRECONF_CLIENT_IDCONNECTIONFACTORY);
sub1.setDurable("john", "needle", "sub2");
Thread t1 = new Thread(sub1);
t1.start();
@@ -1064,7 +1066,7 @@
int ic = 5;
// Set up a durable subscriber
IntRangeMessageFilter f1 = new IntRangeMessageFilter(javax.jms.Message.class, "DURABLE_NR", 0, ic);
- sub1 = new TopicWorker(SUBSCRIBER, TRANS_NONE, f1);
+ sub1 = new TopicWorker(SUBSCRIBER, TRANS_NONE, f1, PRECONF_CLIENT_IDCONNECTIONFACTORY);
sub1.setDurable("john", "needle", "sub3");
Thread t1 = new Thread(sub1);
t1.start();
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java 2010-03-01 16:11:14 UTC (rev 101664)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java 2010-03-01 16:21:11 UTC (rev 101665)
@@ -208,8 +208,10 @@
assertEquals(iterationCount, c1 + c2);
- lastMessageConsumer1.acknowledge();
- lastMessageConsumer2.acknowledge();
+ if(lastMessageConsumer1 != null)
+ lastMessageConsumer1.acknowledge();
+ if(lastMessageConsumer2 != null)
+ lastMessageConsumer2.acknowledge();
queueConnection.stop();
session1.close();
@@ -462,7 +464,7 @@
sendThread.join();
topicDurableConnection.close();
- TopicConnectionFactory topicFactory = (TopicConnectionFactory)context.lookup(TOPIC_FACTORY);
+ TopicConnectionFactory topicFactory = (TopicConnectionFactory)context.lookup("PreconfClientIDConnectionfactory");
topicDurableConnection = topicFactory.createTopicConnection("john", "needle");
queueConnection.stop();
assertTrue("Topic should be full", drainDurableTopic() == iterationCount);
@@ -586,6 +588,7 @@
TopicConnectionFactory topicFactory = (TopicConnectionFactory)context.lookup(TOPIC_FACTORY);
topicConnection = topicFactory.createTopicConnection();
+ topicFactory = (TopicConnectionFactory) context.lookup("PreconfClientIDConnectionfactory");
topicDurableConnection = topicFactory.createTopicConnection("john", "needle");
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java 2010-03-01 16:11:14 UTC (rev 101664)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java 2010-03-01 16:21:11 UTC (rev 101665)
@@ -114,6 +114,11 @@
resource.end(xid2, XAResource.TMSUCCESS);
resource.commit(xid2, true);
}
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ throw e;
+ }
finally
{
connection.close();
@@ -175,6 +180,7 @@
message = subscriber.receiveNoWait();
if (message == null)
fail("No message after rollback?");
+ resource.end(xid1, XAResource.TMSUCCESS);
resource.commit(xid1, true);
}
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-roles.properties
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-roles.properties (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-roles.properties 2010-03-01 16:21:11 UTC (rev 101665)
@@ -0,0 +1,5 @@
+#
+# user=role1,role2,...
+#
+guest=guest
+john=durable,guest
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-users.properties
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-users.properties (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/conf/hornetq-users.properties 2010-03-01 16:21:11 UTC (rev 101665)
@@ -0,0 +1,5 @@
+#
+# user=password
+#
+guest=guest
+john=needle
\ No newline at end of file
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-configuration.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-configuration.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-configuration.xml 2010-03-01 16:21:11 UTC (rev 101665)
@@ -0,0 +1,71 @@
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
+
+ <log-delegate-factory-class-name>org.hornetq.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+
+ <bindings-directory>${jboss.server.data.dir}/hornetq/bindings</bindings-directory>
+
+ <journal-directory>${jboss.server.data.dir}/hornetq/journal</journal-directory>
+
+ <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory>
+
+ <paging-directory>${jboss.server.data.dir}/hornetq/paging</paging-directory>
+
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
+ <param key="port" value="${hornetq.remoting.netty.port:5445}"/>
+ </connector>
+
+ <connector name="in-vm">
+ <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+
+ </connectors>
+
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
+ <param key="port" value="${hornetq.remoting.netty.port:5445}"/>
+ </acceptor>
+
+ <acceptor name="in-vm">
+ <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="server-id" value="0"/>
+ </acceptor>
+
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ <security-setting match="jms.topic.testTopic">
+ <permission type="createTempQueue" roles="durable"/>
+ <permission type="deleteTempQueue" roles="durable"/>
+ <permission type="createDurableQueue" roles="durable"/>
+ <permission type="deleteDurableQueue" roles="durable"/>
+ <permission type="consume" roles="durable"/>
+ <permission type="send" roles="durable"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
+
+</configuration>
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-jms.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-jms.xml (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-jms.xml 2010-03-01 16:21:11 UTC (rev 101665)
@@ -0,0 +1,45 @@
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+ <connection-factory name="NettyConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ </entries>
+ <block-on-non-durable-send>true</block-on-non-durable-send>
+ </connection-factory>
+
+ <connection-factory name="PreconfClientIDConnectionfactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="/PreconfClientIDConnectionfactory"/>
+ </entries>
+ <block-on-non-durable-send>true</block-on-non-durable-send>
+ <client-id>DurableSubscriberExample</client-id>
+ </connection-factory>
+
+ <connection-factory name="InVMConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+
+</configuration>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list