Make all necessary changes for combining old and new servlets

[proteocache.git] / build.xml

diff --git a/build.xml b/build.xml
index e381cfc..e913296 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -111,7 +111,7 @@
                <echo>Build full jar</echo>
                <delete file="${proteocache-jar}"></delete>
                <jar jarfile="${proteocache-jar}">
-                       <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" ></zipgroupfileset>
+<!--                   <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" ></zipgroupfileset>-->
                        <fileset refid="allcodes"></fileset>
                        <fileset dir="${basedir}/WEB-INF/classes/"></fileset>
                        <!-- Set compbio.server.MainTester as main to help user to test their deployments -->
@@ -135,6 +135,7 @@
                                <include name="web.xml"/>
                                <include name="lib/*"/>
                        </zipfileset>
+                       <zipfileset dir="." includes="${proteocache-jar}" fullpath="WEB-INF/lib/proteocache.jar"/>
                        <zipfileset dir="conf" prefix="conf" />
                        <!-- Add ProteoCache static web site pages apart from the binary archive -->
                        <zipfileset dir="${basedir}/website" excludes="tests/**, template.html"/>