Return-Path: 
 <commits-return-5298-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 34986 invoked from network); 13 Mar 2007 17:56:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 13 Mar 2007 17:56:59 -0000
Received: (qmail 14124 invoked by uid 500); 13 Mar 2007 17:57:08 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 14101 invoked by uid 500); 13 Mar 2007 17:57:07 -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 14092 invoked by uid 99); 13 Mar 2007 17:57:07 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 10:57:07 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 10:56:58 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B3EF11A9838; Tue, 13 Mar 2007 10:56:38 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r517790 - in /activemq/trunk/assembly/src:
 main/descriptors/unix-bin.xml main/descriptors/windows-bin.xml
 release/conf/activemq.xml
Date: Tue, 13 Mar 2007 17:56:38 -0000
To: commits@activemq.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070313175638.B3EF11A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Tue Mar 13 10:56:37 2007
New Revision: 517790

URL: http://svn.apache.org/viewvc?view=rev&rev=517790
Log:
added web demos to broker by default

Modified:
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    activemq/trunk/assembly/src/release/conf/activemq.xml

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=517790&r1=517789&r2=517790
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Mar 13 10:56:37 2007
@@ -99,7 +99,7 @@
       </includes>
     </fileSet>
 
-    <!-- lets copy the portions of the web app we need - as we can't exclude stuff from the WAR -->
+    <!-- lets copy the portions of the admin web app we need - as we can't exclude stuff from the WAR -->
     <fileSet>
       <directory>../activemq-web-console/src/main/webapp</directory>
       <outputDirectory>/webapps/admin</outputDirectory>
@@ -115,6 +115,17 @@
         <include>**/*.class</include>
       </includes>
     </fileSet>
+
+    <!-- the web demo -->
+    <fileSet>
+      <directory>../activemq-web-demo/src/main/webapp</directory>
+      <outputDirectory>/webapps/demo</outputDirectory>
+      <excludes>
+        <exclude>**/activemq.xml</exclude>
+        <exclude>**/applicationContext.xml</exclude>
+      </excludes>
+    </fileSet>
+
   </fileSets>
   <dependencySets>
     <dependencySet>

Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=517790&r1=517789&r2=517790
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Mar 13 10:56:37 2007
@@ -119,6 +119,17 @@
         <include>**/*.class</include>
       </includes>
     </fileSet>
+
+
+    <!-- the web demo -->
+    <fileSet>
+      <directory>../activemq-web-demo/src/main/webapp</directory>
+      <outputDirectory>/webapps/demo</outputDirectory>
+      <excludes>
+        <exclude>**/activemq.xml</exclude>
+        <exclude>**/applicationContext.xml</exclude>
+      </excludes>
+    </fileSet>
   </fileSets>
 
   <dependencySets>

Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?view=diff&rev=517790&r1=517789&r2=517790
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Tue Mar 13 10:56:37 2007
@@ -99,6 +99,7 @@
 
     <handlers>
       <webAppContext contextPath="/admin" resourceBase="webapps/admin" parentLoaderPriority="false" />
+      <webAppContext contextPath="/demo" resourceBase="webapps/demo" parentLoaderPriority="false" />
     </handlers>
   </jetty>