[jboss-cvs] JBossAS SVN: r105820 - in branches/JBPAPP_5_1/testsuite: src/resources/jbossmessaging and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 8 17:30:27 EDT 2010
Author: clebert.suconic at jboss.com
Date: 2010-06-08 17:30:26 -0400 (Tue, 08 Jun 2010)
New Revision: 105820
Added:
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/messaging-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/hornetq.sar/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/hornetq/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/hornetq/hornetq-jms.xml
Removed:
branches/JBPAPP_5_1/testsuite/src/resources/jbossmessaging/messaging-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/hornetq/
Modified:
branches/JBPAPP_5_1/testsuite/build.xml
Log:
fixing tests
Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml 2010-06-08 20:52:10 UTC (rev 105819)
+++ branches/JBPAPP_5_1/testsuite/build.xml 2010-06-08 21:30:26 UTC (rev 105820)
@@ -3452,20 +3452,24 @@
<target name="tests-jbossmessaging"
description="Run JMS tests against the Messaging JMS provider" unless="build.ewp">
- <!-- Create a separate messaging config -->
- <create-config baseconf="default" newconf="jbossmessaging">
- <patternset>
- <include name="conf/**"/>
- <include name="deployers/**"/>
- <include name="deploy/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
- <copy file="${module.output}/resources/jbossmessaging/messaging-users.properties" tofile="${jboss.dist}/server/jbossmessaging/conf/props/messaging-users.properties" overwrite="true"/>
- <server:start name="jbossmessaging"/>
+ <antcall target="create-server-jbossmessaging"/>
+
+ <server:start name="jbossmessaging"/>
<antcall target="tests-jbossmessaging-unit" />
<server:stop name="jbossmessaging"/>
</target>
+
+ <target name ="create-server-jbossmessaging">
+ <!-- Create a separate messaging config -->
+ <create-config baseconf="default" newconf="jbossmessaging">
+ <patternset>
+ <include name="conf/**"/>
+ <include name="deployers/**"/>
+ <include name="deploy/**"/>
+ <include name="lib/**"/>
+ </patternset>
+ </create-config>
+ </target>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/jbossmessaging/messaging-users.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossmessaging/messaging-users.properties 2010-06-08 20:52:10 UTC (rev 105819)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossmessaging/messaging-users.properties 2010-06-08 21:30:26 UTC (rev 105820)
@@ -1,4 +0,0 @@
-#
-# user=password
-#
-guest=guest
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties 2010-06-08 21:30:26 UTC (rev 105820)
@@ -0,0 +1,6 @@
+#
+# user=role1,role2,...
+#
+guest=guest
+john=durable,guest
+nobody=noaccde
\ No newline at end of file
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties 2010-06-08 21:30:26 UTC (rev 105820)
@@ -0,0 +1,6 @@
+#
+# user=password
+#
+guest=guest
+john=needle
+nobody=nobody
\ No newline at end of file
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/messaging-users.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/messaging-users.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/conf/props/messaging-users.properties 2010-06-08 21:30:26 UTC (rev 105820)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/hornetq/hornetq-jms.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/hornetq/hornetq-jms.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/jbossmessaging/deploy/hornetq/hornetq-jms.xml 2010-06-08 21:30:26 UTC (rev 105820)
@@ -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