svn commit: r1221855 - in /activemq/activemq-apollo/trunk/apollo-stomp: pom.xml src/test/resources/apollo-stomp-leveldb.xml src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala

[ch...@apache.org]

Author: chirino
Date: Wed Dec 21 19:48:06 2011
New Revision: 1221855

URL: http://svn.apache.org/viewvc?rev=1221855&view=rev
Log:
Have the stomp test execute against the leveldb based store too.

Added:
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml
Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala

Modified: activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/pom.xml?rev=1221855&r1=1221854&r2=1221855&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/pom.xml Wed Dec 21 19:48:06 2011
@@ -53,12 +53,6 @@
       <version>${scala-version}</version>
     </dependency>
 
-    <!--<dependency>-->
-      <!--<groupId>com.thoughtworks.xstream</groupId>-->
-      <!--<artifactId>xstream</artifactId>-->
-      <!--<version>${xstream-version}</version>-->
-    <!--</dependency>-->
-
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -81,6 +75,12 @@
       <version>1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>apollo-leveldb</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>

Added: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml?rev=1221855&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml (added)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml Wed Dec 21 19:48:06 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<broker xmlns="http://activemq.apache.org/schema/activemq/apollo">
+  <notes>Has a LevelDB store enabled.</notes>
+
+  <virtual_host id="default" purge_on_startup="true">
+    <host_name>localhost</host_name>
+
+    <queue name="unified.**" unified="true"/>
+
+    <leveldb_store directory="${basedir}/target/test-data"/>
+  </virtual_host>
+
+  <web_admin bind="http://127.0.0.1:0"/>
+  <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/scala/org/apache/activemq/apollo/stomp/StompTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala?rev=1221855&r1=1221854&r2=1221855&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala Wed Dec 21 19:48:06 2011
@@ -883,9 +883,9 @@ class StompDestinationTest extends Stomp
 
 }
 
-class DurableSubscriptionTest extends StompTestSupport {
+class DurableSubscriptionOnLevelDBTest extends StompTestSupport {
 
-  override val broker_config_uri: String = "xml:classpath:apollo-stomp-bdb.xml"
+  override val broker_config_uri: String = "xml:classpath:apollo-stomp-leveldb.xml"
 
   test("Duplicate SUBSCRIBE updates durable subscription bindings") {
     connect("1.1")
@@ -1121,6 +1121,10 @@ class DurableSubscriptionTest extends St
   }
 }
 
+class DurableSubscriptionOnBDBTest extends StompTestSupport {
+  override val broker_config_uri: String = "xml:classpath:apollo-stomp-bdb.xml"
+}
+
 class StompUnifiedQueueTest extends StompTestSupport {
 
   test("Topic gets copy of message sent to queue") {