Changeset 9792 for branches/ant-install-branch

Timestamp:

2005-05-02T13:16:08+12:00 (19 years ago)

Author:

kjdon

Message:

added CATALINA_HOME to the environment for tomcat startup and shutdown, and added a deploy-localsite target, which is used during install

File:

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

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

@@ -168 +168 @@
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
 
-  <target name="install" depends="accept-properties,init,prepare,cvsupdate,configure,clean,compile" 
+  <target name="install" depends="accept-properties,init,prepare,cvsupdate,configure,clean,compile,deploy-localsite" 
     description="Install Greenstone 3. Use this when you first checkout the code. Also running this target later on will reinstall Greenstone. Most things will be reset back to their defaults, except for code changes."/>
 
@@ -425 +425 @@
             path="/gsdl3"/>
   </target>
-
-
+  
   <target name="startup-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
     <property name="tomcat.classpath" refid="compile.classpath"/>
@@ -436 +435 @@
       <env key="PATH" path="${tomcat.path}"/>
       <env key="CATALINA_OPTS" value="${catalina.opts}"/>
+      <env key="CATALINA_HOME" value="${catalina.home}"/>
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
       <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${basedir}/lib:${mysql.home}/lib/mysql"/>
@@ -457 +457 @@
   <!-- windows: do we want to launch a webrowser?? -->
   <target name="shutdown-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"/>
+    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
+      <env key="CATALINA_HOME" value="${catalina.home}"/>
+    </exec>
     <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"/>
   </target>
@@ -658 +660 @@
   </target>
 
+  <target name="deploy-localsite" depends="init">
+    <antcall target="startup-tomcat"/>
+    <antcall target="soap-deploy-site">
+      <param name="axis.sitename" value="localsite"/>
+      <param name="axis.siteuri" value="localsite"/>
+    </antcall>
+    <antcall target="shutdown-tomcat"/>
+  </target>
+  
   <target name="get-sitename" unless="axis.sitename">
     <input addproperty="axis.sitename" message="What site? (press enter for default:localsite)" defaultvalue="localsite"/>