Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

7 files changed, 78 insertions, 117 deletions

diff --git a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
index 19a470d816..6393d61981 100644
--- a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
@@ -1,5 +1,17 @@
 /*
-@VaadinApache2LicenseForJavaFiles@
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.vaadin.tests.data.converter;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java b/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java
deleted file mode 100644
index ae8bc9beae..0000000000
--- a/tests/server-side/com/vaadin/tests/server/component/datefield/WeekNumberCalculation.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.vaadin.tests.server.component.datefield;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import com.vaadin.terminal.gwt.client.DateTimeService;
-
-public class WeekNumberCalculation extends TestCase {
-
-    final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
-
-    static Map<Date, Integer> isoWeekNumbers = new HashMap<Date, Integer>();
-    static {
-        isoWeekNumbers.put(getDate(2005, 02, 02), 5);
-
-        isoWeekNumbers.put(getDate(2005, 1, 1), 53);
-        isoWeekNumbers.put(getDate(2005, 1, 2), 53);
-        isoWeekNumbers.put(getDate(2005, 1, 3), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 4), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 5), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 6), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 7), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 8), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 9), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 10), 2);
-        isoWeekNumbers.put(getDate(2005, 12, 31), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 30), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 29), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 28), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 27), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 26), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 25), 51);
-        isoWeekNumbers.put(getDate(2007, 1, 1), 1);
-        isoWeekNumbers.put(getDate(2007, 12, 30), 52);
-        isoWeekNumbers.put(getDate(2007, 12, 31), 1);
-        isoWeekNumbers.put(getDate(2008, 1, 1), 1);
-        isoWeekNumbers.put(getDate(2008, 12, 28), 52);
-        isoWeekNumbers.put(getDate(2008, 12, 29), 1);
-        isoWeekNumbers.put(getDate(2008, 12, 30), 1);
-        isoWeekNumbers.put(getDate(2008, 12, 31), 1);
-        isoWeekNumbers.put(getDate(2009, 1, 1), 1);
-        isoWeekNumbers.put(getDate(2009, 12, 31), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 1), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 2), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 3), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 4), 1);
-        isoWeekNumbers.put(getDate(2010, 1, 5), 1);
-        isoWeekNumbers.put(getDate(2010, 10, 10), 40);
-
-    }
-
-    /**
-     * Test all dates from 1990-1992 + some more and see that {@link Calendar}
-     * calculates the ISO week number like we do.
-     * 
-     */
-    public void testISOWeekNumbers() {
-        Calendar c = Calendar.getInstance();
-        c.set(1990, 1, 1);
-        long start = c.getTimeInMillis();
-
-        for (int i = 0; i < 1000; i++) {
-            Date d = new Date(start + i * MILLISECONDS_PER_DAY);
-            int expected = getCalendarISOWeekNr(d);
-            int calculated = DateTimeService.getISOWeekNumber(d);
-            assertEquals(d + " should be week " + expected, expected,
-                    calculated);
-
-        }
-    }
-
-    /**
-     * Verify that special cases are handled correctly by us (and
-     * {@link Calendar}).
-     * 
-     */
-    public void testSampleISOWeekNumbers() {
-        for (Date d : isoWeekNumbers.keySet()) {
-            // System.out.println("Sample: " + d);
-            int expected = isoWeekNumbers.get(d);
-            int calculated = DateTimeService.getISOWeekNumber(d);
-            assertEquals(d + " should be week " + expected
-                    + " (Java Calendar is wrong?)", expected,
-                    getCalendarISOWeekNr(d));
-            assertEquals(d + " should be week " + expected, expected,
-                    calculated);
-
-        }
-    }
-
-    private int getCalendarISOWeekNr(Date d) {
-        Calendar c = Calendar.getInstance();
-        c.setFirstDayOfWeek(Calendar.MONDAY);
-        c.setMinimalDaysInFirstWeek(4);
-        c.setTime(d);
-
-        return c.get(Calendar.WEEK_OF_YEAR);
-    }
-
-    private static Date getDate(int year, int month, int date) {
-        Calendar c = Calendar.getInstance();
-        c.clear();
-        c.set(year, month - 1, date);
-        return c.getTime();
-    }
-
-}
diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java b/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
index 5ba15cac6c..48279c7c88 100644
--- a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
+++ b/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
@@ -1,5 +1,17 @@
 /*
-@VaadinApache2LicenseForJavaFiles@
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.vaadin.tests.server.component.label;
 
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
index 58bc2c4d4c..5db0df4280 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
@@ -1,5 +1,17 @@
 /*
-@VaadinApache2LicenseForJavaFiles@
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package com.vaadin.tests.server.navigator;
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
index 0507db6700..894b841d38 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -1,5 +1,17 @@
 /*
-@VaadinApache2LicenseForJavaFiles@
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package com.vaadin.tests.server.navigator;
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index 37c9a7ecd5..e342ee9005 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
@@ -1,5 +1,17 @@
 /*
-@VaadinApache2LicenseForJavaFiles@
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 package com.vaadin.tests.server.navigator;
diff --git a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java b/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java
index 578d983c4d..d62f0df332 100644
--- a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java
@@ -1,5 +1,17 @@
 /*
-@VaadinApache2LicenseForJavaFiles@
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.vaadin.tests.util;