git://source.jalview.org
/
proteocache.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
808275f
)
PROT-6 Fix problem with missing proteocache.jar in proteocache.war
author
Sasha Sherstnev
<a.sherstnev@dundee.ac.uk>
Wed, 20 Nov 2013 13:46:01 +0000
(13:46 +0000)
committer
Sasha Sherstnev
<a.sherstnev@dundee.ac.uk>
Wed, 20 Nov 2013 13:46:01 +0000
(13:46 +0000)
build.xml
patch
|
blob
|
history
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}">
<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 -->
<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>
<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"/>
<zipfileset dir="conf" prefix="conf" />
<!-- Add ProteoCache static web site pages apart from the binary archive -->
<zipfileset dir="${basedir}/website" excludes="tests/**, template.html"/>