[jboss-cvs] JBossAS SVN: r111389 - projects/jboss-jca/trunk/core/src/test/resources.

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

Author: jesper.pedersen
Date: 2011-05-17 11:38:16 -0400 (Tue, 17 May 2011)
New Revision: 111389

Modified:
   projects/jboss-jca/trunk/core/src/test/resources/hornetq-configuration.xml
   projects/jboss-jca/trunk/core/src/test/resources/hornetq-jms.xml
Log:
Only use in-vm for HornetQ testing

Modified: projects/jboss-jca/trunk/core/src/test/resources/hornetq-configuration.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/hornetq-configuration.xml	2011-05-17 13:19:16 UTC (rev 111388)
+++ projects/jboss-jca/trunk/core/src/test/resources/hornetq-configuration.xml	2011-05-17 15:38:16 UTC (rev 111389)
@@ -21,39 +21,12 @@
       <factory-class>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
       <param key="server-id" value="${hornetq.server-id:0}"/>
     </connector>
-    
-    <connector name="netty">
-      <factory-class>org.hornetq.core.remoting.impl.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="netty-throughput">
-      <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-      <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-      <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-      <param key="batch-delay" value="50"/>
-    </connector>
   </connectors>
 
   <acceptors>
     <acceptor name="in-vm">
       <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
     </acceptor>
-
-    <acceptor name="netty">
-      <factory-class>org.hornetq.core.remoting.impl.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="netty-throughput">
-      <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-      <param key="host"  value="${hornetq.remoting.netty.host:localhost}"/>
-      <param key="port"  value="${hornetq.remoting.netty.batch.port:5455}"/>
-      <param key="batch-delay" value="50"/>
-      <param key="direct-deliver" value="false"/>
-    </acceptor>
   </acceptors>
 
   <security-settings>

Modified: projects/jboss-jca/trunk/core/src/test/resources/hornetq-jms.xml
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/hornetq-jms.xml	2011-05-17 13:19:16 UTC (rev 111388)
+++ projects/jboss-jca/trunk/core/src/test/resources/hornetq-jms.xml	2011-05-17 15:38:16 UTC (rev 111389)
@@ -2,9 +2,9 @@
 	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	       xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
   
-  <connection-factory name="NettyConnectionFactory">
+  <connection-factory name="InVMConnectionFactory">
     <connectors>
-      <connector-ref connector-name="netty"/>
+      <connector-ref connector-name="in-vm"/>
     </connectors>
     <entries>
       <entry name="/ConnectionFactory"/>
@@ -12,16 +12,6 @@
     </entries>
   </connection-factory>
 	
-  <connection-factory name="NettyThroughputConnectionFactory">
-    <connectors>
-      <connector-ref connector-name="netty-throughput"/>
-    </connectors>
-    <entries>
-      <entry name="/ThroughputConnectionFactory"/>
-      <entry name="/XAThroughputConnectionFactory"/>
-    </entries>
-  </connection-factory>
-	
   <queue name="DLQ">
     <entry name="/queue/DLQ"/>
   </queue>