From: Marko Grönroos <magi@iki.fi>
Date: Mon, 11 Jan 2010 23:11:50 +0000 (+0000)
Subject: Re-enabled Servlet API version check. Fixes #3887.
X-Git-Tag: 6.7.0.beta1~2079
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8de79ee9de8574b47c737abb88263fcae9267bba;p=vaadin-framework.git

Re-enabled Servlet API version check. Fixes #3887.

svn changeset:10682/svn branch:6.3
---

diff --git a/build/build.xml b/build/build.xml
index 50227db670..913e9c0a97 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -120,7 +120,7 @@
       <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."/>-->
+      <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>
 
@@ -195,6 +195,8 @@
         	<fileset dir="lib/core">
         	        <include name="**/*.jar"/>
         			<exclude name="**/servlet-api*.jar"/>
+        		    <!-- This has to be excluded because it contains Servlet API > 2.3. -->
+        			<exclude name="gwt/**/*"/>
    	        </fileset>
         	<fileset dir="lib/demo">
         	        <include name="**/*.jar"/>