Return-Path: 
 <commits-return-8351-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 53143 invoked from network); 7 Apr 2008 16:23:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Apr 2008 16:23:49 -0000
Received: (qmail 12994 invoked by uid 500); 7 Apr 2008 16:23:49 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 12971 invoked by uid 500); 7 Apr 2008 16:23:49 -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 12962 invoked by uid 99); 7 Apr 2008 16:23:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2008 09:23:49 -0700
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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2008 16:23:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C763D1A9832; Mon,  7 Apr 2008 09:23:27 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r645592 - in /activemq/trunk/assembly/src:
 main/descriptors/unix-bin.xml main/descriptors/windows-bin.xml
 release/conf/activemq.xml
Date: Mon, 07 Apr 2008 16:23:26 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080407162327.C763D1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Mon Apr  7 09:23:24 2008
New Revision: 645592

URL: http://svn.apache.org/viewvc?rev=645592&view=rev
Log:
Applying patch at https://issues.apache.org/activemq/browse/AMQ-1624 thanks Marco!

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?rev=645592&r1=645591&r2=645592&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Apr  7 09:23:24 2008
@@ -124,6 +124,13 @@
       <directory>../activemq-fileserver/src/main/webapp</directory>
       <outputDirectory>/webapps/fileserver</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>../activemq-fileserver/target/classes</directory>
+      <outputDirectory>/webapps/fileserver/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>**/*.class</include>
+      </includes>
+    </fileSet>
 
   </fileSets>
   <dependencySets>

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?rev=645592&r1=645591&r2=645592&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Apr  7 09:23:24 2008
@@ -133,7 +133,14 @@
       <directory>../activemq-fileserver/src/main/webapp</directory>
       <outputDirectory>/webapps/fileserver</outputDirectory>
     </fileSet>
-  </fileSets>
+  <fileSet>
+      <directory>../activemq-fileserver/target/classes</directory>
+      <outputDirectory>/webapps/fileserver/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>**/*.class</include>
+      </includes>
+    </fileSet>
+   </fileSets>
 
   <dependencySets>
     <dependencySet>

Modified: activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=645592&r1=645591&r2=645592&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ activemq/trunk/assembly/src/release/conf/activemq.xml Mon Apr  7 09:23:24 2008
@@ -136,6 +136,7 @@
     <handlers>
       <webAppContext contextPath="/admin" resourceBase="${activemq.base}/webapps/admin" logUrlOnStart="true" />
       <webAppContext contextPath="/demo" resourceBase="${activemq.base}/webapps/demo" logUrlOnStart="true" />
+      <webAppContext contextPath="/fileserver" resourceBase="${activemq.base}/webapps/fileserver" logUrlOnStart="true" />
     </handlers>
   </jetty>