summaryrefslogtreecommitdiffstats
path: root/build/build.xml
diff options
context:
space:
mode:
Diffstat (limited to 'build/build.xml')
-rw-r--r--build/build.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml
index 1d91dfa611..2146b72daa 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -697,7 +697,7 @@
</emma>
<jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}"
- compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve">
+ compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true">
<metainf dir="${output-dir}/META-INF"/>
<manifest>
<attribute name="Vaadin-Package-Version" value="1" />
@@ -731,12 +731,12 @@
</patternset>
</fileset>
- <!-- Precompiled widgetset (.gwtar file) - only include default widgetset, large file -->
- <fileset dir="${result-precompiled-widgetsets}" includes="com/vaadin/terminal.gwt.DefaultWidgetSet.gwtar" />
+ <!-- Precompiled widgetset (.gwtar file) - only include default widgetset, large file -->
+ <fileset dir="${result-precompiled-widgetsets}" includes="com/vaadin/terminal.gwt.DefaultWidgetSet.gwtar" />
- <!-- TODO GWT related license files etc. should be in subdirectories -->
+ <!-- TODO GWT related license files etc. should be in subdirectories -->
- <!-- GWT -->
+ <!-- GWT -->
<fileset dir="${gwt.user.dir}/src" excludes="**/package.html" />
<fileset dir="${gwt.user.dir}/super" excludes="**/package.html" />
<fileset dir="${gwt.user.bin}" />
@@ -744,7 +744,7 @@
<zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
<zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
- <zipfileset src="${gwt.dev.jar}" />
+ <zipfileset src="${gwt.dev.jar}" excludes="javax/servlet/**/*" />
<zipfileset src="${gwt.codeserver.jar}" />
</jar>