added web demos to broker by default

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@517790 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/main/descriptors/unix-bin.xml

@@ -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>

assembly/src/main/descriptors/windows-bin.xml

@@ -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>

assembly/src/release/conf/activemq.xml

@@ -99,6 +99,7 @@
 
     <handlers>
       <webAppContext contextPath="/admin" resourceBase="webapps/admin" parentLoaderPriority="false" />
+      <webAppContext contextPath="/demo" resourceBase="webapps/demo" parentLoaderPriority="false" />
     </handlers>
   </jetty>