Merge remote branch 'origin/6.8'

Conflicts:
	src/com/vaadin/Application.java
	src/com/vaadin/data/Property.java
	src/com/vaadin/data/util/PropertyFormatter.java
	src/com/vaadin/terminal/ParameterHandler.java
	src/com/vaadin/terminal/URIHandler.java
	src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
	src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
	src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
	src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
	src/com/vaadin/ui/Field.java
	src/com/vaadin/ui/LoginForm.java
	src/com/vaadin/ui/UriFragmentUtility.java

3 files changed, 15 insertions, 10 deletions

diff --git a/build/ITMillApache2LicenseForJavaFiles.txt b/build/VaadinApache2LicenseForJavaFiles.txt
index ba72a29d84..ba72a29d84 100644
--- a/build/ITMillApache2LicenseForJavaFiles.txt
+++ b/build/VaadinApache2LicenseForJavaFiles.txt
diff --git a/build/build.xml b/build/build.xml
index bd0443fa55..d872ca767a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -143,10 +143,6 @@
                 <include name="${toolkit-package}/tests/**/*" />
                 <include name="${toolkit-package}/launcher/**" />
             </fileset>
-            <fileset dir="${result-path}/src/core">
-                <include name="${toolkit-package}/launcher/**" />
-                <exclude name="${toolkit-package}/launcher/**/*.java" />
-            </fileset>
             <!-- test resources -->
             <fileset dir="tests/testbench">
                 <include name="${toolkit-package}/tests/**/*" />
@@ -156,6 +152,12 @@
                 <exclude name="**/*.css" />
                 <exclude name="**/*.xml" />
             </fileset>
+
+        	<!-- Include files required by the DemoLauncher/DevelopmentServerLauncher -->
+            <fileset dir="tests/testbench">
+        		<include name="${toolkit-package}/launcher/jetty-webdefault.xml" />
+        		<include name="${toolkit-package}/launcher/keystore" />
+            </fileset>
         </copy>
 
         <war warfile="${result-path}/${test-war-filename}"> 
@@ -236,7 +238,7 @@
         Other files are just copied.
         -->
         
-        <loadfile property="ITMillApache2LicenseForJavaFiles" srcFile="build/ITMillApache2LicenseForJavaFiles.txt" />
+        <loadfile property="VaadinApache2LicenseForJavaFiles" srcFile="build/VaadinApache2LicenseForJavaFiles.txt" />
         <mkdir dir="${result-path}/src" />
         
         <mkdir dir="${result-path}/src/core" />
@@ -257,7 +259,7 @@
             <exclude name="**/*.xml" />
         </patternset>
         <filterset id="version-and-license">
-            <filter token="ITMillApache2LicenseForJavaFiles" value="${ITMillApache2LicenseForJavaFiles}" />
+            <filter token="VaadinApache2LicenseForJavaFiles" value="${VaadinApache2LicenseForJavaFiles}" />
             <filter token="VERSION" value="${version.full}" />
         </filterset>
         
@@ -439,6 +441,9 @@
     
     <target name="compile-widgetset" depends="init-deps" description="Compiles the widgetset given as the first parameter">
         <fail unless="widgetset" message="No widgetset parameter set"/>
+        <property name="widgetset-style" value="OBF" />
+    	<property name="widgetset-localWorkers" value="4" />
+    	<property name="widgetset-extraParams" value="" />
         <echo>Compiling widgetset ${widgetset}. Output directory: ${widgetsets-output-dir}</echo>
     	<mkdir dir="${widgetsets-output-dir}"/>
         <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m">
@@ -450,9 +455,10 @@
             <arg value="-war" />
             <arg value="${widgetsets-output-dir}" />
             <arg value="-style" />
-            <arg value="OBF" />
+            <arg value="${widgetset-style}" />
             <arg value="-localWorkers" />
-            <arg value="4" />
+            <arg value="${widgetset-localWorkers}" />
+        	<arg line="${widgetset-extraParams}" />
             <arg value="${widgetset}" />
 
             <jvmarg value="-Xss8M"/>
@@ -607,7 +613,6 @@
         <jar file="${result-path}/${lib-sources-jar-name}" compress="true">
             <fileset dir="${result-path}/src/core">
                 <patternset>
-                    <exclude name="${toolkit-package}/launcher/**" />
                     <include name="**/*.java" />
                 </patternset>
             </fileset>
diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml
index 851642dd3c..b3fe5119e9 100644
--- a/build/maven/pom-template.xml
+++ b/build/maven/pom-template.xml
@@ -5,7 +5,7 @@
   <version>@MAVEN-VERSION@</version>

   <name>Vaadin</name>

   <organization>

-    <name>Oy IT Mill Ltd</name>

+    <name>Vaadin Ltd</name>

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

   </organization>

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