From dd8df96fcca8f5f9dcbe91ba012cff400a38daa7 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Fri, 16 Feb 2007 23:11:41 +0000
Subject: QPID-375 : remove assumptions on standard exchanges (amq.direct,
 amq.topic, etc), allow other exchanges to be created through virtualhosts.xml

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@508649 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/etc/virtualhosts.xml | 110 ++++++++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 43 deletions(-)

(limited to 'java/broker/etc')

diff --git a/java/broker/etc/virtualhosts.xml b/java/broker/etc/virtualhosts.xml
index 3601daacc7..52ff23e090 100644
--- a/java/broker/etc/virtualhosts.xml
+++ b/java/broker/etc/virtualhosts.xml
@@ -24,58 +24,54 @@
     <virtualhost>
         <name>localhost</name>
         <localhost>
-            <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-            <maximumMessageCount>5000</maximumMessageCount>
-            <queue>
-                <name>queue</name>
+            <exchanges>
+                <exchange>
+                    <type>direct</type>
+                    <name>test.direct</name>
+                    <durable>true</durable>
+                </exchange>
+                <exchange>
+                    <type>topic</type>
+                    <name>test.topic</name>
+                </exchange>
+            </exchanges>
+            <queues>
+                <exchange>amq.direct</exchange>
+                <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
+                <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
+                <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
+
+                <queue>
+                    <name>queue</name>
+                </queue>
+                <queue>
+                    <name>ping</name>
+                </queue>
                 <queue>
-                    <exchange>amq.direct</exchange>
-                    <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                    <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                    <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
+                    <name>test-queue</name>
+                    <test-queue>
+                        <exchange>test.direct</exchange>
+                        <durable>true</durable>
+                    </test-queue>
                 </queue>
-            </queue>
-            <queue>
-                <name>ping</name>
-                <ping>
-                    <exchange>amq.direct</exchange>
-                    <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                    <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                    <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                </ping>
-            </queue>
+                <queue>
+                    <name>test-ping</name>
+                    <test-ping>
+                        <exchange>test.direct</exchange>
+                    </test-ping>
+                </queue>
+
+            </queues>
         </localhost>
     </virtualhost>
+
+
     <virtualhost>
         <name>development</name>
         <development>
             <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
             <maximumMessageCount>5000</maximumMessageCount>
-            <queue>
-                <name>queue</name>
-                <queue>
-                    <exchange>amq.direct</exchange>
-                    <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                    <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                    <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                </queue>
-            </queue>
-            <queue>
-                <name>ping</name>
-                <ping>
-                    <exchange>amq.direct</exchange>
-                    <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
-                    <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
-                    <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
-                </ping>
-            </queue>
-        </development>
-    </virtualhost>
-        <virtualhost>
-            <name>test</name>
-            <test>
-                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
-                <maximumMessageCount>5000</maximumMessageCount>
+            <queues>
                 <queue>
                     <name>queue</name>
                     <queue>
@@ -94,6 +90,34 @@
                         <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
                     </ping>
                 </queue>
+            </queues>
+        </development>
+    </virtualhost>
+        <virtualhost>
+            <name>test</name>
+            <test>
+                <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
+                <maximumMessageCount>5000</maximumMessageCount>
+                <queues>
+                    <queue>
+                        <name>queue</name>
+                        <queue>
+                            <exchange>amq.direct</exchange>
+                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
+                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
+                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
+                        </queue>
+                    </queue>
+                    <queue>
+                        <name>ping</name>
+                        <ping>
+                            <exchange>amq.direct</exchange>
+                            <maximumQueueDepth>4235264</maximumQueueDepth>  <!-- 4Mb -->
+                            <maximumMessageSize>2117632</maximumMessageSize> <!-- 2Mb -->
+                            <maximumMessageAge>600000</maximumMessageAge>  <!-- 10 mins -->
+                        </ping>
+                    </queue>
+                </queues>
             </test>
     </virtualhost>
 </virtualhosts>
-- 
cgit v1.2.1