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

revert tomcat deployment and module

Browse source
This commit is contained in:
Ziver Koc 2017-08-07 17:09:00 +02:00
parent b404151a68
commit 0d4b34b239
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build.xml
View file

@ -11,13 +11,13 @@
<property name="outputRoot" value="${gitRoot}/build" /> <property name="outputRoot" value="${gitRoot}/build" />
<property name="buildDir" value="${outputRoot}/production" /> <property name="buildDir" value="${outputRoot}/production" />
<property name="releaseDir" value="${outputRoot}/release" /> <property name="releaseDir" value="${outputRoot}/release" />
<property name="deployPath" value="/var/lib/tomcat7/webapps/Zallery.war" />
<!-- Deployment properties --> <!-- Deployment properties -->
<property name="tomcat.url" value="http://localhost:8080/manager/text" /> <property name="tomcat.url" value="http://localhost:8080/manager/text" />
<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,14 +70,19 @@
</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" />
-->
</target> </target>
</project> </project>

2
src/zall/Zallery.java
View file

@ -32,7 +32,7 @@ import zutil.log.LogUtil;
public class Zallery extends HttpServlet{ public class Zallery extends HttpServlet{
private static Logger logger = LogUtil.getLogger(); private static Logger logger = LogUtil.getLogger();
public static final String VERSION = "1.0.0"; public static final String VERSION = "1.0.1";
public static String WEBSITE_NAME = "Example.com"; public static String WEBSITE_NAME = "Example.com";
public static String WEBSITE_URL = "http://example.com"; public static String WEBSITE_URL = "http://example.com";