When building WAR package, copy the source tree to class tree to work around not...

svn changeset:7861/svn branch:6.0

diff --git a/build/build.xml b/build/build.xml
index 9ef499dab8a2404578fd0fad834a4858fb29f307..0876a3801f4092932f6d318d5ee15abb8665610d 100644 (file)
--- 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" />