Correctly handle compiled resources for Development Server

Change-Id: I0f4976aaeeb1f284a99a09cb039e54ae16f8f556

.gitignore

@@ -11,54 +11,10 @@
 /.externalToolBuilders
 /extras
 
-# /WebContent/VAADIN/themes/base/
-/WebContent/VAADIN/themes/base/styles.css
-/WebContent/VAADIN/themes/base/legacy-styles.css
-
-# /WebContent/VAADIN/themes/chameleon/
-/WebContent/VAADIN/themes/chameleon/styles.css
-/WebContent/VAADIN/themes/chameleon/legacy-styles.css
-
-# /WebContent/VAADIN/themes/liferay/
-/WebContent/VAADIN/themes/liferay/styles.css
-/WebContent/VAADIN/themes/liferay/legacy-styles.css
-
-# /WebContent/VAADIN/themes/reindeer/
-/WebContent/VAADIN/themes/reindeer/styles.css
-/WebContent/VAADIN/themes/reindeer/legacy-styles.css
-
-# /WebContent/VAADIN/themes/reindeer/button/img/
-/WebContent/VAADIN/themes/reindeer/button/img/*-sprites*.png
-
-# /WebContent/VAADIN/themes/reindeer/common/img/
-/WebContent/VAADIN/themes/reindeer/common/img/*-sprites*.png
-
-# /WebContent/VAADIN/themes/runo/
-/WebContent/VAADIN/themes/runo/styles.css
-/WebContent/VAADIN/themes/runo/legacy-styles.css
-
-# /WebContent/VAADIN/themes/runo/common/img/
-/WebContent/VAADIN/themes/runo/common/img/ajax-loader-red.gif
-/WebContent/VAADIN/themes/runo/common/img/ajax-loader-yellow.gif
-
-# /WebContent/VAADIN/themes/valo/
-/WebContent/VAADIN/themes/valo/styles.css
-/WebContent/VAADIN/themes/tests-valo*/styles.css
+/uitest/src/main/themes/**/styles.css
 
 # Persisted scss cache files
-/WebContent/VAADIN/themes/*/styles.scss.cache
-
-# /WebContent/VAADIN/widgetsets/
-/WebContent/VAADIN/widgetsets
-/WebContent/VAADIN/gwt-unitCache*
-
-WebContent/VAADIN/vaadinPush.js
-WebContent/VAADIN/vaadinPush.debug.js
-WebContent/VAADIN/vaadinPush.js.gz
-WebContent/VAADIN/vaadinPush.debug.js.gz
-
-# /WebContent/WEB-INF/
-/WebContent/WEB-INF/classes
+/uitest/src/main/themes/**/styles.scss.cache
 
 # /build/
 /build/result
@@ -105,3 +61,4 @@ phantomjsdriver.log
 .idea
 
 */.checkstyle
+

uitest/pom.xml

@@ -112,7 +112,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -217,18 +217,30 @@
 	</dependencies>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>src/main/themes</directory>
+				<excludes>
+					<exclude>**/*.scss</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+
 		<plugins>
 			<plugin>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-maven-plugin</artifactId>
 				<configuration>
-					<warSourceDirectory>${project.build.directory}/compile-themes</warSourceDirectory>
-					<webappDirectory>${project.build.directory}/${project.build.finalName}/VAADIN/widgetsets</webappDirectory>
+					<warSourceDirectory>src/main/themes</warSourceDirectory>
+					<webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
 					<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
 				</configuration>
 				<executions>
 					<execution>
-						<phase>prepare-package</phase>
 						<goals>
 							<goal>compile</goal>
 							<goal>compile-theme</goal>
@@ -248,44 +260,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-theme-sources</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/compile-themes</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/themes</directory>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-compiled-themes</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${project.build.directory}/compile-themes</directory>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<artifactId>maven-install-plugin</artifactId>
 				<configuration>