[jboss-cvs] JBossAS SVN: r103855 - in trunk/testsuite/src: resources/test-configs/hornetq/deploy and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-04-12 17:21:48 -0400 (Mon, 12 Apr 2010)
New Revision: 103855

Added:
   trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/
Removed:
   trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/
Modified:
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
   trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml
Log:
Removing invalid test and fixing test config

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java	2010-04-12 19:54:53 UTC (rev 103854)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java	2010-04-12 21:21:48 UTC (rev 103855)
@@ -81,7 +81,6 @@
       suite.addTest(new UnackedUnitTestCase("testUnackedMultipleSession"));
       suite.addTest(new UnackedUnitTestCase("testUnackedTopic"));
       suite.addTest(new UnackedUnitTestCase("testUnackedDurableTopic"));
-      suite.addTest(new UnackedUnitTestCase("testDummyLast"));
       
       return suite;
    }
@@ -551,22 +550,6 @@
    }
 
    /**
-    * A unit test for JUnit
-    *
-    * @exception Exception  Description of Exception
-    */
-   public void testDummyLast() throws Exception
-   {
-
-      TopicSession session = topicDurableConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-      session.unsubscribe("test");
-
-      queueConnection.close();
-      topicConnection.close();
-      topicDurableConnection.close();
-   }
-
-   /**
     * The JUnit setup method
     *
     * @exception Exception  Description of Exception

Copied: trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq (from rev 103854, trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar)

Modified: trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq.sar/hornetq-configuration.xml	2010-04-12 19:54:53 UTC (rev 103854)
+++ trunk/testsuite/src/resources/test-configs/hornetq/deploy/hornetq/hornetq-configuration.xml	2010-04-12 21:21:48 UTC (rev 103855)
@@ -3,10 +3,12 @@
                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>
+   
+   <journal-min-files>10</journal-min-files>
 
    <large-messages-directory>${jboss.server.data.dir}/hornetq/largemessages</large-messages-directory>
 
@@ -15,9 +17,16 @@
    <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="host"  value="${jboss.bind.address:localhost}"/>
          <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
       </connector>
+      
+      <connector name="netty-throughput">
+         <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
+         <param key="host"  value="${jboss.bind.address:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+      </connector>
 
       <connector name="in-vm">
          <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
@@ -25,12 +34,19 @@
 
    </connectors>
 
-   <acceptors>
+   <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="host"  value="${jboss.bind.address:localhost}"/>
          <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
       </acceptor>
+      
+      <acceptor name="netty-throughput">
+         <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
+         <param key="host"  value="${jboss.bind.address:localhost}"/>
+         <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
+         <param key="batch-delay" value="50"/>
+      </acceptor>
 
       <acceptor name="in-vm">
         <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
@@ -62,9 +78,9 @@
          <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>
+         <max-size-bytes>10485760</max-size-bytes>       
          <message-counter-history-day-limit>10</message-counter-history-day-limit>
+         <address-full-policy>BLOCK</address-full-policy>
       </address-setting>
    </address-settings>