Browse Source

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

svn changeset:10682/svn branch:6.3
tags/6.7.0.beta1
Marko Grönroos 14 years ago
parent
commit
8de79ee9de
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      build/build.xml

+ 3
- 1
build/build.xml View File

<echo>Java Servlet API is available.</echo> <echo>Java Servlet API is available.</echo>


<available classpathref="compile.classpath" classname="javax.servlet.ServletRequestListener" property="servlet.version.is-2.4"/> <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> <echo>Java Servlet API specification 2.3 used.</echo>
</target> </target>


<fileset dir="lib/core"> <fileset dir="lib/core">
<include name="**/*.jar"/> <include name="**/*.jar"/>
<exclude name="**/servlet-api*.jar"/> <exclude name="**/servlet-api*.jar"/>
<!-- This has to be excluded because it contains Servlet API > 2.3. -->
<exclude name="gwt/**/*"/>
</fileset> </fileset>
<fileset dir="lib/demo"> <fileset dir="lib/demo">
<include name="**/*.jar"/> <include name="**/*.jar"/>

Loading…
Cancel
Save