diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-10-08 11:21:50 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-10-08 11:21:50 +0000 |
| commit | 011608a0a39784c3834aa1a4c42f6b7280f3240a (patch) | |
| tree | ec592e82dfac39f98c67a28211cfb9adf3d0cbed /build | |
| parent | 4f1b424e2edd2f0c0c2b0f0aeb27d36e0c6155f3 (diff) | |
| download | vaadin-framework-011608a0a39784c3834aa1a4c42f6b7280f3240a.tar.gz vaadin-framework-011608a0a39784c3834aa1a4c42f6b7280f3240a.zip | |
refactored handling of Receiver's lots of other upload related improvements. fixes #5743 (removed dependency to commons fileupload), #5742 (drag and drop file uploads in webkits), #5741 (Receiver is upload specific), #4271 (uploads in GateIn). Also improves API for receiving files with drag and drop (rejection, canceling, tracking of the actual streaming) and transfers files in serial in DDW.
svn changeset:15461/svn branch:6.5
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/build/build.xml b/build/build.xml index ff98813857..e7cad185aa 100644 --- a/build/build.xml +++ b/build/build.xml @@ -180,7 +180,6 @@ <!-- Construct classpath used by java and javadoc compilation --> <path id="compile.classpath"> <pathelement path="build/lib/servlet.jar" /> - <pathelement path="build/external/fileupload/classes" /> <fileset dir="lib/core"> <include name="**/*.jar"/> @@ -574,12 +573,7 @@ </copy> </target> - <target name="compile-fileupload"> - <echo>Compiling custom fileupload classes.</echo> - <ant dir="build/external/fileupload" antfile="build.xml" target="compile" /> - </target> - - <target name="compile-java" depends="init, check-servlet-version, compile-fileupload, webcontent"> + <target name="compile-java" depends="init, check-servlet-version, webcontent"> <echo>Compiling src (server-side)</echo> <!-- Compile all sources at the same time as they depend on each other --> @@ -798,10 +792,6 @@ <exclude name="${toolkit-package}/launcher/**" /> </patternset> </fileset> - <!-- fileupload, see build/external/fileupload/build.xml --> - <fileset dir="build/external/fileupload/classes"> - <include name="**/*" /> - </fileset> <!-- add sources --> <fileset dir="${result-path}/src/core"> <patternset> |