Merge commit '7c200d4e869139ff72e848e973cd5ce5932908d8'

Conflicts:
	tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
	tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
	tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
	tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
	tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
	tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html

2 files changed, 142 insertions, 142 deletions

diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml
index b3fe5119e9..03af6338da 100644
--- a/build/maven/pom-template.xml
+++ b/build/maven/pom-template.xml
@@ -1,63 +1,63 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <groupId>com.vaadin</groupId>

-  <artifactId>vaadin</artifactId>

-  <version>@MAVEN-VERSION@</version>

-  <name>Vaadin</name>

-  <organization>

-    <name>Vaadin Ltd</name>

-    <url>http://vaadin.com</url>

-  </organization>

-  <url>http://vaadin.com</url>

-  <description>

-      Vaadin is a web application framework for Rich Internet Applications (RIA).

-

-      Vaadin enables easy development and maintenance of fast and secure rich web

-      applications with a stunning look and feel and a wide browser support.

-      It features a server-side architecture with the majority of the logic running

-      on the server. Ajax technology is used at the browser-side to ensure a rich

-      and interactive user experience.

-  </description>

-  <licenses>

-    <license>

-      <name>Apache License Version 2.0</name>

-      <distribution>repo</distribution>

-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>

-    </license>

-  </licenses>

-  <distributionManagement>

-    <repository>

-      <id>vaadin-releases</id>

-      <name>Vaadin release repository</name>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>

-    </repository>

-    <snapshotRepository>

-      <id>vaadin-snapshots</id>

-      <name>Vaadin snapshot repository</name>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>

-    </snapshotRepository>

-  </distributionManagement>

-  <repositories>

-    <repository>

-      <id>vaadin-snapshots</id>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>

-      <releases>

-        <enabled>false</enabled>

-      </releases>

-      <snapshots>

-        <enabled>true</enabled>

-      </snapshots>

-    </repository>

-    <repository>

-      <id>vaadin-releases</id>

-      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>

-      <releases>

-        <enabled>true</enabled>

-      </releases>

-      <snapshots>

-        <enabled>false</enabled>

-      </snapshots>

-    </repository>

-  </repositories>

-  

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.vaadin</groupId>
+  <artifactId>vaadin</artifactId>
+  <version>@MAVEN-VERSION@</version>
+  <name>Vaadin</name>
+  <organization>
+    <name>Vaadin Ltd</name>
+    <url>http://vaadin.com</url>
+  </organization>
+  <url>http://vaadin.com</url>
+  <description>
+      Vaadin is a web application framework for Rich Internet Applications (RIA).
+
+      Vaadin enables easy development and maintenance of fast and secure rich web
+      applications with a stunning look and feel and a wide browser support.
+      It features a server-side architecture with the majority of the logic running
+      on the server. Ajax technology is used at the browser-side to ensure a rich
+      and interactive user experience.
+  </description>
+  <licenses>
+    <license>
+      <name>Apache License Version 2.0</name>
+      <distribution>repo</distribution>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
+  <distributionManagement>
+    <repository>
+      <id>vaadin-releases</id>
+      <name>Vaadin release repository</name>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>vaadin-snapshots</id>
+      <name>Vaadin snapshot repository</name>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+  <repositories>
+    <repository>
+      <id>vaadin-snapshots</id>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>vaadin-releases</id>
+      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+  
 </project>
\ No newline at end of file
diff --git a/build/package/build.xml b/build/package/build.xml
index b7ece66174..f270b3b7c3 100644
--- a/build/package/build.xml
+++ b/build/package/build.xml
@@ -1,80 +1,80 @@
-<!--

-

-Creates two packages:

-

-1. WAR package that can be deployed to application server or servlet container.

-

-2. JAR package which requires JRE only, includes embedded web server.

-

--->

-<project name="vaadin-examples" basedir="." default="package">

-

-	<target name="init">

-		<echo message="Creating two packages:" />

-		<echo message="1. WAR package that can be deployed to application server or servlet container." />

-		<echo message="2. JAR package which requires JRE only, includes embedded web server." />

-		<property name="server.main.class" value="com.vaadin.demo.DesktopServer" />

-		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />

-		<property file="build.properties" />

-		<mkdir dir="build" />

-	</target>

-

-	<target name="clean">

-		<delete dir="build" />

-	</target>

-

-	<!-- Compiles your Vaadin application -->

-	<target name="compile" depends="init">

-		<echo message="Compiling Vaadin application sources." />

-		<path id="compile.class.path">

-			<fileset dir="WebContent">

-				<include name="WEB-INF/lib/*.jar" />

-			</fileset>

-			<fileset dir="WebServer">

-				<include name="*.jar" />

-			</fileset>

-		</path>

-

-		<javac srcdir="WebContent/src" destdir="WebContent/WEB-INF/classes" classpathref="compile.class.path">

-		</javac>

-		<javac srcdir="WebServer/src" destdir="WebServer/classes" classpathref="compile.class.path">

-		</javac>

-	</target>

-

-	<!-- Creates Vaadin WAR package (requires Application Server / Servlet Container)-->

-	<target name="war-package" depends="compile">

-		<echo message="Creating WAR package." />

-		<war warfile="build/${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">

-			<fileset dir="WebContent">

-				<include name="**/*" />

-				<exclude name="WEB-INF/web.xml" />

-			</fileset>

-		</war>

-	</target>

-

-	<!-- Creates Vaadin JAR package that contains embedded WebServer -->

-	<target name="jar-package" depends="war-package">

-		<echo message="Creating JAR package." />

-		<copy tofile="build/WebServer-temp/embedded.war" file="build/${ant.project.name}.war" />

-		<unjar src="${webserver.jar}" dest="build/WebServer-temp" />

-		<manifest file="build/WebServer-temp/META-INF/MANIFEST.MF">

-			<attribute name="Main-Class" value="${server.main.class}" />

-		</manifest>

-		<copy todir="build/WebServer-temp">

-			<fileset dir="WebServer/classes">

-				<include name="**/*" />

-			</fileset>

-		</copy>

-	</target>

-

-	<!-- Creates both Vaadin WAR and JAR packages -->

-	<target name="package" depends="jar-package">

-		<jar destfile="build/${ant.project.name}.jar" basedir="build/WebServer-temp" manifest="build/WebServer-temp/META-INF/MANIFEST.MF" />

-		<echo message="Created WAR-file to build/${ant.project.name}.war." />

-		<echo message="Deploy this file to your application server or servlet container." />

-		<echo message=" " />

-		<echo message="Created JAR-file to build/${ant.project.name}.jar" />

-		<echo message="Run your application using command like: java -jar build/${ant.project.name}.jar" />

-	</target>

-

-</project>

+<!--
+
+Creates two packages:
+
+1. WAR package that can be deployed to application server or servlet container.
+
+2. JAR package which requires JRE only, includes embedded web server.
+
+-->
+<project name="vaadin-examples" basedir="." default="package">
+
+	<target name="init">
+		<echo message="Creating two packages:" />
+		<echo message="1. WAR package that can be deployed to application server or servlet container." />
+		<echo message="2. JAR package which requires JRE only, includes embedded web server." />
+		<property name="server.main.class" value="com.vaadin.demo.DesktopServer" />
+		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />
+		<property file="build.properties" />
+		<mkdir dir="build" />
+	</target>
+
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+
+	<!-- Compiles your Vaadin application -->
+	<target name="compile" depends="init">
+		<echo message="Compiling Vaadin application sources." />
+		<path id="compile.class.path">
+			<fileset dir="WebContent">
+				<include name="WEB-INF/lib/*.jar" />
+			</fileset>
+			<fileset dir="WebServer">
+				<include name="*.jar" />
+			</fileset>
+		</path>
+
+		<javac srcdir="WebContent/src" destdir="WebContent/WEB-INF/classes" classpathref="compile.class.path">
+		</javac>
+		<javac srcdir="WebServer/src" destdir="WebServer/classes" classpathref="compile.class.path">
+		</javac>
+	</target>
+
+	<!-- Creates Vaadin WAR package (requires Application Server / Servlet Container)-->
+	<target name="war-package" depends="compile">
+		<echo message="Creating WAR package." />
+		<war warfile="build/${ant.project.name}.war" webxml="WebContent/WEB-INF/web.xml">
+			<fileset dir="WebContent">
+				<include name="**/*" />
+				<exclude name="WEB-INF/web.xml" />
+			</fileset>
+		</war>
+	</target>
+
+	<!-- Creates Vaadin JAR package that contains embedded WebServer -->
+	<target name="jar-package" depends="war-package">
+		<echo message="Creating JAR package." />
+		<copy tofile="build/WebServer-temp/embedded.war" file="build/${ant.project.name}.war" />
+		<unjar src="${webserver.jar}" dest="build/WebServer-temp" />
+		<manifest file="build/WebServer-temp/META-INF/MANIFEST.MF">
+			<attribute name="Main-Class" value="${server.main.class}" />
+		</manifest>
+		<copy todir="build/WebServer-temp">
+			<fileset dir="WebServer/classes">
+				<include name="**/*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- Creates both Vaadin WAR and JAR packages -->
+	<target name="package" depends="jar-package">
+		<jar destfile="build/${ant.project.name}.jar" basedir="build/WebServer-temp" manifest="build/WebServer-temp/META-INF/MANIFEST.MF" />
+		<echo message="Created WAR-file to build/${ant.project.name}.war." />
+		<echo message="Deploy this file to your application server or servlet container." />
+		<echo message=" " />
+		<echo message="Created JAR-file to build/${ant.project.name}.jar" />
+		<echo message="Run your application using command like: java -jar build/${ant.project.name}.jar" />
+	</target>
+
+</project>