diff options
| author | Marko Grönroos <magi@iki.fi> | 2010-07-01 08:39:56 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2010-07-01 08:39:56 +0000 |
| commit | 2635930d1858e335a17a188d71ea960cbd1c20a1 (patch) | |
| tree | 00482d65aa66412906d12b4e269854daf408e9e8 /build | |
| parent | 56188c47518aaec1cc433738d8b99375e0474302 (diff) | |
| download | vaadin-framework-2635930d1858e335a17a188d71ea960cbd1c20a1.tar.gz vaadin-framework-2635930d1858e335a17a188d71ea960cbd1c20a1.zip | |
Removed the Servlet API 2.4 from GWT libraries instead of unpacking the libraries and removing javax/servlet during build.
svn changeset:13991/svn branch:6.4
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/build/build.xml b/build/build.xml index eb1a8253a4..feec472cb9 100644 --- a/build/build.xml +++ b/build/build.xml @@ -183,9 +183,7 @@ <pathelement path="build/external/fileupload/classes" /> <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/**/*"/> + <exclude name="**/servlet-api*.jar"/> </fileset> <fileset dir="lib/demo"> <include name="**/*.jar"/> @@ -196,7 +194,6 @@ </path> <path id="compile.classpath.server-side"> <path refid="compile.classpath"/> - <pathelement path="${result-path}/gwt" /> </path> <path id="compile.classpath.client-side"> <path refid="compile.classpath"/> @@ -576,15 +573,7 @@ <ant dir="build/external/fileupload" antfile="build.xml" target="compile" /> </target> - <target name="unpack-gwt" depends="init"> - <!-- Unpack GWT from JARs. This is needed for excluding Servlet API 2.4. --> - <delete dir="${result-path}/gwt"/> - <unjar src="${lib-gwt-user}" dest="${result-path}/gwt/"/> - <unjar src="${lib-gwt-dev}" dest="${result-path}/gwt/"/> - <delete dir="${result-path}/gwt/javax/servlet"/> - </target> - - <target name="compile-java" depends="init, unpack-gwt, check-servlet-version, compile-fileupload, webcontent"> + <target name="compile-java" depends="init, check-servlet-version, compile-fileupload, webcontent"> <echo>Compiling src (server-side)</echo> <!-- Compile all sources at the same time as they depend on each other --> |