Packaging fixes

Added open source license and 3rd party licenses
Building new package

svn changeset:3129/svn branch:trunk

23 files changed, 169 insertions, 178 deletions

diff --git a/WebContent/index.html b/WebContent/index.html
index 7e1a73c860..b33c84564c 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -224,8 +224,7 @@
 				
 				<div class="library">
 					<h5>Library</h5>
-					<p>Contains all you need to start a new Toolkit project (binaries, sources, default 
-					themes and widgetsets). <a href="WEB-INF/lib/itmill-toolkit-<version></version>.jar">Toolkit JAR</a></p>
+					<p>WEB-INF/lib/itmill-toolkit-<version></version>.jar contains all you need to start a new Toolkit project.</a></p>
 				</div>
 				
 				<div class="documentation">
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 780e19fd83..15ad8b9a07 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -30,75 +30,78 @@ This document is under construction.</p>
 <p>
 
 <br />
-<h4>Known issues in <version></version></h4>
+<h4>Abbreviations</h4>
+<p>
 IE = Internet Explorer, FF = Firefox, SA = Safari, OP = Opera
-<br/>
+</p>
+<h4>Known issues in <version></version></h4>
+<p>
 Starting any demo may take long time (5 seconds) on some environments. Should not affect on "real" environments.
-<br/>
+</p><p>
 Table component makes extra requests when disabling/enabling the table (FF only)
-<br/>
+</p><p>
 Window: moving / dragging windows should be more usable
-<br/>
+</p><p>
 Embedded / Window: embedded (Flash) are rendered through window
-<br/>
+</p><p>
 Panel: setComponentError, setIcon, setDescription do not work
-<br/>
+</p><p>
 Select: setEnabled(false) still can be edited
-<br/>
+</p><p>
 TabSheet: container area width is different to tabs
-<br/>
+</p><p>
 setReadOnly(true): issues on multiple components
-<br/>
+</p><p>
 Tabsheet: setComponentError, setIcon, setDescription do not work
-<br/>
+</p><p>
 Calendar: jumpy, buttons change position
-<br/>
+</p><p>
 Select has thin red lines (other widgets are seen through)
-<br/>
+</p><p>
 Window / RichTextArea: whole scrolls / jumps up when bold is clicked
-<br/>
+</p><p>
 Session: When server is restarted, application hangs (Safari)
-<br/>
+</p><p>
 RichTextEditor: setEnabled(false) still can be edited
-<br/>
+</p><p>
 SplitPanel: implement spacing
-<br/>
+</p><p>
 Form two-columns GridLayout breaks captions.
-<br/>
+</p><p>
 Add setMaxLength() to TextField
-<br/>
+</p><p>
 Cancelling (big) uploads should be possible
-<br/>
+</p><p>
 (Sub-) Window closing should be possible
-<br/>
+</p><p>
 QueryContainer must implement Sortable
-<br/>
+</p><p>
 QueryContainer should implement Container.Filterable
-<br/>
+</p><p>
 QueryContainer should support preparedstatements-type API
-<br/>
+</p><p>
 Creating minimized/optimized widgetset still contains default theme (css files)
-<br/>
+</p><p>
 Select: when opening selection div it always starts from top even though currently selected value is elsewhere
-<br/>
+</p><p>
 Window resize: if mouse hits scrollbar when dragging, cursor dragging state is lost on (SA)
-<br/>
+</p><p>
 Tree don't support icons
-<br/>
+</p><p>
 Container.Hierarchical.setParent() should be setItemParent() (etc)
-<br/>
+</p><p>
 CustomComponent: setVisible(false) does not hide it, setEnabled(false) does not disable it
-<br/>
+</p><p>
 RichTextArea performance issues (FF)
-<br/>
+</p><p>
 RichTextArea extra scrollbars issues on some layouts (SA)
-<br/>
+</p><p>
 DateField.setLocale floods to other components aswell
-<br/>
+</p><p>
 Table column selector div may be positioned randomly wrong (IE)
-<br/>
+</p><p>
 Error message in Button is not shown (FF)
-<br/>
+</p>
 				
 				
 			</div> <!-- /getting-started -->
diff --git a/build/VERSION.properties b/build/VERSION.properties
index 3caf922fbf..a33a51ed2d 100644
--- a/build/VERSION.properties
+++ b/build/VERSION.properties
@@ -1 +1 @@
-version=5.0.0-alpha-20
+version=5.0.0-alpha-21
diff --git a/build/build.xml b/build/build.xml
index bf6061780a..590a2e16e2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -298,6 +298,41 @@
 
 	<target name="add-platform-specific-files">
 		<echo>Adding platform specific files for ${package-platform}</echo>
+		<copy todir="${output-dir}">
+			<filterchain>
+				<expandproperties />
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="version" value="${version}" />
+					<token key="/version" value="" />
+				</replacetokens>
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="platform" value="${package-platform}" />
+					<token key="/platform" value="" />
+				</replacetokens>
+			</filterchain>
+			<fileset dir="WebContent/license">
+				<include name="COPYING" />
+			</fileset>
+		</copy>
+		<copy todir="${output-dir}/WebContent">
+			<filterchain>
+				<expandproperties />
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="version" value="${version}" />
+					<token key="/version" value="" />
+				</replacetokens>
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="platform" value="${package-platform}" />
+					<token key="/platform" value="" />
+				</replacetokens>
+			</filterchain>
+			<fileset dir="WebContent">
+				<exclude name="**/.svn" />
+				<include name="release-notes.html" />
+				<include name="*.html" />
+				<include name="license/*.html" />
+			</fileset>
+		</copy>
 		<delete includeemptydirs="true" defaultexcludes="false">
 			<fileset dir="${output-dir}">
 				<include name=".*" />
@@ -375,6 +410,10 @@
 					</fileset>
 				</copy>
 				<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>
 			</then>
 		</if>
 		<if>
@@ -385,12 +424,12 @@
 						<include name="start.sh" />
 					</fileset>
 				</copy>
-				<!-- must be done in native way, otherwise fails -->
-				<exec executable="cp" failonerror="true">
+				<!-- must be done manually -->
+				<!-- <exec executable="cp" failonerror="true">
 					<arg line="-r" />
 					<arg line="build/package/Start.app" />
 					<arg line="${output-dir}" />
-				</exec>
+				</exec> -->
 				<!-- but again, ant just fails with any * or other special characters -->
 				<!-- package icon or folder background image / icon placements not in use -->
 				<!--
@@ -405,50 +444,15 @@
 				<copy file="build/package/mac-VolumeIcon.icns" tofile="${output-dir}/.VolumeIcon.icns" />
 				-->
 				<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>
 			</then>
 		</if>
 	</target>
 
-	<target name="build" depends="root, demo" description="Build package required files, without packing them.">
-	</target>
-
-	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  Add and filter root files
-   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="root">
-
-		<copy todir="${output-dir}/WebContent/license">
-			<fileset dir="WebContent/license">
-				<filename name="*.pdf" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}/WebContent">
-			<filterchain>
-				<expandproperties />
-				<replacetokens begintoken="&lt;" endtoken=">">
-					<token key="version" value="${version}" />
-					<token key="/version" value="" />
-				</replacetokens>
-			</filterchain>
-			<fileset dir="WebContent">
-				<exclude name="**/.svn" />
-				<include name="release-notes.html" />
-				<include name="*.html" />
-				<include name="license/*.html" />
-			</fileset>
-		</copy>
-
-		<!-- copy 3rd part libraries used by demo -->
-		<copy todir="${output-dir}/WebContent/demo/lib">
-			<fileset dir="lib">
-				<include name="reservr/**/*" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}/WebContent/demo/lib">
-			<fileset dir="lib">
-				<include name="jetty/**/*" />
-			</fileset>
-		</copy>
+	<target name="build" depends="demo" description="Build package required files, without packing them.">
 	</target>
 
 
@@ -498,6 +502,18 @@
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 	<target name="webcontent" depends="preprocess-src">
 
+		<!-- copy 3rd part libraries used by demo -->
+		<copy todir="${output-dir}/WebContent/demo/lib">
+			<fileset dir="lib">
+				<include name="reservr/**/*" />
+			</fileset>
+		</copy>
+		<copy todir="${output-dir}/WebContent/demo/lib">
+			<fileset dir="lib">
+				<include name="jetty/**/*" />
+			</fileset>
+		</copy>
+
 		<!-- Add demo sources -->
 		<echo>Adding demo sources to WebContent/WEB-INF/src</echo>
 		<copy todir="${output-dir}/WebContent/WEB-INF/src">
diff --git a/build/package/Start IT Mill Toolkit.scpt b/build/package/Start IT Mill Toolkit.scpt
new file mode 100644
index 0000000000..2804df49d0
--- /dev/null
+++ b/build/package/Start IT Mill Toolkit.scpt
diff --git a/build/package/linux-readme.txt b/build/package/linux-readme.txt
index cf8f63e7d3..ce4574fc70 100644
--- a/build/package/linux-readme.txt
+++ b/build/package/linux-readme.txt
@@ -2,25 +2,30 @@
 

 How to Start?

 

-Open shell and execute "sh start.sh". IT Mill Toolkit webpage guides you forward.

+Open shell and execute "sh start.sh". This starts IT Mill Toolkit

+web application which guides your forward. 

 

 

 What's Inside the IT Mill Toolkit Package?

 

-You should explore package through the provided webpage within the package,

-see 'How to Start?' above. Package is an web application itself and directly

-importable to Eclipse IDE.

+You should start exploring IT Mill Toolkit through the provided web application

+within this package, see 'How to Start?' above. WebContent contains demos,

+documentation and other useful information to get started with IT Mill Toolkit.

 

-Here are few important locations and files:

+This directory is directly importable to Eclipse IDE using

+"File / Import / Existing Projects into Workspace" selection from Eclipse main

+menu.

 

-start.sh

-- start exploring IT Mill Toolkit by executing this script

+Below is a list of most important locations and files:

 

-WebContent/License

-- license files

+Start IT Mill Toolkit

+- start exploring IT Mill Toolkit by double-clicking this icon

+

+COPYING

+- license file

 

 WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar

-- IT Mill Toolkit library containing sources and compiled files

+- IT Mill Toolkit library containing Java source and compiled files

 

 WebContent/demo/itmill-toolkit.war

 - deployable demo application for your application server

@@ -52,3 +57,7 @@ build-widgetsets.xml
 

 WebContent/ITMILL

 - widgetsets and themes

+

+gwt

+- Google Web Toolkit is required for building new widgetsets

+

diff --git a/build/package/mac-Start-icon_script.zip b/build/package/mac-Start-icon_script.zip
new file mode 100644
index 0000000000..9de5a208d4
--- /dev/null
+++ b/build/package/mac-Start-icon_script.zip
diff --git a/build/package/mac-readme.txt b/build/package/mac-readme.txt
index dd9bddc3c9..d96a123ab0 100644
--- a/build/package/mac-readme.txt
+++ b/build/package/mac-readme.txt
@@ -2,27 +2,32 @@
 

 How to Start?

 

-Just double-click Start icon. IT Mill Toolkit webpage guides you forward.

-If for some reason Start icon fails in your environment, another option is

-to open shell and execute "sh start.sh".

+Just double-click Start IT Mill Toolkit icon. This starts IT Mill Toolkit

+web application which guides your forward. If for some reason start icon

+fails in your environment, another option is to open shell and execute

+"sh start.sh".

 

 

 What's Inside the IT Mill Toolkit Package?

 

-You should explore package through the provided webpage within the package,

-see 'How to Start?' above. Package is an web application itself and directly

-importable to Eclipse IDE.

+You should start exploring IT Mill Toolkit through the provided web application

+within this package, see 'How to Start?' above. WebContent contains demos,

+documentation and other useful information to get started with IT Mill Toolkit.

 

-Here are few important locations and files:

+This directory is directly importable to Eclipse IDE using

+"File / Import / Existing Projects into Workspace" selection from Eclipse main

+menu.

 

-Start

+Below is a list of most important locations and files:

+

+Start IT Mill Toolkit

 - start exploring IT Mill Toolkit by double-clicking this icon

 

-WebContent/License

-- license files

+COPYING

+- license file

 

 WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar

-- IT Mill Toolkit library containing sources and compiled files

+- IT Mill Toolkit library containing Java source and compiled files

 

 WebContent/demo/itmill-toolkit.war

 - deployable demo application for your application server

@@ -54,3 +59,7 @@ build-widgetsets.xml
 

 WebContent/ITMILL

 - widgetsets and themes

+

+gwt

+- Google Web Toolkit is required for building new widgetsets

+

diff --git a/build/package/win-readme.txt b/build/package/win-readme.txt
deleted file mode 100644
index 5e7d2cccf9..0000000000
--- a/build/package/win-readme.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-== IT Mill Toolkit <version></version> Readme ==

-

-How to Start?

-

-Double-click start.bat. IT Mill Toolkit webpage guides you forward.

-

-

-What's Inside the IT Mill Toolkit Package?

-

-You should explore package through the provided webpage within the package,

-see 'How to Start?' above. Package is an web application itself and directly

-importable to Eclipse IDE.

-

-Here are few important locations and files:

-

-start.bat

-- start exploring IT Mill Toolkit by double-clicking this icon

-

-WebContent/License

-- license files

-

-WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar

-- IT Mill Toolkit library containing sources and compiled files

-

-WebContent/demo/itmill-toolkit.war

-- deployable demo application for your application server

-

-WebContent/doc/manual.pdf

-- manual in PDF format

-

-WebContent/doc/manual/index.html

-- manual in HTML format

-

-WebContent/doc/api/index.html

-- JavaDocs

-

-WebContent/WEB-INF/src

-- demo source code, compiled into WebContent/WEB-INF/classes

- 

-WebContent/doc/example-source

-- example source in HTML format

-

-WebContent/demo

-- files required by demos

-

-IT Mill Toolkit Hosted Mode.launch

-IT Mill Toolkit Web Mode.launch

-- launch configurations for Eclipse workspace

-

-build-widgetsets.xml

-- builds GWT widgetsets for IT Mill Toolkit applications

-

-WebContent/ITMILL

-- widgetsets and themes

diff --git a/build/package/windows-readme.txt b/build/package/windows-readme.txt
index 5e7d2cccf9..3250ba4813 100644
--- a/build/package/windows-readme.txt
+++ b/build/package/windows-readme.txt
@@ -2,25 +2,30 @@
 

 How to Start?

 

-Double-click start.bat. IT Mill Toolkit webpage guides you forward.

+Just double-click start.bat icon. This starts IT Mill Toolkit web application

+which guides your forward.

 

 

 What's Inside the IT Mill Toolkit Package?

 

-You should explore package through the provided webpage within the package,

-see 'How to Start?' above. Package is an web application itself and directly

-importable to Eclipse IDE.

+You should start exploring IT Mill Toolkit through the provided web application

+within this package, see 'How to Start?' above. WebContent contains demos,

+documentation and other useful information to get started with IT Mill Toolkit.

 

-Here are few important locations and files:

+This directory is directly importable to Eclipse IDE using

+"File / Import / Existing Projects into Workspace" selection from Eclipse main

+menu.

 

-start.bat

+Below is a list of most important locations and files:

+

+Start IT Mill Toolkit

 - start exploring IT Mill Toolkit by double-clicking this icon

 

-WebContent/License

-- license files

+COPYING

+- license file

 

 WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar

-- IT Mill Toolkit library containing sources and compiled files

+- IT Mill Toolkit library containing Java source and compiled files

 

 WebContent/demo/itmill-toolkit.war

 - deployable demo application for your application server

@@ -52,3 +57,7 @@ build-widgetsets.xml
 

 WebContent/ITMILL

 - widgetsets and themes

+

+gwt

+- Google Web Toolkit is required for building new widgetsets

+

diff --git a/src/com/itmill/toolkit/demo/testbench/TestBench.java b/src/com/itmill/toolkit/tests/testbench/TestBench.java
index bec73a9aed..35373cfabb 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestBench.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestBench.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import java.io.File;
 import java.net.URL;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForAlignments.java b/src/com/itmill/toolkit/tests/testbench/TestForAlignments.java
index 2fe53445ad..858ddaa29b 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForAlignments.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForAlignments.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.CustomComponent;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForBasicApplicationLayout.java b/src/com/itmill/toolkit/tests/testbench/TestForBasicApplicationLayout.java
index 19de0d4c8c..822c408be1 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForBasicApplicationLayout.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForBasicApplicationLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;

+package com.itmill.toolkit.tests.testbench;

 

 import java.sql.SQLException;

 import java.util.Locale;

diff --git a/src/com/itmill/toolkit/demo/testbench/TestForContainerFilterable.java b/src/com/itmill/toolkit/tests/testbench/TestForContainerFilterable.java
index 1db20eb8c4..93320ee0d8 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForContainerFilterable.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForContainerFilterable.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.data.util.IndexedContainer;
 import com.itmill.toolkit.terminal.Sizeable;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForMultipleStyleNames.java b/src/com/itmill/toolkit/tests/testbench/TestForMultipleStyleNames.java
index d8f8649965..a4649bbb18 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForMultipleStyleNames.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForMultipleStyleNames.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForPreconfiguredComponents.java b/src/com/itmill/toolkit/tests/testbench/TestForPreconfiguredComponents.java
index e3d21eed2a..99ca0e3089 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForPreconfiguredComponents.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForPreconfiguredComponents.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.event.Action.Handler;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForRichTextEditor.java b/src/com/itmill/toolkit/tests/testbench/TestForRichTextEditor.java
index bf7b7e7afd..ebefb888c9 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForRichTextEditor.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForRichTextEditor.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.data.Property.ValueChangeListener;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForTrees.java b/src/com/itmill/toolkit/tests/testbench/TestForTrees.java
index a13cf4d4a4..cf89b2c27b 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForTrees.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForTrees.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.event.Action.Handler;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForUpload.java b/src/com/itmill/toolkit/tests/testbench/TestForUpload.java
index 56a381ce66..2e6c5d4e29 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForUpload.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForUpload.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForWindowOpen.java b/src/com/itmill/toolkit/tests/testbench/TestForWindowOpen.java
index 4c1546285d..b8f94e13d7 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForWindowOpen.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForWindowOpen.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.terminal.ExternalResource;
 import com.itmill.toolkit.ui.Button;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestForWindowing.java b/src/com/itmill/toolkit/tests/testbench/TestForWindowing.java
index 41b1b03516..eec366b578 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestForWindowing.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestForWindowing.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.data.Property.ValueChangeEvent;
 import com.itmill.toolkit.data.Property.ValueChangeListener;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestSetVisibleAndCaching.java b/src/com/itmill/toolkit/tests/testbench/TestSetVisibleAndCaching.java
index 037e3f3c82..2c6da7a26a 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestSetVisibleAndCaching.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestSetVisibleAndCaching.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.Label;
diff --git a/src/com/itmill/toolkit/demo/testbench/TestSplitPanel.java b/src/com/itmill/toolkit/tests/testbench/TestSplitPanel.java
index 7493d0fd07..a4234cdcf5 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestSplitPanel.java
+++ b/src/com/itmill/toolkit/tests/testbench/TestSplitPanel.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.testbench;
+package com.itmill.toolkit.tests.testbench;
 
 import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.SplitPanel;