summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore66
-rw-r--r--build/GWT-VERSION.properties2
-rw-r--r--build/VERSION.properties1
-rw-r--r--build/build.properties6
-rw-r--r--build/build.xml20
-rw-r--r--src/com/vaadin/Application.java6
-rw-r--r--tests/integration_tests.xml18
-rw-r--r--tests/test.xml8
-rw-r--r--tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html2
9 files changed, 83 insertions, 46 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..5fc4fd8e97
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,66 @@
+
+# /
+/.classpath
+/.cvsignore
+/.project
+/.tomcatplugin
+/.settings
+/work
+/.gwt-cache
+
+# /WebContent/VAADIN/themes/base/
+/WebContent/VAADIN/themes/base/styles.css
+
+# /WebContent/VAADIN/themes/chameleon/
+/WebContent/VAADIN/themes/chameleon/styles.css
+
+# /WebContent/VAADIN/themes/liferay/
+/WebContent/VAADIN/themes/liferay/styles.css
+
+# /WebContent/VAADIN/themes/reindeer/
+/WebContent/VAADIN/themes/reindeer/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/common/img/
+/WebContent/VAADIN/themes/runo/common/img/ajax-loader-red.gif
+/WebContent/VAADIN/themes/runo/common/img/ajax-loader-yellow.gif
+
+# /WebContent/VAADIN/widgetsets/
+/WebContent/VAADIN/widgetsets/com.itmill.toolkit.demo.reservation.gwt.WidgetSet
+/WebContent/VAADIN/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet
+/WebContent/VAADIN/widgetsets/com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet
+/WebContent/VAADIN/widgetsets/com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet
+/WebContent/VAADIN/widgetsets/com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet
+/WebContent/VAADIN/widgetsets/.gwt-tmp
+/WebContent/VAADIN/widgetsets/com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.demo.reservation.gwt.ReservationWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.demo.sampler.gwt.SamplerWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.portal.gwt.PortalDefaultWidgetSet
+/WebContent/VAADIN/widgetsets/com.vaadin.demo.gwt.OptimizedWidgetSet
+/WebContent/VAADIN/gwt-unitCache*
+
+# /WebContent/WEB-INF/
+/WebContent/WEB-INF/classes
+
+# /build/
+/build/result
+/build/gwt
+/build/checkout
+/build/classes
+/build/test-output
+/build/integration-test-output
+
+# /build/buildhelpers/com/vaadin/buildhelpers/
+/build/buildhelpers/com/vaadin/buildhelpers/*.class
+/bin
diff --git a/build/GWT-VERSION.properties b/build/GWT-VERSION.properties
new file mode 100644
index 0000000000..028ad8b4de
--- /dev/null
+++ b/build/GWT-VERSION.properties
@@ -0,0 +1,2 @@
+gwt-version=2.4.0
+gwt-version-dependencies=validation-api-1.0.0.GA.jar, validation-api-1.0.0.GA-sources.jar
diff --git a/build/VERSION.properties b/build/VERSION.properties
new file mode 100644
index 0000000000..ce706c5d02
--- /dev/null
+++ b/build/VERSION.properties
@@ -0,0 +1 @@
+version=7.0.0 \ No newline at end of file
diff --git a/build/build.properties b/build/build.properties
index 82378c6dac..df8e6e77a8 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -10,10 +10,8 @@ snapshot.repository.url=http://oss.sonatype.org/content/repositories/vaadin-snap
# These are required when compiling WebContent/VAADIN/widgetsets (and also
# Java server-side classes).
-# Using special -noservlet packages to be able to use a different version of
-# the servlet specification than what the GWT JARs include.
-lib-gwt-dev=${gwt-dir}/gwt-dev-noservlet.jar
-lib-gwt-user=${gwt-dir}/gwt-user-noservlet.jar
+lib-gwt-dev=${gwt-dir}/gwt-dev.jar
+lib-gwt-user=${gwt-dir}/gwt-user.jar
# FIXME: Should use ${gwt-version-dependencies}
lib-gwt-validation=${gwt-dir}/validation-api-1.0.0.GA.jar
lib-gwt-validation-src=${gwt-dir}/validation-api-1.0.0.GA-sources.jar
diff --git a/build/build.xml b/build/build.xml
index a94fa143ac..b62db3d57e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -70,23 +70,11 @@
<echo>Java version is ${ant.java.version} as required.</echo>
</target>
- <!-- Check Servlet API version. -->
- <!-- We must use Servlet API 2.3 to catch incompatibilities.. -->
- <target name="check-servlet-version">
- <available classpathref="compile.classpath" classname="javax.servlet.Servlet" property="servlet.available"/>
- <fail unless="servlet.available" message="Java Servlet API library is not available."/>
- <echo>Java Servlet API is available.</echo>
-
- <available classpathref="compile.classpath" classname="javax.servlet.ServletRequestListener" property="servlet.version.is-2.4"/>
- <fail if="servlet.version.is-2.4" message="Java Servlet API 2.4 or later detected. Vaadin must be compiled exactly with Servlet API 2.3."/>
- <echo>Java Servlet API specification 2.3 used.</echo>
- </target>
-
<!-- ================================================================== -->
<!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- ================================================================== -->
- <target name="init" depends="check-java-version">
+ <target name="init">
<!-- Current timestamp in different formats. -->
<tstamp>
<format property="build.date" pattern="yyyy-MM-dd"/>
@@ -163,8 +151,6 @@
<!-- Exclude these as they contain Servlet API 2.4. -->
<!-- The gwt-*-noservlet.jar are then used instead. -->
<exclude name="**/servlet-api*.jar"/>
- <exclude name="**/gwt-dev.jar"/>
- <exclude name="**/gwt-user.jar"/>
</fileset>
<fileset dir="lib/tests">
<include name="**/*.jar"/>
@@ -429,7 +415,7 @@
</copy>
</target>
- <target name="compile-java" depends="init, check-servlet-version, webcontent">
+ <target name="compile-java" depends="init, webcontent">
<echo>Compiling src (server-side)</echo>
<!-- Compile all sources at the same time as they depend on each other -->
@@ -800,7 +786,7 @@
<tstamp>
<format property="nightly.date" pattern="yyyyMMdd"/>
</tstamp>
- <property name="version.full" value="${version}.${build.tag}-${nightly.date}-c${build.number}"/>
+ <property name="version.full" value="${version}.${build.tag}-${nightly.date}-${build.number}"/>
<echo>Version will be: ${version.full}</echo>
diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 39a70fe27f..f751431e63 100644
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@ -1384,7 +1384,7 @@ public abstract class Application implements URIHandler,
}
/**
- * @return
+ * @return
* "Take note of any unsaved data, and <u>click here</u> to continue."
*/
public String getSessionExpiredMessage() {
@@ -1416,7 +1416,7 @@ public abstract class Application implements URIHandler,
}
/**
- * @return
+ * @return
* "Take note of any unsaved data, and <u>click here</u> to continue."
*/
public String getCommunicationErrorMessage() {
@@ -1448,7 +1448,7 @@ public abstract class Application implements URIHandler,
}
/**
- * @return
+ * @return
* "Take note of any unsaved data, and <u>click here</u> to continue."
*/
public String getAuthenticationErrorMessage() {
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 834c5fe608..71bd31efa6 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -101,13 +101,6 @@
</antcall>
</target>
- <target name="integration-test-tomcat4">
- <antcall target="run-generic-integration-test">
- <param name="startDelay" value="300" />
- <param name="target-server" value="tomcat4" />
- </antcall>
- </target>
-
<target name="integration-test-tomcat5">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="300" />
@@ -143,13 +136,6 @@
</antcall>
</target>
- <target name="integration-test-jboss3">
- <antcall target="run-generic-integration-test">
- <param name="startDelay" value="300" />
- <param name="target-server" value="jboss3" />
- </antcall>
- </target>
-
<target name="integration-test-jboss4">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="300" />
@@ -309,7 +295,6 @@
<antcall target="integration-test-gatein3" />
<antcall target="integration-test-glassfish2" />
<antcall target="integration-test-glassfish3" />
- <antcall target="integration-test-jboss3" />
<antcall target="integration-test-jboss4" />
<antcall target="integration-test-jboss5" />
<antcall target="integration-test-jboss6" />
@@ -317,7 +302,6 @@
<antcall target="integration-test-jetty5" />
<antcall target="integration-test-jetty6" />
<antcall target="integration-test-jetty7" />
- <antcall target="integration-test-tomcat4" />
<antcall target="integration-test-tomcat5" />
<antcall target="integration-test-tomcat6" />
<antcall target="integration-test-tomcat7" />
@@ -472,4 +456,4 @@
<target name="integration-test-clean">
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />
</target>
-</project> \ No newline at end of file
+</project>
diff --git a/tests/test.xml b/tests/test.xml
index abb3db170b..87e0040c2a 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -5,9 +5,9 @@
<!-- Configuration -->
<!-- ================================================================== -->
<!-- Browsers to use for testing -->
- <property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox4,winxp-firefox5,winxp-firefox6,winxp-firefox7,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
- <property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
- <property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
+ <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox7,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
+ <!--<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />-->
+ <!--<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />-->
<property name="browsers" value="${browsers-windows}" />
@@ -205,4 +205,4 @@
<target name="test-package" depends="server-start, run-and-clean-up, server-stop">
</target>
-</project> \ No newline at end of file
+</project>
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
index 5561fd37cb..ed92afe378 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
@@ -19,7 +19,7 @@
<tr>
<td>assertValue</td>
<td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormat::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[0]</td>
- <td>1. tammikuuta 2010 0:00:00 UTC+2</td>
+ <td>1. tammikuuta 2010 klo 0.00.00</td>
</tr>
</tbody></table>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 04:54:38 +0000