From 57832e5dbd8fce2f5db9549026a749605a878a3d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marko=20Gr=C3=B6nroos?= <magi@iki.fi>
Date: Mon, 18 May 2009 12:55:34 +0000
Subject: [PATCH] When building WAR package, copy the source tree to class tree
 to work around not being able to set classpath in WAR. Does duplicate the
 source tree content. Fixes #2964.

svn changeset:7861/svn branch:6.0
---
 build/build.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 9ef499dab8..0876a3801f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -60,7 +60,7 @@
 	<target name="package-jar" depends="clean-result, package-init, init, libs" description="Create vaadin-x.y.z.jar file.">
 	</target>
 
-	<target name="package-war" depends="clean-result, package-init, init, build, docs, internal-package-mac, internal-package-war">
+	<target name="package-war" depends="clean-result, package-init, init, build, docs, internal-package-linux, internal-package-war">
 	</target>
 
     <target name="package-test" depends="clean-result, nightly-init, package-init, init, build, docs, internal-package-linux, nightly-publish">
@@ -324,6 +324,21 @@
 
 	<target name="internal-package-war">
 		<echo>Building WAR</echo>
+
+        <!-- Add the files. -->
+        <!-- Warning: This should not really be "platform spefic". -->
+		<antcontrib:var name="package-platform" value="linux" />
+		<antcontrib:var name="eclipse-launch-vmargs" value="-Xms256M -Xmx512M" />
+		<antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
+
+        <!-- Copy source tree to class tree.                         -->
+        <!-- A workaround for not setting classpath properly in WAR. -->
+		<copy todir="${output-dir}/WebContent/WEB-INF/classes">
+			<fileset dir="${output-dir}/WebContent/WEB-INF/src">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+
 		<war warfile="${output-dir}/${product-file}.war">
 			<fileset dir="${output-dir}/WebContent">
 				<include name="**/*" />
@@ -331,7 +346,6 @@
 		</war>
 	</target>
 
-
 	<target name="create-mac-diskimage">
 		<!-- create Mac disk image (dmg) also -->
 		<property name="mount.dir" value="${result-path}/mac-mounted-image" />
-- 
2.39.5