From aade55ae17d4e40b0ad64ae8d3c2a2205897f6ff Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 17 Aug 2011 08:32:29 +0000
Subject: [PATCH] #7381 Packaging changes for Vaadin 6.7: JAR and test WAR
 only, no demo WAR nor ZIP; some cleanup (files that were in ZIP, build.xml)

svn changeset:20444/svn branch:6.7
---
 build/bin/package-diff.py                     |  71 +---
 build/build.xml                               | 344 ++++--------------
 build/build_manual.xml                        |   2 -
 build/html-style.properties                   |   6 +-
 build/package/WebContent/WEB-INF/web.xml      |  42 ---
 .../eclipse-GWT Development Mode-launch       |  27 --
 .../eclipse-Vaadin Development Server-launch  |  23 --
 build/package/eclipse-classpath               |  16 -
 .../eclipse-org.eclipse.core.resources.prefs  |   3 -
 .../eclipse-org.eclipse.jdt.core.prefs        |  12 -
 build/package/eclipse-project                 |  18 -
 build/package/start.bat                       |   1 -
 build/package/start.sh                        |   7 -
 build/readme.txt                              |   2 +-
 14 files changed, 86 insertions(+), 488 deletions(-)
 delete mode 100644 build/package/WebContent/WEB-INF/web.xml
 delete mode 100644 build/package/eclipse-GWT Development Mode-launch
 delete mode 100644 build/package/eclipse-Vaadin Development Server-launch
 delete mode 100644 build/package/eclipse-classpath
 delete mode 100644 build/package/eclipse-org.eclipse.core.resources.prefs
 delete mode 100644 build/package/eclipse-org.eclipse.jdt.core.prefs
 delete mode 100644 build/package/eclipse-project
 delete mode 100644 build/package/start.bat
 delete mode 100644 build/package/start.sh

diff --git a/build/bin/package-diff.py b/build/bin/package-diff.py
index ec3b87f97b..2add68695e 100755
--- a/build/bin/package-diff.py
+++ b/build/bin/package-diff.py
@@ -23,31 +23,6 @@ def command(cmd, dryrun=0):
 	else:
 		print "Dry run - not executing."
 
-################################################################################
-# List files in an archive.
-################################################################################
-def listZipFiles(archive):
-    pin = os.popen("unzip -l -qq %s | cut -c 29- | sort" % (archive), "r")
-    files = map(lambda x: x.strip(), pin.readlines())
-    pin.close()
-
-    cleanedfiles = []
-    for file in files:
-        # Remove archive file name from the file names
-        slashpos = file.find("/")
-        if slashpos != -1:
-            cleanedname = file[slashpos+1:]
-        else:
-            cleanedname = file
-
-        # Purge GWT compilation files.
-        if cleanedname.find(".cache.html") != -1:
-            continue
-        
-        cleanedfiles.append(cleanedname)
-
-    return cleanedfiles
-
 ################################################################################
 # Difference of two lists of files
 ################################################################################
@@ -77,28 +52,10 @@ def listJarFiles(jarfile):
 
 	return files
 
-################################################################################
-# Lists files inside a Vaadin Jar inside a ZIP
-################################################################################
-
-# For Vaadin 6.3 Zip
-def listZipVaadinJarFiles(zipfile, vaadinversion):
-    jarfile = "vaadin-%s/WebContent/vaadin-%s.jar" % (vaadinversion, vaadinversion)
-    extractedjar = "/tmp/vaadinjar-tmp-%d.jar" % (os.getpid())
-    zipcmd = "unzip -p %s %s > %s " % (zipfile, jarfile, extractedjar)
-    command (zipcmd)
-    files = listJarFiles(extractedjar)
-    command ("rm %s" % (extractedjar))
-    return files
-
 ################################################################################
 # JAPI - Java API Differences
 ################################################################################
-def japize(version, zipfile):
-    jarfile = "/tmp/vaadin-tmp.jar"
-    packagedjar = "vaadin-%s/WebContent/vaadin-%s.jar" % (version, version)
-    command ("unzip -p %s %s > %s " % (zipfile, packagedjar, jarfile))
-
+def japize(version, jarfile):
     cmd = "%s as %s apis %s +com.vaadin, $JAVA_HOME/jre/lib/rt.jar lib/core/**/*.jar 2>/dev/null" % (JAPIZE, version, jarfile)
     command (cmd)
 
@@ -125,7 +82,7 @@ latestversion  = latestdata[0].strip()
 latestpath     = latestdata[1].strip()
 latestURL      = downloadsite + "/" + latestpath + "/"
 
-latestfilename  = "vaadin-%s.zip" % (latestversion)
+latestfilename  = "vaadin-%s.jar" % (latestversion)
 latestpackage   = latestURL + latestfilename
 locallatestpackage = "/tmp/%s" % (latestfilename)
 
@@ -144,34 +101,16 @@ except OSError:
 	wgetcmd = "wget -q -O %s %s" % (locallatestpackage, latestpackage)
 	command (wgetcmd)
 
-# List files in latest version.
-latestfiles  = listZipFiles(locallatestpackage)
-
 # List files in built version.
 builtversion = sys.argv[1]
-builtpackage = "build/result/vaadin-%s.zip" % (builtversion)
-builtfiles = listZipFiles(builtpackage)
+builtpackage = "build/result/vaadin-%s/WebContent/vaadin-%s.jar" % (builtversion, builtversion)
 
 # Report differences
 
-print "\n--------------------------------------------------------------------------------\nVaadin ZIP differences"
-
-# New files
-newfiles = diffFiles(builtfiles, latestfiles)
-print "\n%d new files:" % (len(newfiles))
-for item in newfiles:
-	print item
-
-# Removed files
-removed = diffFiles(latestfiles, builtfiles)
-print "\n%d removed files:" % (len(removed))
-for item in removed:
-	print item
-
 print "\n--------------------------------------------------------------------------------\nVaadin JAR differences"
 
-latestJarFiles = listZipVaadinJarFiles(locallatestpackage, latestversion)
-builtJarFiles  = listZipVaadinJarFiles(builtpackage,       builtversion)
+latestJarFiles = listJarFiles(locallatestpackage)
+builtJarFiles  = listJarFiles(builtpackage)
 
 # New files
 newfiles = diffFiles(builtJarFiles, latestJarFiles)
diff --git a/build/build.xml b/build/build.xml
index 8a052b1a89..4e00d0248c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -6,28 +6,16 @@
          basedir="../" default="package-all">
 
     <!--Call one of package-* targets unless you understand what you are doing. -->
-    <target name="package-all" depends="clean-all, package-init, init, build, docs, internal-package-zip, internal-package-war, internal-package-liferay" description="Build public packages.">
+    <target name="package-all" depends="clean-all, init, build, docs, internal-package-war, differences, internal-package-liferay" description="Build public packages.">
     </target>
 
-    <target name="package-zip" depends="clean-all, package-init, init, build, docs, internal-package-zip">
+    <target name="package-jar" depends="clean-result, init, vaadin.jar" description="Create vaadin-x.y.z.jar file.">
     </target>
 
-    <target name="package-jar" depends="clean-result, package-init, init, vaadin.jar" description="Create vaadin-x.y.z.jar file.">
+    <target name="package-war" depends="clean-result, init, build, docs, internal-package-war, differences">
     </target>
 
-	<!-- Compiles only the default widgetset. -->
-    <target name="package-jar-quick" depends="clean-result, package-init, init" description="Create vaadin-x.y.z.jar file quick.">
-    	<property name="compile.only.default-widgetset" value="1"/>
-    	<antcall target="vaadin.jar"/>
-    </target>
-
-    <target name="package-war" depends="clean-result, package-init, init, build, docs, internal-package-zip, internal-package-war">
-    </target>
-
-    <target name="package-liferay-zip" depends="clean-result, package-init, init, build, docs, internal-package-zip, internal-package-liferay">
-    </target>
-
-    <target name="package-test" depends="clean-result, nightly-init, package-init, init, build, docs, internal-package-zip, nightly-publish">
+    <target name="package-liferay-zip" depends="clean-result, init, build, docs, internal-package-liferay, differences">
     </target>
 
     <!-- Locations of Ant task JARs - build properties not yet read at this point -->
@@ -48,22 +36,6 @@
              uri="antlib:org.apache.maven.artifact.ant"
              classpathref="maven-ant-tasks.classpath" />
 
-    <!-- internal tests for packaging -->
-
-    <target name="test-build" depends="clean-result, init, build" description="used for testing build.xml">
-    </target>
-
-    <target name="test-package" depends="init" description="used for testing build.xml">
-        <antcontrib:var name="eclipse-launch-vmargs" value="-XstartOnFirstThread -Xms128M -Xmx512M" />
-        <antcall target="add-misc-files" inheritAll="true" inheritRefs="true" />
-        <delete file="${result-path}/eclipse-test" followsymlinks="false" />
-        <exec executable="ln" failonerror="false">
-            <arg line="-s" />
-            <arg line="${output-dir}" />
-            <arg line="${result-path}/eclipse-test" />
-        </exec>
-    </target>
-
     <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="clean-result" depends="">
         <property file="build/build.properties" />
@@ -107,10 +79,6 @@
     <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <!-- ================================================================== -->
 
-    <!-- Called only when building installation packages. -->
-    <target name="package-init">
-    </target>
-
     <target name="init" depends="check-java-version">
         <property file="build/build.properties" />
         <property file="build/VERSION.properties" />
@@ -168,13 +136,14 @@
         <!-- WebContent/VAADIN/widgetsets, which needs to be set in       -->
         <!-- init-nonpackage target before calling this main init target. -->
         <property name="widgetsets-output-dir" value="${output-dir}/WebContent/VAADIN/widgetsets" />
+    	
 
         <!-- Create Output Directory Hierarchy -->
         <mkdir dir="${output-dir}/WebContent" />
         <mkdir dir="${output-dir}/WebContent/demo" />
         <mkdir dir="${output-dir}/WebContent/docs" />
         <mkdir dir="${output-dir}/WebContent/docs/api" />
-        <mkdir dir="${output-dir}/WebContent/docs/example-source" />
+        <mkdir dir="${output-dir}/WebContent/tests" />
         <mkdir dir="${output-dir}/WebContent/WEB-INF" />
         <mkdir dir="${output-dir}/WebContent/WEB-INF/lib" />
         <mkdir dir="${output-dir}/WebContent/WEB-INF/classes" />
@@ -205,38 +174,24 @@
         </path>
     </target>
 
-    <target name="internal-package-zip" depends="init">
-        <antcontrib:var name="eclipse-launch-vmargs" value="-Xms256M -Xmx512M" />
-        <antcall target="add-misc-files" inheritAll="true" inheritRefs="true" />
-        <zip zipfile="${result-path}/${base-name}.zip">
-            <zipfileset prefix="${base-name}" dir="${result-path}/${base-name}">
-                <patternset>
-                    <include name="**/*" />
-                </patternset>
-            </zipfileset>
-            <zipfileset prefix="${base-name}/gwt" dir="${gwt-dir}">
-                <patternset>
-                    <include name="**/*" />
-                    <exclude name="doc**"/>
-                    <exclude name="samples**"/>
-                    <exclude name="**/*-noservlet.jar"/>
-                </patternset>
-            </zipfileset>
-        </zip>
-
-        <!-- Notice that the differences comparison is conditional. -->
-        <antcall target="differences"/>
-    </target>
-
     <target name="internal-package-war">
-        <echo>Building WAR</echo>
+        <echo>Building Test WAR</echo>
 
         <!-- Add the files. -->
-        <antcontrib:var name="eclipse-launch-vmargs" value="-Xms256M -Xmx512M" />
-        <antcall target="add-misc-files" inheritAll="true" inheritRefs="true" />
+        <antcall target="add-test-war-files" inheritAll="true" inheritRefs="true" />
+
+    	<property name="test-war-filename" value="${product-file}-tests-${version.full}.war"/>
 
-        <war warfile="${result-path}/${product-file}-demo-${version.full}.war"> 
+        <war warfile="${result-path}/${test-war-filename}"> 
             <fileset dir="${output-dir}/WebContent">
+            	<!-- Already in JAR -->
+                <exclude name="themes/base/**/*" />
+                <exclude name="themes/chameleon/**/*" />
+                <exclude name="themes/liferay/**/*" />
+                <exclude name="themes/runo/**/*" />
+                <exclude name="themes/reindeer/**/*" />
+                <exclude name="widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
+            	
                 <include name="**/*" />
             </fileset>
         </war>
@@ -267,15 +222,35 @@
         <echo>##teamcity[publishArtifacts '${result-path}/${base-name}-liferay.zip']</echo>
     </target>
 
-    <target name="add-misc-files">
-        <delete includeemptydirs="true" defaultexcludes="false">
+	<!-- TODO some files should go to the JAR instead of test WAR -->
+    <target name="add-test-war-files">
+        <echo>Adding test class files and launcher configuration.</echo>
+        <copy todir="${output-dir}/WebContent/WEB-INF/classes">
+            <fileset dir="${result-path}/classes">
+                <include name="${toolkit-package}/tests/**/*" />
+                <include name="${toolkit-package}/launcher/**" />
+            </fileset>
+            <fileset dir="${result-path}/src/core">
+                <include name="${toolkit-package}/launcher/**" />
+                <exclude name="${toolkit-package}/launcher/**/*.java" />
+            </fileset>
+        </copy>
+
+        <echo>Adding test resources.</echo>
+        <copy todir="${output-dir}/WebContent/WEB-INF/classes">
+            <fileset dir="tests/src">
+                <include name="${toolkit-package}/tests/**/*" />
+            	<!-- These come from pre-processing -->
+        		<exclude name="**/*.java" />
+        		<exclude name="**/*.html" />
+        		<exclude name="**/*.css" />
+        		<exclude name="**/*.xml" />
+            </fileset>
+        </copy>
+
+    	<delete includeemptydirs="true" defaultexcludes="false">
             <fileset dir="${output-dir}">
-                <include name=".*" />
-                <include name="*.launch" />
                 <include name="*.txt" />
-                <include name="*.bat" />
-                <include name="*.sh" />
-                <include name="*.app" />
                 <include name="build-widgetset.xml" />
             </fileset>
         </delete>
@@ -308,77 +283,27 @@
                 <include name="license/*.txt" />
             </fileset>
         </copy>
-        <copy file="build/package/readme.txt" tofile="${output-dir}/readme.txt">
-            <filterchain>
-                <expandproperties />
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="version" value="${version.full}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
         <copy todir="${output-dir}">
             <filterchain>
                 <expandproperties />
-                <!-- .classpath, *.launch, build-widgetset.xml -->
                 <replacetokens begintoken="@" endtoken="@">
                     <token key="version" value="${version.full}" />
                 </replacetokens>
-                <!-- .classpath -->
-                <replacetokens begintoken="&lt;" endtoken=">">
-                    <token key="platform-specific-entries" value="&lt;classpathentry kind=&quot;lib&quot; path=&quot;gwt/gwt-dev.jar&quot; /&gt;" />
-                    <token key="/platform-specific-entries" value="" />
-                </replacetokens>
-                <!-- .project, *.launch -->
-                <replacetokens begintoken="&lt;" endtoken=">">
-                    <token key="eclipse-workspace-name" value="${eclipse-workspace-name}" />
-                    <token key="/eclipse-workspace-name" value="" />
-                </replacetokens>
-                <!-- HostedMode.launch -->
-                <replacetokens begintoken="&lt;" endtoken=">">
-                    <token key="eclipse-launch-vmargs" value="${eclipse-launch-vmargs}" />
-                    <token key="/eclipse-launch-vmargs" value="" />
-                </replacetokens>
             </filterchain>
             <fileset dir="build/package">
-                <include name="eclipse-classpath" />
-                <include name="eclipse-project" />
-                <include name="eclipse*launch" />
+                <include name="readme.txt" />
                 <include name="build-widgetset.xml" />
-                <include name="eclipse-org.eclipse.core.resources.prefs" />
-                <include name="eclipse-org.eclipse.jdt.core.prefs" />
             </fileset>
         </copy>
-        <move file="${output-dir}/build-widgetset.xml" tofile="${output-dir}/WebContent/docs/example-source/build-widgetset.xml" />
-        <move file="${output-dir}/eclipse-classpath" tofile="${output-dir}/.classpath" />
-        <move file="${output-dir}/eclipse-project" tofile="${output-dir}/.project" />
-        <move file="${output-dir}/eclipse-GWT Development Mode-launch" tofile="${output-dir}/GWT Development Mode.launch" />
-        <move file="${output-dir}/eclipse-Vaadin Development Server-launch" tofile="${output-dir}/Vaadin Development Server.launch" />
-        <mkdir dir="${output-dir}/.settings" />
-        <move file="${output-dir}/eclipse-org.eclipse.core.resources.prefs" tofile="${output-dir}/.settings/org.eclipse.core.resources.prefs" />
-        <move file="${output-dir}/eclipse-org.eclipse.jdt.core.prefs" tofile="${output-dir}/.settings/org.eclipse.jdt.core.prefs" />
-    	
-        <copy todir="${output-dir}">
-            <fileset dir="build/package">
-                <include name="start.bat" />
-                <include name="start.sh" />
-            </fileset>
-        </copy>
-    	
-    	<!-- TODO: Why is this set both with <chmod> and <exec>? -->
-        <chmod file="${output-dir}/start.sh" perm="ugo+x" />
-        <exec executable="chmod" failonerror="false">
-            <arg line="ugo+x" />
-            <arg line="${output-dir}/start.sh" />
-        </exec>
     </target>
 
-    <!-- Build server-side, client-side, libraries, and demos.                   -->
+    <!-- Build server-side, client-side, libraries, and tests.                   -->
     <!-- The client-side needs to be built before vaadin.jar, because the vaadin.jar -->
     <!-- require the default widgetset and doing otherwise would build it twice. -->
     <!-- However, since compiling the server-side is required by the client-side -->
     <!-- compilation, the server-side will actually be built before it.          -->
     <target name="build"
-            depends="compile-server-side, compile-client-side, vaadin.jar, vaadin-sources.jar, demo"
+            depends="compile-server-side, compile-client-side, vaadin.jar, vaadin-sources.jar"
             description="Build package required files, without packing them.">
     </target>
 
@@ -399,8 +324,6 @@
 
 		Java/HTML/CSS/XML files are filtered so the license is added and the version is set. 
 		Other files are just copied.
-		
-		If build.include.tests is not set, then "{$result-path}/src/tests" is created but no files are copied to it.
     	-->
     	
         <loadfile property="ITMillApache2LicenseForJavaFiles" srcFile="build/ITMillApache2LicenseForJavaFiles.txt" />
@@ -442,17 +365,12 @@
             </fileset>
         </copy>
 
-		<antcontrib:if>
-			<isset property="build.include.tests"/>
-			<then>
-		        <copy todir="${result-path}/src/tests">
-        			<filterset refid="version-and-license"/>
-            		<fileset dir="tests/src">
-                		<patternset refid="preprocessable-files" />
-            		</fileset>
-        		</copy>
-			</then>
-		</antcontrib:if>
+        <copy todir="${result-path}/src/tests">
+            <filterset refid="version-and-license"/>
+            <fileset dir="tests/src">
+           	    <patternset refid="preprocessable-files" />
+       		</fileset>
+   	    </copy>
 				
         <!-- Unify mix usage of mac/Linux/Win characters -->
         <echo>Unifying mix usage of Mac/Linux/Win linefeeds for java/html/css/xml files.</echo>
@@ -465,16 +383,11 @@
 				<patternset refid="non-preprocessable-files" />
 			</fileset>
         </copy>
-    	<antcontrib:if>
-    		<isset property="build.include.tests"/>
-    		<then>
-        		<copy todir="${result-path}/src/tests">
-            		<fileset dir="tests/src">
-						<patternset refid="non-preprocessable-files" />
-					</fileset>
-        		</copy>
-    		</then>
-    	</antcontrib:if>
+   	    <copy todir="${result-path}/src/tests">
+   	   	    <fileset dir="tests/src">
+   	    	    <patternset refid="non-preprocessable-files" />
+   	    	</fileset>
+   	   	</copy>
 
     </target>
 
@@ -483,17 +396,12 @@
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="webcontent" depends="preprocess-src,defaulttheme">
 
-        <!-- copy 3rd part libraries used by demo -->
-        <copy todir="${output-dir}/WebContent/demo/lib">
+        <!-- copy 3rd part libraries used by tests -->
+        <copy todir="${output-dir}/WebContent/tests/lib">
             <fileset dir="lib/core">
                 <include name="jetty/**/*" />
             </fileset>
         </copy>
-        <copy todir="${output-dir}/WebContent/demo/lib">
-            <fileset dir="lib/core">
-                <include name="portlet/**/*" />
-            </fileset>
-        </copy>
 
         <!-- Add WebContent -->
         <echo>Adding VAADIN/themes, demo and hsqldb.jar files.</echo>
@@ -501,10 +409,6 @@
             <fileset dir="WebContent">
                 <exclude name="**/.svn" />
                 <!-- TODO check what is necessary -->
-                <!-- These are needed for running tests, but are copied during testing. -->
-                <exclude name="VAADIN/themes/tests*"/>
-                <exclude name="VAADIN/themes/tests*/**/*"/>
-
                 <include name="demo/**/*" />
                 <include name="WEB-INF/lib/hsqldb.jar" />
                 <include name="VAADIN/themes/**/*" />
@@ -512,18 +416,12 @@
             </fileset>
         </copy>
 
-        <!-- Add portlet configuration files from WebContent -->
+        <!-- Add servlet and portlet configuration files from WebContent -->
         <copy todir="${output-dir}/WebContent/WEB-INF">
             <fileset dir="WebContent/WEB-INF">
                 <include name="liferay-*.xml" />
                 <include name="portlet.xml" />
-            </fileset>
-        </copy>
-        <!-- Add package specific WebContent files from build/package/WebContent -->
-        <copy todir="${output-dir}/WebContent">
-            <fileset dir="build/package/WebContent">
-                <exclude name="**/.*" />
-                <include name="**/*" />
+                <include name="web.xml" />
             </fileset>
         </copy>
     </target>
@@ -536,8 +434,6 @@
         <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-path}/classes" debug="true" encoding="UTF-8">
              <src path="${result-path}/src/core"/>
              <src path="${result-path}/src/tests"/>
-        	
-             <exclude name="${toolkit-package}/tests/**" unless="build.include.tests"/>
         </javac>
     </target>
 
@@ -585,22 +481,6 @@
         <delete dir="${widgetsets-output-dir}/WEB-INF" includeemptydirs="true" failonerror="false" />
     </target>
 
-    <!-- Note: Probably not needed any longer as all sources need to be compiled. -->
-    <target name="compile-widgetset-generator-only" depends="init, preprocess-src, compile-java">
-        <mkdir dir="${result-path}/classes"/>
-        <javac source="1.5" target="1.5" destdir="${result-path}/classes" debug="true" encoding="UTF-8">
-            <src path="${result-path}/src/core"/>
-            <include name="com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java" />
-            <!-- <exclude name="**"/> -->
-            <classpath>
-                <pathelement location="${lib-gwt-user}" />
-                <pathelement location="${lib-gwt-dev}" />
-                <pathelement location="${result-path}/classes" />
-                <pathelement location="${result-path}/src/core" />
-            </classpath>
-        </javac>
-    </target>
-
     <!-- The widgetset generator is currently compiled along with rest of server-side Java. -->    
     <target name="compile-widgetset-generator" depends="init, preprocess-src, compile-java"/>
 
@@ -649,18 +529,10 @@
     	</antcall>
     </target>
 
-    <!-- Builds the client-side engine, i.e., the widgetsets sequentially. -->
-    <!-- Notice that antcall does not fulfill dependencies.                -->
-    <target name="compile-client-side-sequential" unless="build.parallel">
-        <echo>Compiling widget sets sequentially.</echo>
-        <!-- We can't call these with 'depends' because of the 'unless' specifier. -->
-        <antcall target="compile-widgetset-default"/>
-        <antcall target="compile-widgetset-portal-default"/>
-    </target>
-
-    <!-- Builds the client-side engine, i.e., the widgetsets in parallel. -->
-    <!-- Notice that antcall does not fulfill dependencies.                -->
-    <target name="compile-client-side-parallel" if="build.parallel">
+    <!-- Compiles all widgetsets.                                         -->
+    <!-- This is called when building packages and when compiling all     -->
+    <!-- widgetsets, but not when compiling individual widgetsets.        -->
+    <target name="compile-client-side" depends="compile-server-side">
         <echo>Compiling widget sets in parallel.</echo>
         <parallel threadsperprocessor="1">
             <antcall target="compile-widgetset-default"/>
@@ -668,13 +540,6 @@
         </parallel>
     </target>
 
-    <!-- Compiles all widgetsets.                                         -->
-    <!-- This is called when building packages and when compiling all     -->
-    <!-- widgetsets, but not when compiling individual widgetsets.        -->
-    <!-- Builds widgetsets either sequentially or in parallel, depending  -->
-    <!-- on the 'build.parallel' property.                                -->
-    <target name="compile-client-side" depends="compile-server-side, compile-client-side-sequential, compile-client-side-parallel"/>
-
     <!-- Definitions for building local components, i.e., not for an installation package. -->
     <target name="init-nonpackage">
         <property file="build/build.properties" />
@@ -700,7 +565,7 @@
     <target name="widgetset-portal-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-portal-default"/>
 
     <!-- ================================================================== -->
-    <!-- Libraries and Demos                                                -->
+    <!-- Libraries and Tests                                                -->
     <!-- ================================================================== -->
 
     <!-- Compile the Vaadin library JAR.                                    -->
@@ -774,29 +639,6 @@
         </jar>
 	</target>
 	
-    <!-- Demos  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <target name="demo" depends="vaadin.jar">
-        <echo>Building demos</echo>
-        <echo>Adding demo class files and launcher configuration.</echo>
-        <copy todir="${output-dir}/WebContent/WEB-INF/classes">
-            <fileset dir="${result-path}/classes">
-                <include name="${toolkit-package}/tests/integration/**/*" />
-                <include name="${toolkit-package}/launcher/**" />
-            </fileset>
-            <fileset dir="${result-path}/src/core">
-                <include name="${toolkit-package}/launcher/**" />
-                <exclude name="${toolkit-package}/launcher/**/*.java" />
-            </fileset>
-        </copy>
-
-        <echo>Adding test resources.</echo>
-        <copy todir="${output-dir}/WebContent/WEB-INF/classes">
-            <fileset dir="tests/src">
-                <include name="${toolkit-package}/tests/integration/*.gif" />
-            </fileset>
-        </copy>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Documentation                                                      -->
     <!-- ================================================================== -->
@@ -847,9 +689,6 @@
         </concat>
     </target>
 
-    <!-- java2html converter -->
-    <taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="build/lib/java2html.jar" />
-
     <!-- ================================================================== -->
     <!-- Difference to previous release package.                            -->
     <!-- ================================================================== -->
@@ -869,7 +708,7 @@
     <!-- ================================================================== -->
 
     <!-- Main target for the custom build. -->
-    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, build">
+    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, init, build">
     </target>
 
 
@@ -903,7 +742,7 @@
     <!-- ================================================================== -->
 
     <!-- Main target for the nightly build. -->
-    <target name="nightly" depends="clean-result, nightly-init, package-init, init, build, docs, internal-package-zip">
+	<target name="nightly" depends="clean-result, nightly-init, init, build, docs, differences">
     </target>
 
 
@@ -963,13 +802,13 @@
     </target>
 
     <!-- Copies the nightly build artifacts to the download server. -->
-    <target name="nightly-demo-publish" if="nightly.demo.publish" depends="internal-package-war">
+    <target name="nightly-tests-publish" if="nightly.demo.publish" depends="internal-package-war">
     	<fail unless="version.major" message="Major version must be defined in version.major"/>
     	<fail unless="version.minor" message="Major version must be defined in version.minor"/>
     	
     	
         <!-- Publish to the demo server. -->
-    	<property name="src" value="${result-path}/${product-file}-demo-${version.full}.war"/>
+    	<property name="src" value="${result-path}/${test-war-filename}"/>
     	<property name="target" value="${nightly.demo.publish}/${version.major}.${version.minor}-${build.tag}.war"/>
     	
         <echo>Installing ${src} to ${target}</echo>
@@ -984,7 +823,7 @@
         <echo>Result: ${nightly.install.scp.result}</echo>
     </target>
 
-    <target name="nightly-publish" depends="nightly-teamcity-publish, nightly-download-publish, nightly-demo-publish">
+    <target name="nightly-publish" depends="nightly-teamcity-publish, nightly-download-publish, nightly-tests-publish">
     </target>
 
     
@@ -1005,34 +844,6 @@
     <target name="nightly-maven-publish" depends="nightly-maven-pom.xml">
         <property file="${gpg.passphrase.file}" />
 
-<!--
-
-    	<echo>Publishing ${result-path}/${lib-javadoc-jar-name} to Maven repository</echo>
-        <artifact:mvn>
-            <arg value="gpg:sign-and-deploy-file"/>
-            <sysproperty key="file" value="../${result-path}/${lib-javadoc-jar-name}" />
-            <sysproperty key="pomFile" value="maven/pom.xml" />
-            <sysproperty key="repositoryId" value="vaadin-snapshots" />
-            <sysproperty key="url" value="${snapshot.repository.url}" />
-            <sysproperty key="classifier" value="javadoc" />
-            <sysproperty key="uniqueVersion" value="false" />
-            <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
-        </artifact:mvn>
-
-    	<echo>Publishing ${result-path}/${lib-sources-jar-name} to Maven repository</echo>
-        <artifact:mvn>
-            <arg value="gpg:sign-and-deploy-file"/>
-            <sysproperty key="file" value="../${result-path}/${lib-sources-jar-name}" />
-            <sysproperty key="pomFile" value="maven/pom.xml" />
-            <sysproperty key="repositoryId" value="vaadin-snapshots" />
-            <sysproperty key="url" value="${snapshot.repository.url}" />
-            <sysproperty key="classifier" value="sources" />
-            <sysproperty key="uniqueVersion" value="false" />
-            <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
-        </artifact:mvn>
-        
--->
-
         <echo>Publishing ${output-dir}/WebContent/${lib-jar-name} to Maven repository</echo>
     	<artifact:mvn>
             <arg value="gpg:sign-and-deploy-file"/>
@@ -1115,8 +926,7 @@
         <property name="package.name" value="${base-name}"/>
 
         <!-- Only Linux tests allowed. TODO: Generalize this. -->
-        <property name="package.filename" value="${result-path}/${package.name}.zip"/>
-        <property name="package.dir" value="${result-path}/${package.name}.zip"/>
+        <property name="package.filename" value="${result-path}/${test-war-filename}"/>
 
         <!-- Run the separate test script. -->
         <ant antfile="tests/test.xml" target="test-package" inheritall="false" inheritrefs="true">
@@ -1148,7 +958,7 @@
 
         <!-- Empty passphrase if no passphrase defined -->
         <property name="passphrase" value="" />
-    	<property name="demo.war" location="${result-path}/${product-file}-demo-${version.full}.war" />
+    	<property name="tests.war" location="${result-path}/${test-war-filename}" />
 
     	<!-- Sleep before running integration tests so testbench tests have time to compile and start -->
     	<sleep minutes="4" />
@@ -1163,7 +973,7 @@
 		      <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
 		   	  <property name="sshkey.file" value="${sshkey.file}" />
 		   	  <property name="passphrase" value="${passphrase}" />
-		      <property name="demo.war" value="${demo.war}"/>
+		      <property name="demo.war" value="${tests.war}"/>
         </ant>
     </target>
 </project>
diff --git a/build/build_manual.xml b/build/build_manual.xml
index 5f0f69c69c..dc24c648f0 100644
--- a/build/build_manual.xml
+++ b/build/build_manual.xml
@@ -10,7 +10,6 @@
         <mkdir dir="${output-dir}" />
         <mkdir dir="${output-dir}/WebContent" />
         <mkdir dir="${output-dir}/WebContent/docs" />
-        <mkdir dir="${output-dir}/WebContent/docs/example-source" />
 
         <property name="docdir" value="${checkout-path}/docs"/>
         
@@ -55,7 +54,6 @@
                     <!-- FIXME -->
                     <include name="api/**" />
                     <include name="book-of-vaadin.pdf" />
-                    <include name="example-source" />
                 </patternset>
             </zipfileset>
             <zipfileset prefix="docs" dir="${docdir}/build/result/package/WebContent/docs">
diff --git a/build/html-style.properties b/build/html-style.properties
index 4700e4ca24..c517b25080 100644
--- a/build/html-style.properties
+++ b/build/html-style.properties
@@ -3,13 +3,13 @@ html.body.endtag=</body>
 docbook.head.title=<xsl:apply-templates select="." mode="object.title.markup.textonly"/>
 html.body.start1=<div id="container"><div id="header"><h1>
 html.body.start2=</h1></div><div id="itmilllogo"></div>
-html.body.end=<div id="footer"><span>Version: ${version}</span>&#x0A9; Oy IT Mill Ltd. 2000-2010</div></div>
+html.body.end=<div id="footer"><span>Version: ${version}</span>&#x0A9; Vaadin Ltd. 2000-2011</div></div>
 html.head.tag=<head>
 html.head.endtag=</head>
 html.head.style=<link rel="stylesheet" type="text/css" href="styles/demos.css" />
 javadoc.doctitle=<h1>Vaadin</h1>
-javadoc.bottom=<i>Copyright &#169; 2000-2010 IT Mill Ltd. All Rights Reserved.</i>
+javadoc.bottom=<i>Copyright &#169; 2000-2011 Vaadin Ltd. All Rights Reserved.</i>
 www.manual.body.start1=<div id="container"><div id="header"><h1>
 www.manual.body.start2=</h1></div><div id="itmilllogo"></div>
-www.manual.body.end=<div id="footer"><span>Version: ${version}</span>&#x0A9; Oy IT Mill Ltd. 2000-2010</div></div>
+www.manual.body.end=<div id="footer"><span>Version: ${version}</span>&#x0A9; Vaadin Ltd. 2000-2011</div></div>
 www.manual.docbook.head.title=<xsl:apply-templates select="." mode="object.title.markup.textonly"/>
\ No newline at end of file
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
deleted file mode 100644
index b0a35d050b..0000000000
--- a/build/package/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-	<display-name>Vaadin</display-name>
-	<description> Vaadin examples </description>
-
-	<!--
-		Turn off productionMode (off by default). Setting productionMode=true
-		disables debug features. In when this is off, you can show debug
-		window by adding ?debug to your application URL. Always set this true
-		in production environment.
-	-->
-	<context-param>
-		<param-name>productionMode</param-name>
-		<param-value>false</param-value>
-		<description>Vaadin production mode</description>
-	</context-param>
-
-	<!--
-		Enable possibility to run any Java class as application from this
-		servlet. For example, if this servlet is mapped to /run, your foo.App
-		class can be run in /run/foo.App/. Do not deploy this servlet in
-		production environment.
-	-->
-	<servlet>
-		<servlet-name>VaadinApplicationRunner</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
-	</servlet>
-
-	<!-- Servlet Mappings below - see servlets for comments -->
-	<servlet-mapping>
-		<servlet-name>VaadinApplicationRunner</servlet-name>
-		<url-pattern>/run/*</url-pattern>
-	</servlet-mapping>
-
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/build/package/eclipse-GWT Development Mode-launch b/build/package/eclipse-GWT Development Mode-launch
deleted file mode 100644
index 8df95407bd..0000000000
--- a/build/package/eclipse-GWT Development Mode-launch	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/GWT Development Mode.launch"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev.jar"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;folder nest=&amp;quot;false&amp;quot; path=&amp;quot;/<eclipse-workspace-name></eclipse-workspace-name>/WebContent/WEB-INF/src&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.folder&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;<eclipse-workspace-name></eclipse-workspace-name>&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;<eclipse-workspace-name></eclipse-workspace-name>&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -war WebContent/VAADIN/widgetsets -startupUrl http://localhost:8888/ com.vaadin.terminal.gwt.DefaultWidgetSet"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="<eclipse-launch-vmargs></eclipse-launch-vmargs>"/>
-</launchConfiguration>
diff --git a/build/package/eclipse-Vaadin Development Server-launch b/build/package/eclipse-Vaadin Development Server-launch
deleted file mode 100644
index 13c4603a7b..0000000000
--- a/build/package/eclipse-Vaadin Development Server-launch	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/src/com/vaadin/launcher/DevelopmentServerLauncher.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;vaadin-examples&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;vaadin-examples&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin-examples/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.DevelopmentServerLauncher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
-</launchConfiguration>
diff --git a/build/package/eclipse-classpath b/build/package/eclipse-classpath
deleted file mode 100644
index 1f70f30d0e..0000000000
--- a/build/package/eclipse-classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="WebContent/WEB-INF/src"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/vaadin-@version@.jar"/>
-	<classpathentry kind="lib" path="gwt/gwt-user.jar" />
-	<classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
-	<classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-6.1.7.jar"/>
-	<classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-util-6.1.7.jar"/>
-	<classpathentry kind="lib" path="WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar"/>
-    <classpathentry kind="lib" path="WebContent/demo/lib/portlet/portal-kernel.jar"/>
-    <classpathentry kind="lib" path="WebContent/demo/lib/portlet/portal-service.jar"/>
-    <classpathentry kind="lib" path="WebContent/demo/lib/portlet/portlet.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-	<platform-specific-entries></platform-specific-entries>
-</classpath>
diff --git a/build/package/eclipse-org.eclipse.core.resources.prefs b/build/package/eclipse-org.eclipse.core.resources.prefs
deleted file mode 100644
index bedbb5be74..0000000000
--- a/build/package/eclipse-org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Feb 09 04:14:03 EET 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/build/package/eclipse-org.eclipse.jdt.core.prefs b/build/package/eclipse-org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6ca90fa9ba..0000000000
--- a/build/package/eclipse-org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed Feb 18 23:54:00 EET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/build/package/eclipse-project b/build/package/eclipse-project
deleted file mode 100644
index 0a8fbb63d8..0000000000
--- a/build/package/eclipse-project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name><eclipse-workspace-name></eclipse-workspace-name></name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
-	</natures>
-</projectDescription>
diff --git a/build/package/start.bat b/build/package/start.bat
deleted file mode 100644
index c967380a87..0000000000
--- a/build/package/start.bat
+++ /dev/null
@@ -1 +0,0 @@
-@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes;WebContent\WEB-INF\src" com.vaadin.launcher.DemoLauncher
diff --git a/build/package/start.sh b/build/package/start.sh
deleted file mode 100644
index d484b131bd..0000000000
--- a/build/package/start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "$1" != "" ] ; then
-  cd $1
-fi
-
-java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.vaadin.launcher.DemoLauncher $VAADIN_PARAMETERS
diff --git a/build/readme.txt b/build/readme.txt
index 5a52afe1de..2e54326e44 100644
--- a/build/readme.txt
+++ b/build/readme.txt
@@ -9,6 +9,6 @@ with Java 1.5, you can force build with 1.6 by adding the option
 Some of the most common targets to build:
 - Distribution ZIP-file will be built with target package-zip
 - Distribution JAR-file will be built with target package-jar
-- Demo package will be built with target package-war
+- Test WAR will be built with target package-war
 
 For more detailed info, see build.xml
-- 
2.39.5