Return-Path: 
 <commits-return-15038-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 34268 invoked from network); 17 Nov 2010 14:08:21 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 17 Nov 2010 14:08:21 -0000
Received: (qmail 458 invoked by uid 500); 17 Nov 2010 14:08:52 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 403 invoked by uid 500); 17 Nov 2010 14:08:52 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 396 invoked by uid 99); 17 Nov 2010 14:08:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Nov 2010 14:08:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Nov 2010 14:08:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6FEF223889F1; Wed, 17 Nov 2010 14:07:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1036046 - in
 /activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources:
 activemq-stomp.xml apollo-stomp-ssl.xml
Date: Wed, 17 Nov 2010 14:07:34 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101117140734.6FEF223889F1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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