summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html (renamed from WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html)0
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png (renamed from WebContent/ITMILL/themes/demo/layouts/img/header.png)bin2389 -> 2389 bytes
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png (renamed from WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png)bin360 -> 360 bytes
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png (renamed from WebContent/ITMILL/themes/demo/layouts/img/m_bg.png)bin4071 -> 4071 bytes
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png (renamed from WebContent/ITMILL/themes/demo/layouts/img/show_properties.png)bin829 -> 829 bytes
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png (renamed from WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png)bin308 -> 308 bytes
-rw-r--r--WebContent/ITMILL/themes/tests-featurebrowser/styles.css (renamed from WebContent/ITMILL/themes/demo/styles.css)0
-rw-r--r--build/build.xml205
-rw-r--r--build/package/.project (renamed from build/package/project)0
-rw-r--r--build/package/classpath-mac15
-rw-r--r--build/package/classpath-windows15
-rw-r--r--build/package/start-demo.bat2
-rw-r--r--src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java4
-rw-r--r--start-demo.bat1
-rw-r--r--start-demo.sh3
-rw-r--r--start-demo.txt15
16 files changed, 120 insertions, 140 deletions
diff --git a/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html
index e859c763e0..e859c763e0 100644
--- a/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/header.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png
index bf64ac4e17..bf64ac4e17 100644
--- a/WebContent/ITMILL/themes/demo/layouts/img/header.png
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png
Binary files differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png
index 0069db75d9..0069db75d9 100644
--- a/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png
Binary files differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png
index 2d37f7ffae..2d37f7ffae 100644
--- a/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png
Binary files differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png
index 6427452419..6427452419 100644
--- a/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png
Binary files differ
diff --git a/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png
index ed0c34cabb..ed0c34cabb 100644
--- a/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png
Binary files differ
diff --git a/WebContent/ITMILL/themes/demo/styles.css b/WebContent/ITMILL/themes/tests-featurebrowser/styles.css
index 735fa83e3c..735fa83e3c 100644
--- a/WebContent/ITMILL/themes/demo/styles.css
+++ b/WebContent/ITMILL/themes/tests-featurebrowser/styles.css
diff --git a/build/build.xml b/build/build.xml
index d4902a50b9..13d0801e1d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="IT Mill Toolkit" basedir="../" default="package-all-platforms">
+<project name="IT Mill Toolkit" basedir="../" default="package-all">
<!-- Package creation - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -14,8 +14,24 @@
b) creating platform specific release ZIP/TGZ packages.
-->
- <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Call one of package-* targets unless you understand what you are doing -->
+ <target name="package-all" depends="clean-all, init, build, internal-package-windows, internal-package-linux, internal-package-mac " description="Build public packages for Windows, Linux and Mac platforms.">
+ <!--<antcall target="internal-package-windows" />
+ <antcall target="internal-package-linux" />
+ <antcall target="internal-package-mac" />-->
+ </target>
+
+ <target name="package-windows" depends="clean-all, init, build, internal-package-windows" description="Create public ZIP package for Windows.">
+ </target>
+
+ <target name="package-linux" depends="clean-all, init, build, internal-package-linux" description="Create public tar.bz2 package for Linux.">
+ </target>
+
+ <target name="package-mac" depends="clean-all, init, build, internal-package-mac" description="Create public tar.gz package for Mac.">
+ </target>
+
+ <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
<target name="init">
<!-- Find out which platform we are in -->
<if>
@@ -36,7 +52,9 @@
<property name="platform" value="mac" />
</then>
</if>
+ <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
<property name="lib-gwt-dev" value="gwt-dev-${platform}.jar" />
+
<echo>We are on ${platform} platform, using build/gwt/${platform}/${lib-gwt-dev}.</echo>
<!-- Create result dir unless already exists -->
@@ -69,41 +87,43 @@
<mkdir dir="${output-dir}/WebContent" />
<mkdir dir="${output-dir}/WebContent/WEB-INF" />
<mkdir dir="${output-dir}/WebContent/WEB-INF/classes" />
- </target>
+ <!-- Construct classpath used by java and javadoc compilation -->
+ <path id="compile.classpath">
+ <pathelement path="build/gwt/${platform}/gwt-user.jar" />
+ <pathelement path="build/gwt/${platform}/${lib-gwt-dev}" />
+ <pathelement path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
+ <pathelement path="lib/reservr/googlemaps_gwt.jar" />
+ <pathelement path="lib/jetty/jetty-6.1.5.jar" />
+ <pathelement path="lib/jetty/jetty-util-6.1.5.jar" />
+ <pathelement path="lib/jetty/servlet-api-2.5-6.1.5.jar" />
+ </path>
- <target name="package-all-platforms" depends="init, clean-all" description="Build public packages for Windows, Linux and Mac platforms.">
- <antcall target="build" />
- <antcall target="package-windows" />
- <antcall target="package-linux" />
- <antcall target="package-osx" />
</target>
- <target name="package-windows" depends="init, clean-all" description="Create ZIP package for Windows.">
- <echo>Building package for Windows platform.</echo>
- <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
- <property name="package-file-name" value="${product-file}-windows-${version}" />
- <antcall target="add-windows-files" />
- <zip zipfile="build/result/${package-file-name}">
- <fileset prefix="${product-file}-${version}" dir="build/result/${product-file}-${version}">
+ <target name="internal-package-windows">
+ <echo>Creating package for Windows platform.</echo>
+ <property name="package-platform" value="windows" />
+ <antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
+ <zip zipfile="build/result/${product-file}-${package-platform}-${version}.zip">
+ <zipfileset dir="build/result">
<patternset>
- <include name="**/*" />
+ <include name="${product-file}-${version}/**/*" />
</patternset>
- </fileset>
- <fileset prefix="${product-file}-${version}/gwt" dir="build/gwt/windows">
+ </zipfileset>
+ <zipfileset prefix="${product-file}-${version}/gwt" dir="build/gwt/windows">
<patternset>
<include name="**/*" />
</patternset>
- </fileset>
+ </zipfileset>
</zip>
</target>
- <target name="package-linux" depends="init, clean-all" description="Create tar.gz package for Linux.">
- <echo>Building package for Linux platform.</echo>
- <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
- <property name="package-file-name" value="${product-file}-linux-${version}" />
- <antcall target="add-linux-files" />
- <tar destfile="build/result/${package-file-name}.tar.bz2" compression="bzip2" longfile="gnu">
+ <target name="internal-package-linux">
+ <echo>Creating package for Linux platform.</echo>
+ <property name="package-platform" value="linux" />
+ <antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
+ <tar destfile="build/result/${product-file}-${package-platform}-${version}.tar.bz2" compression="bzip2" longfile="gnu">
<tarfileset prefix="${product-file}-${version}" dir="build/result/${product-file}-${version}">
<patternset>
<include name="**/*" />
@@ -117,12 +137,11 @@
</tar>
</target>
- <target name="package-mac" depends="init, clean-all" description="Create tar.gz package for Mac.">
- <echo>Building package for Mac platform.</echo>
- <!-- required when compiling WebContent/ITMILL/widgetsets (and also Java server-side classes) -->
- <property name="package-file-name" value="${product-file}-mac-${version}" />
- <antcall target="add-mac-files" />
- <tar destfile="build/result/${package-file-name}.tar.gz" compression="gzip" longfile="gnu">
+ <target name="internal-package-mac">
+ <echo>Creating package for Mac platform.</echo>
+ <property name="package-platform" value="mac" />
+ <antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
+ <tar destfile="build/result/${product-file}-${package-platform}-${version}.tar.gz" compression="gzip" longfile="gnu">
<tarfileset prefix="${product-file}-${version}" dir="build/result/${product-file}-${version}">
<patternset>
<include name="**/*" />
@@ -134,10 +153,22 @@
</patternset>
</tarfileset>
</tar>
+ <!--
+ TODO: how about creating dmg ?
+ <exec executable="hdiutil">
+ <arg line="create -srcfolder build/result/${product-file}-${version} build/result/${product-file}-${package-platform}-${version}.dmg"/>
+ </exec>
+ -->
</target>
- <target name="add-mac-files" depends="init">
- <antcall target="remove-platform-specific-files" />
+ <target name="add-platform-specific-files">
+ <delete includeemptydirs="true" defaultexcludes="false">
+ <fileset dir="${output-dir}">
+ <include name="start-demo.*" />
+ <include name=".project" />
+ <include name=".classpath" />
+ </fileset>
+ </delete>
<copy todir="${output-dir}">
<filterchain>
<expandproperties />
@@ -146,44 +177,63 @@
<token key="/version" value="" />
</replacetokens>
<replacetokens begintoken="&lt;" endtoken=">">
- <token key="platform-specific-entries" value="&lt;classpathentry kind=&quot;lib&quot; path=&quot;gwt/gwt-dev-mac.jar&quot; /&gt;" />
+ <token key="platform-specific-entries" value="&lt;classpathentry kind=&quot;lib&quot; path=&quot;gwt/gwt-dev-${package-platform}.jar&quot; /&gt;" />
<token key="/platform-specific-entries" value="" />
</replacetokens>
</filterchain>
<fileset dir="build/package">
- <include name="*.sh" />
- </fileset>
- <fileset dir="build/package">
<include name=".classpath" />
<include name=".project" />
</fileset>
</copy>
- <chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
- </target>
-
- <target name="remove-platform-specific-files" depends="init">
- <delete includeemptydirs="true" defaultexcludes="false">
- <fileset dir="${output-dir}">
- <include name="start-demo.*" />
- <include name=".project" />
- <include name=".classpath" />
- </fileset>
- </delete>
+ <if>
+ <equals arg1="${package-platform}" arg2="windows" />
+ <then>
+ <copy todir="${output-dir}">
+ <fileset dir="build/package">
+ <filename name="*.bat" />
+ </fileset>
+ </copy>
+ </then>
+ </if>
+ <if>
+ <equals arg1="${package-platform}" arg2="linux" />
+ <then>
+ <copy todir="${output-dir}">
+ <fileset dir="build/package">
+ <filename name="*.sh" />
+ </fileset>
+ </copy>
+ <chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
+ </then>
+ </if>
+ <if>
+ <equals arg1="${package-platform}" arg2="mac" />
+ <then>
+ <copy todir="${output-dir}">
+ <fileset dir="build/package">
+ <filename name="*.sh" />
+ </fileset>
+ </copy>
+ <chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
+ </then>
+ </if>
</target>
+ <!-- TODO: add docs -->
<!-- do not use these directly, use targets named package-* -->
- <target name="build" depends="clean-all, root, demo, docs" description="Build package required files, without packing them.">
- </target>
-
- <!-- do not use these directly, use targets named package-*, retained for build.xml debug purposes only -->
- <target name="build-no-manual" depends="clean-all, root, demo" description="Same as build, but without manual.">
+ <target name="build" depends="root, demo" description="Build package required files, without packing them.">
</target>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Add and filter root files
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <target name="root" depends="init">
- <!-- TODO: add license directory and files -->
+ <target name="root">
+ <copy todir="${output-dir}/license">
+ <fileset dir="license">
+ <filename name="*.pdf" />
+ </fileset>
+ </copy>
<copy todir="${output-dir}">
<filterchain>
<expandproperties />
@@ -211,6 +261,7 @@
<exclude name="release-notes.html" />
<include name="*.html" />
<include name="*.txt" />
+ <include name="license/*.html" />
</fileset>
</copy>
</target>
@@ -219,7 +270,7 @@
<!-- Copy and preprocess sources for packaging
NOTE: Replaces <version></version> tags with build version tag for some "textual" files
-->
- <target name="preprocess-src" depends="init">
+ <target name="preprocess-src">
<mkdir dir="build/result/src" />
<echo>Copying src directory and processing copied files.</echo>
<echo>Replacing &lt;version&gt; tag with build version for java/html/css/xml files.</echo>
@@ -264,23 +315,6 @@
WebContent
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<target name="webcontent" depends="preprocess-src">
- <!--
- Copy Eclipse workspace related hidden files (.classpath, .project)
- Allows project import from Eclipse
- -->
- <echo>Adding Eclipse workspace files, replacing &lt;version&gt; tag with build version</echo>
- <copy todir="${output-dir}">
- <filterchain>
- <expandproperties />
- <replacetokens begintoken="&lt;" endtoken=">">
- <token key="version" value="${version}" />
- <token key="/version" value="" />
- </replacetokens>
- </filterchain>
- <fileset dir="build/workspace-eclipse">
- <exclude name="**/.svn" />
- </fileset>
- </copy>
<!-- Add demo sources -->
<echo>Adding demo sources to WebContent/src</echo>
@@ -311,16 +345,7 @@
<echo>Compiling src (server-side)</echo>
<!-- Compile -->
<mkdir dir="build/result/classes" />
- <javac source="1.4" target="1.4" srcdir="build/result/src" destdir="build/result/classes" includes="${toolkit-package}/**" debug="true">
- <classpath>
- <pathelement path="build/gwt/${platform}/gwt-user.jar" />
- <pathelement path="build/gwt/${platform}/${lib-gwt-dev}" />
- <pathelement path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
- <pathelement path="lib/reservr/googlemaps_gwt.jar" />
- <pathelement path="lib/jetty/jetty-6.1.5.jar" />
- <pathelement path="lib/jetty/jetty-util-6.1.5.jar" />
- <pathelement path="lib/jetty/servlet-api-2.5-6.1.5.jar" />
- </classpath>
+ <javac source="1.4" target="1.4" classpathref="compile.classpath" srcdir="build/result/src" destdir="build/result/classes" includes="${toolkit-package}/**" debug="true">
</javac>
</target>
@@ -358,7 +383,11 @@
</jar>
</target>
+ <!-- TODO: remove -->
<target name="compile-client-side" depends="libs">
+ </target>
+
+ <target name="compile-client-side2" depends="libs">
<echo>Compiling src (client-side)</echo>
<echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
@@ -404,7 +433,7 @@
</target>
<!-- Demo - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <target name="demo" depends="root, libs, compile-java, compile-client-side, javadoc">
+ <target name="demo" depends="libs, compile-java, compile-client-side, javadoc">
<echo>Building demo</echo>
<echo>Adding demo class files.</echo>
<copy todir="${output-dir}/WebContent/WEB-INF/classes">
@@ -468,7 +497,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Documentation: Add documentation including style files
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <target name="package-docs" depends="init">
+ <target name="package-docs">
<copy todir="${output-dir}/doc/manual/html-style">
<fileset dir="doc/manual/html-style">
<exclude name="**/.svn" />
@@ -488,7 +517,7 @@
Documentation: Add Javadoc to doc
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<target name="javadoc" depends="preprocess-src">
- <javadoc destdir="${output-dir}/doc/api" author="true" version="true" use="true" windowtitle="${product-name}" classpath="build/lib/servlet-api.jar">
+ <javadoc destdir="${output-dir}/doc/api" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath">
<packageset dir="build/result/src">
<include name="${toolkit-package}/**" />
<exclude name="${toolkit-package}/demo/**" />
@@ -527,11 +556,11 @@
</javadoc>
</target>
- <target name="manual-pdf" depends="init">
+ <target name="manual-pdf">
<!-- TODO Include XEP-based FO building in future -->
</target>
- <target name="manual-html" depends="init">
+ <target name="manual-html">
<delete file="build/docbook/conf/temp.xsl" />
<copy file="build/docbook/conf/custom-html-docbook.xsl" tofile="build/docbook/conf/temp.xsl">
<filterchain>
diff --git a/build/package/project b/build/package/.project
index 2ca2072634..2ca2072634 100644
--- a/build/package/project
+++ b/build/package/.project
diff --git a/build/package/classpath-mac b/build/package/classpath-mac
deleted file mode 100644
index 62b2763dd6..0000000000
--- a/build/package/classpath-mac
+++ /dev/null
@@ -1,15 +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/src"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-src-<version></version>.jar"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
- <classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
- <classpathentry kind="lib" path="gwt/gwt-user.jar" />
- <classpathentry kind="lib" path="gwt/gwt-dev-mac.jar"/>
- <classpathentry kind="lib" path="lib/demo/reservr/googlemaps_gwt.jar" />
- <classpathentry kind="lib" path="lib/jetty/jetty-6.1.5.jar"/>
- <classpathentry kind="lib" path="lib/jetty/jetty-util-6.1.5.jar"/>
- <classpathentry kind="lib" path="lib/jetty/servlet-api-2.5-6.1.5.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/build/package/classpath-windows b/build/package/classpath-windows
deleted file mode 100644
index 42ff093572..0000000000
--- a/build/package/classpath-windows
+++ /dev/null
@@ -1,15 +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/src"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-src-<version></version>.jar"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.2.jar" />
- <classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
- <classpathentry kind="lib" path="gwt/gwt-user.jar" />
- <classpathentry kind="lib" path="gwt/gwt-dev-windows.jar"/>
- <classpathentry kind="lib" path="lib/demo/reservr/googlemaps_gwt.jar" />
- <classpathentry kind="lib" path="lib/jetty/jetty-6.1.5.jar"/>
- <classpathentry kind="lib" path="lib/jetty/jetty-util-6.1.5.jar"/>
- <classpathentry kind="lib" path="lib/jetty/servlet-api-2.5-6.1.5.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/build/package/start-demo.bat b/build/package/start-demo.bat
index d6eb6096dd..b4f879f91b 100644
--- a/build/package/start-demo.bat
+++ b/build/package/start-demo.bat
@@ -1 +1 @@
-@java -cp "lib\itmill-5.0.0-alpha.jar;lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillDesktopLaunch
+@java -cp "lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillDesktopLaunch
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java
index e7c1014a57..bb0632f1c2 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java
@@ -73,10 +73,10 @@ public class FeatureBrowser extends CustomComponent implements
// Theme selector
mainlayout.addComponent(themeSelector, "themes");
- themeSelector.addItem("demo");
+ themeSelector.addItem("tests-featurebrowser");
themeSelector.addListener(this);
- themeSelector.select("demo");
+ themeSelector.select("tests-featurebrowser");
themeSelector.setImmediate(true);
// Restart button
diff --git a/start-demo.bat b/start-demo.bat
deleted file mode 100644
index d6eb6096dd..0000000000
--- a/start-demo.bat
+++ /dev/null
@@ -1 +0,0 @@
-@java -cp "lib\itmill-5.0.0-alpha.jar;lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillDesktopLaunch
diff --git a/start-demo.sh b/start-demo.sh
deleted file mode 100644
index 3a7b612f15..0000000000
--- a/start-demo.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -cp lib/jetty/jetty-6.1.5.jar:lib/jetty/jetty-util-6.1.5.jar:lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillDesktopLaunch
diff --git a/start-demo.txt b/start-demo.txt
deleted file mode 100644
index b8433aecf2..0000000000
--- a/start-demo.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Starting Toolkit demos
-
-
-1) Under Windows environment
-
-Doubleclick start-demo.bat
-
-
-2) Under Linux or OSX environment
-
-Open shell and execute "sh start-demo.sh"
-
-
-This starts an integrated Servlet Container which runs Toolkit demo
-applications. Your default web browser should be opened automatically.