You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/03/13 18:56:38 UTC
svn commit: r517790 - in /activemq/trunk/assembly/src: main/descriptors/unix-bin.xml main/descriptors/windows-bin.xml release/conf/activemq.xml

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>