From 60968e491f61a524a50ed578c5df2d42eb7cd3a5 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Tue, 19 Apr 2016 16:01:33 +0300
Subject: Compile default widgetset with maven plugin, fix unit cache

Change-Id: I0b0666e22e93ed1b36796365b1811eca863c9cb1
---
 client-compiled/pom.xml | 65 +++++++++++++++----------------------------------
 pom.xml                 |  5 ++++
 themes/pom.xml          |  1 -
 uitest/pom.xml          |  1 +
 4 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
index 8972b7a9ad..f231af3ed2 100644
--- a/client-compiled/pom.xml
+++ b/client-compiled/pom.xml
@@ -57,52 +57,6 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
 				<executions>
-					<execution>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<classpathScope>compile</classpathScope>
-							<executable>${java.home}/bin/java</executable>
-							<arguments>
-								<!-- TODO: Do we need these? -->
-								<!-- <jvmarg value="-Xss8M" /> -->
-								<!-- <jvmarg value="-XX:MaxPermSize=256M" /> -->
-								<jvmarg value="-Djava.awt.headless=true" />
-								<argument>-Dgwt.persistentunitcachedir=${project.build.directory}/compile</argument>
-								<argument>-DvFailIfNotSerializable=true</argument>
-
-								<argument>-classpath</argument>
-								<classpath />
-
-								<argument>com.google.gwt.dev.Compiler</argument>
-
-								<argument>-workDir</argument>
-								<argument>${project.build.directory}/compile</argument>
-								<argument>-logLevel</argument>
-								<argument>TRACE</argument>
-								<argument>-war</argument>
-								<!-- This will write the result directly to target/classes for packaging -->
-								<argument>${project.build.outputDirectory}/VAADIN/widgetsets/</argument>
-								<argument>-style</argument>
-								<argument>${widgetset.style}</argument>
-								<argument>-localWorkers</argument>
-								<argument>${widgetset.local.workers}</argument>
-
-								<argument>-strict</argument>
-
-								<!-- Move unnecessary stuff to compile folder -->
-								<argument>-deploy</argument>
-								<argument>${project.build.directory}/compile</argument>
-								<argument>-extra</argument>
-								<argument>${project.build.directory}/compile</argument>
-
-								<argument>${widgetset.name}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-
 					<execution>
 						<id>generate-export-package</id>
 						<phase>package</phase>
@@ -129,6 +83,25 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>com.vaadin</groupId>
+				<artifactId>vaadin-maven-plugin</artifactId>
+				<configuration>
+					<modules>
+						<module>com.vaadin.DefaultWidgetSet</module>
+					</modules>
+					<webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
+					<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 
 			<plugin>
 				<groupId>org.apache.felix</groupId>
diff --git a/pom.xml b/pom.xml
index c6a1a8d8ad..b5b255dcb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,11 @@
 					<artifactId>maven-source-plugin</artifactId>
 					<version>3.0.0</version>
 				</plugin>
+				<plugin>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-maven-plugin</artifactId>
+					<version>${vaadin.plugin.version}</version>
+				</plugin>
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
diff --git a/themes/pom.xml b/themes/pom.xml
index 612145d8dc..be8b100f98 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -77,7 +77,6 @@
 			<plugin>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-maven-plugin</artifactId>
-				<version>${vaadin.plugin.version}</version>
 				<configuration>
 					<compressTheme>true</compressTheme>
 					<warSourceDirectory>${project.build.outputDirectory}</warSourceDirectory>
diff --git a/uitest/pom.xml b/uitest/pom.xml
index 3ec2454d8a..81fc033dac 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -272,6 +272,7 @@
 				<configuration>
 					<warSourceDirectory>${project.build.directory}/compile-themes</warSourceDirectory>
 					<webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
+					<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
 				</configuration>
 				<executions>
 					<execution>
-- 
cgit v1.2.3