diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-06-21 10:48:08 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-06-21 10:48:08 +0000 |
| commit | 74034e484964c8784e3e4643f86e748fb0925724 (patch) | |
| tree | 63ec2fe687a417f227d5d99ceb2535dda9348728 /build | |
| parent | b53c6aead015456504b3b92168988adbb69ea584 (diff) | |
| download | vaadin-framework-74034e484964c8784e3e4643f86e748fb0925724.tar.gz vaadin-framework-74034e484964c8784e3e4643f86e748fb0925724.zip | |
fixes #5168 now creates an optimized client side for the HelloWorld and Calculator example
svn changeset:13812/svn branch:6.4
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 17 | ||||
| -rw-r--r-- | build/package/WebContent/WEB-INF/web.xml | 16 |
2 files changed, 29 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml index fe83c7449f..b9456f01a4 100644 --- a/build/build.xml +++ b/build/build.xml @@ -693,10 +693,17 @@ </target> <target name="compile-widgetset-sampler" unless="compile.only.default-widgetset"> - <antcall target="compile-widgetset"> - <param name="widgetset" value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet"/> - </antcall> - </target> + <antcall target="compile-widgetset"> + <param name="widgetset" value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet"/> + </antcall> + </target> + + <target name="compile-widgetset-optimized" unless="compile.only.default-widgetset"> + <antcall target="compile-widgetset"> + <param name="widgetset" value="com.vaadin.demo.gwt.OptimizedWidgetSet"/> + </antcall> + </target> + <target name="compile-widgetset-colorpicker" unless="compile.only.default-widgetset"> <antcall target="compile-widgetset"> <param name="widgetset" value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet"/> @@ -711,6 +718,7 @@ <antcall target="compile-widgetset-default"/> <antcall target="compile-widgetset-portal-default"/> <antcall target="compile-widgetset-sampler"/> + <antcall target="compile-widgetset-optimized"/> <antcall target="compile-widgetset-colorpicker"/> </target> @@ -722,6 +730,7 @@ <antcall target="compile-widgetset-default"/> <antcall target="compile-widgetset-portal-default"/> <antcall target="compile-widgetset-sampler"/> + <antcall target="compile-widgetset-optimized"/> <antcall target="compile-widgetset-colorpicker"/> </parallel> </target> diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml index 0d7af3dae2..3e795d6199 100644 --- a/build/package/WebContent/WEB-INF/web.xml +++ b/build/package/WebContent/WEB-INF/web.xml @@ -72,6 +72,14 @@ <param-name>application</param-name> <param-value>com.vaadin.demo.HelloWorld</param-value> </init-param> + <!-- + As an example, we will use an optimized widget set. See + SamplerWidgetSet.gwt.xml + --> + <init-param> + <param-name>widgetset</param-name> + <param-value>com.vaadin.demo.gwt.OptimizedWidgetSet</param-value> + </init-param> </servlet> <!-- Calculator demo application --> @@ -82,6 +90,14 @@ <param-name>application</param-name> <param-value>com.vaadin.demo.Calc</param-value> </init-param> + <init-param> + <!-- + As an example, we will use an optimized widget set. See + SamplerWidgetSet.gwt.xml + --> + <param-name>widgetset</param-name> + <param-value>com.vaadin.demo.gwt.OptimizedWidgetSet</param-value> + </init-param> </servlet> <!-- |