From: Jani Laakso Date: Thu, 18 Oct 2007 17:33:18 +0000 (+0000) Subject: multi-platform build.xml quite complete. X-Git-Tag: 6.7.0.beta1~5810 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d70c7f61fd13c78defc7ae5dbd5908fc035c291e;p=vaadin-framework.git multi-platform build.xml quite complete. feature browser changing. svn changeset:2560/svn branch:trunk --- diff --git a/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html b/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html deleted file mode 100644 index e859c763e0..0000000000 --- a/WebContent/ITMILL/themes/demo/layouts/featurebrowser-mainlayout.html +++ /dev/null @@ -1,251 +0,0 @@ - - - - - -

- -

tree

- -

- - - - - - -

demo

- -

tabsheet

- -

properties

- -

- - - - - - - -

themes

restart

- -

- - - - - - \ No newline at end of file diff --git a/WebContent/ITMILL/themes/demo/layouts/img/header.png b/WebContent/ITMILL/themes/demo/layouts/img/header.png deleted file mode 100644 index bf64ac4e17..0000000000 Binary files a/WebContent/ITMILL/themes/demo/layouts/img/header.png and /dev/null differ diff --git a/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png b/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png deleted file mode 100644 index 0069db75d9..0000000000 Binary files a/WebContent/ITMILL/themes/demo/layouts/img/hide_properties.png and /dev/null differ diff --git a/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png b/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png deleted file mode 100644 index 2d37f7ffae..0000000000 Binary files a/WebContent/ITMILL/themes/demo/layouts/img/m_bg.png and /dev/null differ diff --git a/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png b/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png deleted file mode 100644 index 6427452419..0000000000 Binary files a/WebContent/ITMILL/themes/demo/layouts/img/show_properties.png and /dev/null differ diff --git a/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png b/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png deleted file mode 100644 index ed0c34cabb..0000000000 Binary files a/WebContent/ITMILL/themes/demo/layouts/img/tab_handle.png and /dev/null differ diff --git a/WebContent/ITMILL/themes/demo/styles.css b/WebContent/ITMILL/themes/demo/styles.css deleted file mode 100644 index 735fa83e3c..0000000000 --- a/WebContent/ITMILL/themes/demo/styles.css +++ /dev/null @@ -1,6 +0,0 @@ -body, html { - background: #e9eced; - margin: 0; - padding: 0; - height: 100%; -} \ No newline at end of file diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html new file mode 100644 index 0000000000..e859c763e0 --- /dev/null +++ b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/featurebrowser-mainlayout.html @@ -0,0 +1,251 @@ + + + + + +

+ +

tree

+ +

+ + + + + + +

demo

+ +

tabsheet

+ +

properties

+ +

+ + + + + + + +

themes

restart

+ +

+ + + + + + \ No newline at end of file diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png new file mode 100644 index 0000000000..bf64ac4e17 Binary files /dev/null and b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/header.png differ diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png new file mode 100644 index 0000000000..0069db75d9 Binary files /dev/null and b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/hide_properties.png differ diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png new file mode 100644 index 0000000000..2d37f7ffae Binary files /dev/null and b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/m_bg.png differ diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png new file mode 100644 index 0000000000..6427452419 Binary files /dev/null and b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/show_properties.png differ diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png new file mode 100644 index 0000000000..ed0c34cabb Binary files /dev/null and b/WebContent/ITMILL/themes/tests-featurebrowser/layouts/img/tab_handle.png differ diff --git a/WebContent/ITMILL/themes/tests-featurebrowser/styles.css b/WebContent/ITMILL/themes/tests-featurebrowser/styles.css new file mode 100644 index 0000000000..735fa83e3c --- /dev/null +++ b/WebContent/ITMILL/themes/tests-featurebrowser/styles.css @@ -0,0 +1,6 @@ +body, html { + background: #e9eced; + margin: 0; + padding: 0; + height: 100%; +} \ No newline at end of file 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 @@ - + - + + + + + + + + + + + + + + + @@ -36,7 +52,9 @@ + + We are on ${platform} platform, using build/gwt/${platform}/${lib-gwt-dev}. @@ -69,41 +87,43 @@ - + + + + + + + + + + - - - - - - - Building package for Windows platform. - - - - - + + Creating package for Windows platform. + + + + - + - - + + - + - - Building package for Linux platform. - - - - + + Creating package for Linux platform. + + + @@ -117,12 +137,11 @@ - - Building package for Mac platform. - - - - + + Creating package for Mac platform. + + + @@ -134,10 +153,22 @@ + - - + + + + + + + + @@ -146,44 +177,63 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - + + + + + + @@ -211,6 +261,7 @@ + @@ -219,7 +270,7 @@ - + Copying src directory and processing copied files. Replacing <version> tag with build version for java/html/css/xml files. @@ -264,23 +315,6 @@ WebContent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - Adding Eclipse workspace files, replacing <version> tag with build version - - - - - - - - - - - - Adding demo sources to WebContent/src @@ -311,16 +345,7 @@ Compiling src (server-side) - - - - - - - - - - + @@ -358,7 +383,11 @@ + + + + Compiling src (client-side) com.itmill.toolkit.terminal.gwt.DefaultWidgetSet @@ -404,7 +433,7 @@ - + Building demo Adding demo class files. @@ -468,7 +497,7 @@ - + @@ -488,7 +517,7 @@ Documentation: Add Javadoc to doc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - + @@ -527,11 +556,11 @@ - + - + diff --git a/build/package/.project b/build/package/.project new file mode 100644 index 0000000000..2ca2072634 --- /dev/null +++ b/build/package/.project @@ -0,0 +1,18 @@ + + + itmill-toolkit-examples + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + com.sysdeo.eclipse.tomcat.tomcatnature + + 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 @@ - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - diff --git a/build/package/project b/build/package/project deleted file mode 100644 index 2ca2072634..0000000000 --- a/build/package/project +++ /dev/null @@ -1,18 +0,0 @@ - - - itmill-toolkit-examples - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - com.sysdeo.eclipse.tomcat.tomcatnature - - 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.