[jboss-cvs] JBoss Messaging SVN: r7325 - in trunk: tests/config and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 13 03:18:31 EDT 2009
Author: timfox
Date: 2009-06-13 03:18:31 -0400 (Sat, 13 Jun 2009)
New Revision: 7325
Removed:
trunk/tests/config/jbm-configuration.xml
trunk/tests/config/jbm-users.xml
Modified:
trunk/build-messaging.xml
trunk/tests/config/server-start-stop-backup-config1.xml
trunk/tests/config/server-start-stop-config1.xml
trunk/tests/config/server-start-stop-live-config1.xml
Log:
fixing test suite
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-06-13 05:36:49 UTC (rev 7324)
+++ trunk/build-messaging.xml 2009-06-13 07:18:31 UTC (rev 7325)
@@ -1082,13 +1082,13 @@
<target name="performance-tests" depends="jar, compile-unit-tests">
<antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/performance/**/*${test-mask}.class"/>
+ <param name="tests.param" value="**/org/jboss/messaging/tests/performance/**/*StartStop*.class"/>
</antcall>
</target>
<target name="integration-tests" depends="jar, compile-unit-tests">
<antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/integration/**/*${test-mask}.class"/>
+ <param name="tests.param" value="**/org/jboss/messaging/tests/integration/**/*StartStop*.class"/>
</antcall>
</target>
Deleted: trunk/tests/config/jbm-configuration.xml
===================================================================
--- trunk/tests/config/jbm-configuration.xml 2009-06-13 05:36:49 UTC (rev 7324)
+++ trunk/tests/config/jbm-configuration.xml 2009-06-13 07:18:31 UTC (rev 7325)
@@ -1,49 +0,0 @@
-<configuration xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
-
- <connectors>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
- </connector>
- </connectors>
-
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jbm.remoting.netty.host:localhost}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port:5445}" type="Integer"/>
- </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-settings>
-
- <address-settings>
- <!--default for catch all-->
- <address-setting match="#">
- <clustered>false</clustered>
- <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>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
- </address-setting>
- </address-settings>
-
- <paging-directory>../data/paging</paging-directory>
- <bindings-directory>../data/bindings</bindings-directory>
- <journal-directory>../data/journal</journal-directory>
- <large-messages-directory>../data/large-messages</large-messages-directory>
-
-</configuration>
Deleted: trunk/tests/config/jbm-users.xml
===================================================================
--- trunk/tests/config/jbm-users.xml 2009-06-13 05:36:49 UTC (rev 7324)
+++ trunk/tests/config/jbm-users.xml 2009-06-13 07:18:31 UTC (rev 7325)
@@ -1,7 +0,0 @@
-<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
-</configuration>
\ No newline at end of file
Modified: trunk/tests/config/server-start-stop-backup-config1.xml
===================================================================
--- trunk/tests/config/server-start-stop-backup-config1.xml 2009-06-13 05:36:49 UTC (rev 7324)
+++ trunk/tests/config/server-start-stop-backup-config1.xml 2009-06-13 07:18:31 UTC (rev 7325)
@@ -25,16 +25,7 @@
</acceptors>
- <security-settings>
- <security-setting match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
+ <security-enabled>false</security-enabled>
<queues>
<queue name="myQueue">
Modified: trunk/tests/config/server-start-stop-config1.xml
===================================================================
--- trunk/tests/config/server-start-stop-config1.xml 2009-06-13 05:36:49 UTC (rev 7324)
+++ trunk/tests/config/server-start-stop-config1.xml 2009-06-13 07:18:31 UTC (rev 7325)
@@ -16,16 +16,7 @@
</acceptor>
</acceptors>
- <security-settings>
- <security-setting match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
+ <security-enabled>false</security-enabled>
<queues>
<queue name="myQueue">
Modified: trunk/tests/config/server-start-stop-live-config1.xml
===================================================================
--- trunk/tests/config/server-start-stop-live-config1.xml 2009-06-13 05:36:49 UTC (rev 7324)
+++ trunk/tests/config/server-start-stop-live-config1.xml 2009-06-13 07:18:31 UTC (rev 7325)
@@ -29,16 +29,7 @@
</acceptor>
</acceptors>
- <security-settings>
- <security-setting match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
+ <security-enabled>false</security-enabled>
<queues>
<queue name="myQueue">
More information about the jboss-cvs-commits
mailing list