]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 189ca6d)
Added version numbering for demo pages too so everyone sees what version http://toolk...
authorJani Laakso <jani.laakso@itmill.com>
Mon, 26 Nov 2007 17:33:33 +0000 (17:33 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Mon, 26 Nov 2007 17:33:33 +0000 (17:33 +0000)
Fixed WAR which did not contain all demos (old web.xml was taken from wrong place).

svn changeset:2990/svn branch:trunk

build/build.xml patch | blob | history
build/package/webcontent-index.html patch | blob | history

diff --git a/build/build.xml b/build/build.xml
index 74ad415bf2a592e9a69e67f3ef2e179814fba754..b93057b05aece8a330b3f1062d83921e6242a143 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -493,7 +493,19 @@
                        </fileset>
                </copy>
 
-               <copy file="build/package/webcontent-index.html" tofile="${output-dir}/WebContent/index.html" />
+               <!-- copy WebContent/index.html and rename it -->
+               <copy todir="${output-dir}/WebContent">
+                       <filterset>
+                               <filter token="VERSION" value="${version}" />
+                       </filterset>
+                       <fileset dir="build/package">
+                               <patternset>
+                                       <include name="webcontent-index.html" />
+                               </patternset>
+                       </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>
@@ -629,7 +641,7 @@
                </copy>
 
                <echo>Building WAR</echo>
-               <war warfile="${output-dir}/lib/${product-file}.war" webxml="WebContent/WEB-INF/web.xml">
+               <war warfile="${output-dir}/lib/${product-file}.war" webxml="build/package/web.xml">
                        <fileset dir="${output-dir}/WebContent">
                                <exclude name="WEB-INF/web.xml" />
                                <include name="**/*" />
@@ -637,14 +649,6 @@
                        <lib dir="${output-dir}/lib">
                                <include name="${lib-jar-name}" />
                        </lib>
-                       <!-- All javadoc (demos link to these)-->
-                       <fileset dir="${output-dir}">
-                               <include name="doc/api/**/*" />
-                       </fileset>
-                       <!-- All sources (demos link to these)-->
-                       <fileset dir="${result-path}/src">
-                               <include name="**/*" />
-                       </fileset>
                </war>
        </target>
 
diff --git a/build/package/webcontent-index.html b/build/package/webcontent-index.html
index f91bf0ef174a7189f6ccd7e7c1224a4ad135cb90..f61441f0c07a228e450982b45d1451082d548a9d 100644 (file)
--- a/build/package/webcontent-index.html
+++ b/build/package/webcontent-index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-<title>IT Mill Toolkit Demo</title>
+<title>IT Mill Toolkit <version></version> Demo</title>
 <link rel="stylesheet" type="text/css" href="styles/demos.css" />
 </head>
 <body>
 <div id="container">
 
-<div id="itmilllogo"><h1>IT Mill Toolkit</h1></div>
+<div id="itmilllogo"><h1>IT Mill Toolkit <version></version></h1></div>
 
 <div id="toolkit"></div>
 
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework