WAR package now contains version number on WebContent/index.html

svn changeset:3015/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index b93057b05aece8a330b3f1062d83921e6242a143..5f92c4c555df6dbf9c881e28aa10fe48ac0863a9 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -495,13 +495,15 @@
 
                <!-- copy WebContent/index.html and rename it -->
                <copy todir="${output-dir}/WebContent">
-                       <filterset>
-                               <filter token="VERSION" value="${version}" />
-                       </filterset>
+                       <filterchain>
+                               <expandproperties />
+                               <replacetokens begintoken="&lt;" endtoken=">">
+                                       <token key="version" value="${version}" />
+                                       <token key="/version" value="" />
+                               </replacetokens>
+                       </filterchain>
                        <fileset dir="build/package">
-                               <patternset>
-                                       <include name="webcontent-index.html" />
-                               </patternset>
+                               <filename name="webcontent-index.html" />
                        </fileset>
                </copy>
                <move file="${output-dir}/WebContent/webcontent-index.html" tofile="${output-dir}/WebContent/index.html" />