Author: chirino
Date: Wed Nov 17 14:07:34 2010
New Revision: 1036046
URL: http://svn.apache.org/viewvc?rev=1036046&view=rev
Log:
making test config simpler.
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/activemq-stomp.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/activemq-stomp.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/activemq-stomp.xml?rev=1036046&r1=1036045&r2=1036046&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/activemq-stomp.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/activemq-stomp.xml
Wed Nov 17 14:07:34 2010
@@ -15,10 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<broker basedir="./activemq-data/default" rev="1" enabled="true" id="default"
xmlns="http://activemq.apache.org/schema/activemq/apollo";>
+<broker id="default" rev="1"
xmlns="http://activemq.apache.org/schema/activemq/apollo";>
<notes>This broker configuration is what the unit tests in this module
load up.</notes>
- <virtual-host purge-on-startup="false" auto-create-queues="true"
enabled="true" id="default">
+
+ <virtual-host id="default" purge-on-startup="true"
auto-create-queues="true">
<host-name>localhost</host-name>
</virtual-host>
- <connector advertise="tcp://localhost:61613" protocol="stomp"
bind="tcp://0.0.0.0:0" enabled="true" id="default"/>
+
+ <connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0"/>
+
</broker>
\ No newline at end of file
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml?rev=1036046&r1=1036045&r2=1036046&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
Wed Nov 17 14:07:34 2010
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<broker basedir="./activemq-data/default" rev="1" enabled="true" id="default"
xmlns="http://activemq.apache.org/schema/activemq/apollo";>
+<broker id="default" rev="1"
xmlns="http://activemq.apache.org/schema/activemq/apollo";>
<notes>The config for the ssl stomp tests.</notes>
- <virtual-host purge-on-startup="false" auto-create-queues="true"
enabled="true" id="default">
+ <virtual-host id="default" purge-on-startup="true"
auto-create-queues="true">
<host-name>localhost</host-name>
</virtual-host>
<key-storage file="${basedir}/src/test/resources/apollo.ks"
password="password" key-password="password"/>
- <connector protocol="stomp" bind="ssl://0.0.0.0:0" enabled="true"
id="default"/>
+ <connector id="ssl" protocol="stomp" bind="ssl://0.0.0.0:0" />
</broker>
\ No newline at end of file
