Author: chirino
Date: Sun Aug 28 19:12:40 2011
New Revision: 1162573
URL: http://svn.apache.org/viewvc?rev=1162573&view=rev
Log:
Fixes failing test cases.
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml?rev=1162573&r1=1162572&r2=1162573&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
Sun Aug 28 19:12:40 2011
@@ -18,22 +18,20 @@
<broker xmlns="http://activemq.apache.org/schema/activemq/apollo";>
<authentication domain="StompSecurityTest"/>
+ <access_rule allow="connect_group" action="connect"/>
+ <access_rule allow="can_send_create_queue" kind="queue" action="send
create"/>
+ <access_rule allow="can_send_queue" kind="queue" action="send"/>
+ <access_rule allow="can_receive_queue" kind="queue" action="receive"/>
+ <access_rule allow="can_consume_queue" kind="queue" action="consume"/>
+ <access_rule allow="can_send_create_topic" kind="topic" action="send
create"/>
+ <access_rule allow="can_send_topic" kind="topic" action="send"/>
+ <access_rule allow="can_recieve_topic" kind="topic" action="receive"/>
+ <access_rule allow="can_consume_create_ds" kind="dsub" action="consume
create"/>
+ <access_rule allow="can_consume_ds" kind="dsub" action="consume"/>
+ <access_rule allow="can_recieve_topic" kind="dsub" action="receive"/>
<virtual_host id="default" purge_on_startup="true">
<host_name>localhost</host_name>
-
- <access_rule allow="connect_group" action="connect"/>
- <access_rule allow="can_send_create_queue" kind="queue" action="send
create"/>
- <access_rule allow="can_send_queue" kind="queue" action="send"/>
- <access_rule allow="can_receive_queue" kind="queue" action="receive"/>
- <access_rule allow="can_consume_queue" kind="queue" action="consume"/>
- <access_rule allow="can_send_create_topic" kind="topic" action="send
create"/>
- <access_rule allow="can_send_topic" kind="topic" action="send"/>
- <access_rule allow="can_recieve_topic" kind="topic" action="receive"/>
- <access_rule allow="can_consume_create_ds" kind="dsub" action="consume
create"/>
- <access_rule allow="can_consume_ds" kind="dsub" action="consume"/>
- <access_rule allow="can_recieve_topic" kind="dsub" action="receive"/>
-
</virtual_host>
<connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0">
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml?rev=1162573&r1=1162572&r2=1162573&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
Sun Aug 28 19:12:40 2011
@@ -17,14 +17,11 @@
-->
<broker xmlns="http://activemq.apache.org/schema/activemq/apollo";>
-
<authentication domain="StompSslSecurityTest"/>
+ <access_rule allow="connect_group" action="connect"/>
<virtual_host id="default" purge_on_startup="true">
<host_name>localhost</host_name>
-
- <access_rule allow="connect_group" action="connect"/>
-
</virtual_host>
<key_storage file="${basedir}/src/test/resources/apollo.ks"
password="password" key_password="password"/>
