structure changes (index.html now inside WebContent)

svn changeset:3072/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index 109b0cb7f92633070fda22b6346a124b8affd884..e6c1c64b8868fc5408cf13323e32e1527257717e 100644 (file)
--- 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>