Merge branch '364571-introduce-nano' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web-server into 364571-introduce-nano
diff --git a/build-tomcat-server/build.xml b/build-tomcat-server/build.xml
index eae7c81..0403ac7 100644
--- a/build-tomcat-server/build.xml
+++ b/build-tomcat-server/build.xml
@@ -105,6 +105,8 @@
<mkdir dir="${artifacts.dir}"/>
+ <delete dir="${package.output.dir}/Eclipse.app" quiet="true"/>
+
<zip destfile="${package.output.file}">
<zipfileset dir="${package.dir}" includes="${package.basename}/bin/*.sh" filemode="755"/>
<zipfileset dir="${package.dir}" includes="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
@@ -113,7 +115,7 @@
<exclude name="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
</zipfileset>
</zip>
- <zip destfile="${artifacts.dir}\${natural.name}-updatesite-${bundle.version}.zip">
+ <zip destfile="${updatesite.output.file}">
<zipfileset dir="${p2.repository.dir}"/>
</zip>
