From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 9 Apr 2010 15:30:23 +0000 (+0000)
Subject: Manual merge of [11296] from 6.2
X-Git-Tag: 6.7.0.beta1~1747
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1ecce45cd371a2b24d666c6d50b652dd14ead741;p=vaadin-framework.git

Manual merge of [11296] from 6.2

svn changeset:12456/svn branch:6.3
---

diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 506a263fc8..4611a39db3 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -27,23 +27,29 @@ See configure target to adjust this buildfile.
 	-->
 	<target name="configure">
 		
-		<!-- Path from this file to the root of the Vaadin distribution package -->
-		<property name="base" value="../../../" />
+		<!-- Path from this file to the project root -->
+		<property name="base" 
+			      value="../../../" />
 		
-		<!-- where GWT distribution is located -->
-		<property name="gwt-location" value="${base}gwt" />
+		<!-- Location of GWT distribution -->
+		<property name="gwt-location" 
+			      value="${base}gwt" />
 		
-		<!-- where Vaadin jar is located -->
-		<property name="vaadin-jar-location" value="${base}WebContent/WEB-INF/lib/vaadin-@version@.jar" />
+		<!-- Location of Vaadin JAR -->
+		<property name="vaadin-jar-location" 
+			      value="${base}WebContent/WEB-INF/lib/vaadin-@version@.jar" />
 		
-		<!-- where project client-side widgetset source files are located -->
-		<property name="src-location" value="${base}WebContent/WEB-INF/src" />
+		<!-- Location of project source code -->
+		<property name="src-location" 
+			      value="${base}WebContent/WEB-INF/src" />
 
-		<!-- where to compile server-side classes -->
-		<property name="server-side-destination" value="${base}WebContent/WEB-INF/classes"/>
+		<!-- Target where to compile server-side classes -->
+		<property name="server-side-destination" 
+			      value="${base}WebContent/WEB-INF/classes"/>
 		
-		<!-- where to generate compiled javascript and theme files -->
-		<property name="client-side-destination" value="${base}WebContent/VAADIN/widgetsets" />
+		<!-- Target where to compile the widget set -->
+		<property name="client-side-destination" 
+			      value="${base}WebContent/VAADIN/widgetsets" />
 	</target>
 		
     <!-- NOTE: Modify this example to compile your own widgetset -->
@@ -57,8 +63,10 @@ See configure target to adjust this buildfile.
         <!-- from all widget sets included in the class path.    -->
         <!-- <property name="generate.widgetset" value="1"/>     --> 
         
-        <!-- Path to the widgetset directory. Required only for generated widget sets. -->
-        <!-- Must be relative to $src-location, that is, under the first entry in class path. -->
+        <!-- Path to the widgetset directory. Required only for --> 
+    	<!-- generated widget sets. Must be relative to         --> 
+    	<!-- $src-location, that is, under the first entry in   --> 
+    	<!--  class path.                                       --> 
         <property name="widgetset-path" value="com/vaadin/demo/widgetset"/>
     </target>