ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

rolback of rollback

Browse source
This commit is contained in:
Ziver Koc 2017-08-07 17:26:42 +02:00
parent 0d4b34b239
commit 76206ffa08
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build.xml
View file

@ -17,7 +17,6 @@
<property name="tomcat.user" value="" /> <property name="tomcat.user" value="" />
<property name="tomcat.pass" value="" /> <property name="tomcat.pass" value="" />
<property name="catalina.home" value="/usr/share/tomcat7"/> <property name="catalina.home" value="/usr/share/tomcat7"/>
<property name="deployPath" value="/var/lib/tomcat7/webapps/Zallery.war" />
<!--define standard arguments for javac--> <!--define standard arguments for javac-->
<presetdef name="javac"> <presetdef name="javac">
@ -70,19 +69,18 @@
</target> </target>
<!--<import file="${catalina.home}/bin/catalina-tasks.xml" optional="true"/>--> <import file="${catalina.home}/bin/catalina-tasks.xml" optional="true"/>
<target name="deploy" depends="package"> <target name="deploy" depends="package">
<delete file="${deployPath}" quiet="true" />
<copy file="${releaseDir}/Zallery.war"
toFile="${deployPath}" />
<!--
<deploy url="${tomcat.url}" <deploy url="${tomcat.url}"
username="${tomcat.user}" username="${tomcat.user}"
password="${tomcat.pass}" password="${tomcat.pass}"
path="/Zallery" path="/Zallery"
update="true" update="true"
war="file:${releaseDir}/Zallery.war" /> war="file:${releaseDir}/Zallery.war" />
-->
<!-- Workaround as tomcat deletes the webapp context file from conf dir -->
<copy file="/var/lib/tomcat7/conf/Catalina/localhost/Zallery.xml_orig"
toFile="/var/lib/tomcat7/conf/Catalina/localhost/Zallery.xml" />
</target> </target>
</project> </project>