From: Jani Laakso <jani.laakso@itmill.com>
Date: Fri, 30 Nov 2007 13:06:00 +0000 (+0000)
Subject: structure changes (index.html now inside WebContent)
X-Git-Tag: 6.7.0.beta1~5362
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6de20bf2c32dd2635045216c9e4cb408f319e5fa;p=vaadin-framework.git

structure changes (index.html now inside WebContent)

svn changeset:3072/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index 109b0cb7f9..e6c1c64b88 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -120,7 +120,7 @@
 		<!-- Output directory -->
 		<property name="output-dir" value="${result-path}/${product-file}-${version}" />
 		<mkdir dir="${output-dir}" />
-		
+
 		<!-- Create Output Directory Hierarchy -->
 		<mkdir dir="${output-dir}/WebContent" />
 		<mkdir dir="${output-dir}/WebContent/lib" />
@@ -516,7 +516,12 @@
 			</fileset>
 		</copy>
 
-		<!-- copy WebContent/index.html and rename it -->
+		<!-- copy build/package/WebContent/* -->
+		<copy todir="${output-dir}/WebContent">
+			<fileset dir="build/package/WebContent">
+				<exclude name="index.html" />
+			</fileset>
+		</copy>
 		<copy todir="${output-dir}/WebContent">
 			<filterchain>
 				<expandproperties />
@@ -525,13 +530,10 @@
 					<token key="/version" value="" />
 				</replacetokens>
 			</filterchain>
-			<fileset dir="build/package">
-				<filename name="webcontent-index.html" />
+			<fileset dir="build/package/WebContent">
+				<filename name="index.html" />
 			</fileset>
 		</copy>
-		<move file="${output-dir}/WebContent/webcontent-index.html" tofile="${output-dir}/WebContent/index.html" />
-		<!-- <copy file="build/package/webcontent-index.html" tofile="${output-dir}/WebContent/index.html" /> -->
-		<copy file="build/package/web.xml" tofile="${output-dir}/WebContent/WEB-INF/web.xml" />
 
 	</target>