fixes #5168 now creates an optimized client side for the HelloWorld and Calculator...

svn changeset:13812/svn branch:6.4

diff --git a/build/build.xml b/build/build.xml
index fe83c7449fbfad9a52f13f3bd84df75a095ba3ac..b9456f01a47d3edc6ff5fc964f76ff4f3b91078a 100644 (file)
--- 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 0d7af3dae2ee47c0c70230b7b4e2e9365bc31eb6..3e795d6199fc1961349e1a4531dfd37feb5bfdd5 100644 (file)
--- 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>
 
        <!--