Changeset 9840 for branches

Timestamp:

2005-05-09T11:27:12+12:00 (19 years ago)

Author:

kjdon

Message:

in target names, changed startup to start and shutdown to stop, also added a reconfigure-server-settings target, which does everything necessary to change tomcats port number.

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (11 diffs)

branches/ant-install-branch/gsdl3/build.xml

@@ -190 +190 @@
     description="Update (thru CVS) all the source (including core, packages and gs2building) and recompile. Similar to install but doesn't reinstall components such as Tomcat and axis."/>
 
-  <target name="startup" depends="init,startup-mysql,startup-tomcat"
+  <target name="start" depends="init,start-mysql,start-tomcat"
     description="Startup the (local) Greenstone servers (tomcat,mysql...)" />
 
-  <target name="shutdown" depends="init,shutdown-tomcat,shutdown-mysql" 
+  <target name="stop" depends="init,stop-tomcat,stop-mysql" 
     description="Shutdown the (local) Greenstone servers."/>
   
-  <target name="restart" description="Shutdown and restart the Greenstone servers" depends="init,shutdown,startup"/>
+  <target name="restart" description="Shutdown and restart the Greenstone servers" depends="init,stop,start"/>
 
 
@@ -350 +350 @@
       tofile="${basedir}/web/lib/xercesImpl.jar"/>
   </target>
-  <target name="configure-files" depends="init">
+
+  <target name="configure-files" depends="configure-files-gsdl3,configure-files-server"/>
+  
+  <target name="configure-files-gsdl3" depends="init">
+    <filter token="gsdl3home" value="${basedir}"/>
+    <copy file="${basedir}/web/WEB-INF/web.xml.in" tofile="${basedir}/web/WEB-INF/web.xml" filtering="true"/>
+    <copy file="${basedir}/resources/java/SOAPServer.cfg.in" tofile="${basedir}/resources/java/SOAPServer.cfg" filtering="true"/>
+  </target>
+  
+  <target name="configure-files-server" depends="init">
     <filter token="port" value="${tomcat.port}"/>
     <filter token="hostname" value="${tomcat.server}"/>
-    <filter token="gsdl3home" value="${basedir}"/>
-    <copy file="${basedir}/web/WEB-INF/web.xml.in" tofile="${basedir}/web/WEB-INF/web.xml" filtering="true"/>
     <copy file="${basedir}/web/sites/localsite/siteConfig.xml.in" tofile="${basedir}/web/sites/localsite/siteConfig.xml" filtering="true"/>
     <copy file="${basedir}/web/sites/gateway/siteConfig.xml.in" tofile="${basedir}/web/sites/gateway/siteConfig.xml" filtering="true"/>
-    <copy file="${basedir}/resources/java/SOAPServer.cfg.in" tofile="${basedir}/resources/java/SOAPServer.cfg" filtering="true"/>
-
   </target>
 
@@ -429 +434 @@
   </target>
   
-  <target name="startup-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
+  <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
     <property name="tomcat.classpath" refid="compile.classpath"/>
     <property name="tomcat.path" refid="running.path"/>
@@ -459 +464 @@
   </target>
   <!-- windows: do we want to launch a webrowser?? -->
-  <target name="shutdown-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
+  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
       <env key="CATALINA_HOME" value="${catalina.home}"/>
@@ -466 +471 @@
   </target>
 
-  <target name="restart-tomcat" description="Shutdown and restart only Tomcat" depends="init,shutdown-tomcat,startup-tomcat"/>
+  <target name="restart-tomcat" description="Shutdown and restart only Tomcat" depends="init,stop-tomcat,start-tomcat"/>
 
   <target name="setup-catalina-ant-tasks">
@@ -492 +497 @@
 
   <!-- this is one target that we only want to run once. -->
-  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,startup-mysql,setup-mysql,shutdown-mysql"/>
+  <target name="prepare-mysql" depends="init,init-mysql-vars,install-mysql,start-mysql,setup-mysql,stop-mysql"/>
 
   <target name="init-mysql-vars">
@@ -579 +584 @@
   </target>
  
-  <target name="startup-mysql" depends="init,init-mysql-vars" if="mysql.islocal"
+  <target name="start-mysql" depends="init,init-mysql-vars" if="mysql.islocal"
     description="Startup only mysql">
     <exec executable="${mysql.home}/bin/mysqld_safe" dir="${mysql.home}"
@@ -602 +607 @@
   </target>
 
-    <target name="shutdown-mysql" depends="init" if="mysql.islocal"
+    <target name="stop-mysql" depends="init" if="mysql.islocal"
     description="Shutdown only mysql">
     <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
@@ -618 +623 @@
   </target>
 
-  <target name="restart-mysql" description="Shutdown and restart only mysql" depends="init,shutdown-mysql,startup-mysql"/>
+  <target name="restart-mysql" description="Shutdown and restart only mysql" depends="init,stop-mysql,start-mysql"/>
 
 
@@ -664 +669 @@
 
   <target name="deploy-localsite" depends="init">
-    <antcall target="startup-tomcat"/>
+    <antcall target="start-tomcat"/>
     <antcall target="soap-deploy-site">
       <param name="axis.sitename" value="localsite"/>
       <param name="axis.siteuri" value="localsite"/>
     </antcall>
-    <antcall target="shutdown-tomcat"/>
+    <antcall target="stop-tomcat"/>
   </target>
   
@@ -1134 +1139 @@
 
 
+  <target name="reconfigure-server-settings" depends="init,configure-tomcat,configure-files-server"
+    description="If you have changed any of the Tomcat properties in the build.properties file, run this target to update the Tomcat configuration, and any Greenstone configuration files that specify the server address">
+  </target>
+
 
 </project>