From e50ca7fe96d11a5c3f2328c4fdb76905e68c5062 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 4 Sep 2012 16:28:49 +0300
Subject: Include compiled TestingWidgetSet in war (#9299)

---
 uitest/build.xml | 52 +++++++++++++++++++++++++++++++++++++++++-----------
 uitest/ivy.xml   |  6 +++++-
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/uitest/build.xml b/uitest/build.xml
index 7d0f2ca9d1..a97886dc8b 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -49,7 +49,47 @@
 		</javac>
 	</target>
 
-	<target name="war" depends="compile, dependencies">
+	<target name="testing-widgetset" depends="dependencies,compile">
+		<property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet"/>
+		<property name="style" value="OBF" />
+		<property name="localWorkers" value="2" />
+		<property name="extraParams" value="" />
+		<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
+		<property name="work.dir" location="${result.dir}/work" />
+
+		<mkdir dir="${module.output.dir}" />
+
+		<echo>Compiling ${module} to ${module.output.dir}</echo>
+
+		<!-- compile the module -->
+		<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies" failonerror="yes" fork="yes" maxmemory="512m">
+			<classpath location="src" />
+			<classpath location="${classes}" />
+			<arg value="-workDir" />
+			<arg value="${work.dir}" />
+			<arg value="-logLevel" />
+			<arg value="TRACE" />
+			<arg value="-war" />
+			<arg value="${module.output.dir}" />
+			<arg value="-style" />
+			<arg value="${style}" />
+
+			<arg value="-localWorkers" />
+			<arg value="${localWorkers}" />
+			<arg value="-strict" />
+			<arg line="${extraParams}" />
+			<arg value="${module}" />
+
+			<sysproperty key="vFailIfNotSerializable" value="true" />
+
+			<jvmarg value="-Xss8M" />
+			<jvmarg value="-XX:MaxPermSize=256M" />
+			<jvmarg value="-Djava.awt.headless=true" />
+		</java>
+
+	</target>
+
+	<target name="war" depends="dependencies, compile, testing-widgetset">
 		<property name="result.dir" location="result" />
 		<property name="classes" location="${result.dir}/classes" />
 		<property name="WebContent.dir" location="${vaadin.basedir}/WebContent" />
@@ -66,9 +106,6 @@
 		</copy>
 
 		<war destfile="${result.war}" duplicate="fail" index="true">
-			<manifest>
-				<attribute name="Class-Path" value="WEB-INF/classes" />
-			</manifest>
 			<fileset refid="common.files.for.all.jars" />
 			<fileset dir="${WebContent.dir}">
 				<include name="statictestfiles/**" />
@@ -77,13 +114,6 @@
 			</fileset>
 			<classes dir="${classes}" />
 			<lib dir="${deps.dir}" />
-			<!-- Include files required by the DemoLauncher/DevelopmentServerLauncher -->
-			<!--<fileset dir="src">
-				<include name="**/launcher/jetty-webdefault.xml" />
-				<include name="**/launcher/keystore" />
-			</fileset>
-			-->
-
 		</war>
 
 	</target>
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 5dbb5dd6fc..6cb7fc9050 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -21,7 +21,7 @@
             rev="2.0" conf="build-provided,ide -> default" />
 
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build,ide -> default" />
+            rev="1.0.0.GA" conf="build,ide -> default,sources" />
         <!--Servlet API version 2.5 -->
         <dependency org="javax.servlet" name="servlet-api"
             rev="2.5" conf="build-provided,ide -> default" />
@@ -39,6 +39,10 @@
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-themes-compiled"
             rev="${vaadin.version}" conf="build->build"></dependency>
+            
+        <!-- For compiling TestingWidgetSet -->
+        <dependency org="com.vaadin" name="vaadin-client-compiler"
+            rev="${vaadin.version}" conf="build-provided-> build"></dependency>
 
         <!-- Newest Jetty does not work with Ivy currently (orbit -> jar 
             mapping problem) -->
-- 
cgit v1.2.3