Changeset 13842

Timestamp:

2007-02-01T11:39:27+13:00 (17 years ago)

Author:

kjdon

Message:

deploy-localsite not run as part of standard install. Also, now it doesn't need to create the deployment files, so the source code is not needed for deploying localsite. However, it would be needed for deploying other SOAP servers

File:

• trunk/gsdl3/build.xml (modified) (6 diffs)

trunk/gsdl3/build.xml

@@ -260 +260 @@
       includes="*.sh,*.pl"/>
   </target>
-  <target name="install" depends="init,configure,configure-c++,compile,deploy-localsite" 
+  <target name="install" depends="init,configure,configure-c++,compile" 
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
   
@@ -691 +691 @@
   </target>
 
-  <target name="soap-deploy-site" depends="get-sitename,get-siteuri,create-deployment-files"
-    description="Deploy a SOAP web service for a local Greenstone site">
+  <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,create-deployment-files,deploy-site"
+    description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/>
+  
+  <target name="deploy-site">
     <java classname="org.apache.axis.client.AdminClient">
       <classpath refid="compile.classpath"/>
@@ -702 +704 @@
   
   <target name="soap-undeploy-site" depends="get-sitename"
-    description="Undeploy a SOAP web service for a local Greenstone site">
+    description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work.">
     <java classname="org.apache.axis.client.AdminClient">
       <classpath refid="compile.classpath"/>
@@ -711 +713 @@
   </target>
 
-  <!-- this target used to deploy the localsite server for the default installation -->
-  <target name="deploy-localsite" depends="init">
+  <!-- this target used to deploy the preprepared localsite server  -->
+  <target name="deploy-localsite" depends="init" 
+    description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
     <antcall target="start-tomcat"/>
-    <antcall target="soap-deploy-site">
+    <antcall target="deploy-site">
       <param name="axis.sitename" value="localsite"/>
-      <param name="axis.siteuri" value="localsite"/>
     </antcall>
     <antcall target="stop-tomcat"/>
@@ -729 +731 @@
     <echo>${axis.sitename}, ${axis.siteuri}</echo>
   </target>
+
   <target name="check-deployment-files" depends="get-sitename">
     <condition property="deploy.exists">
@@ -812 +815 @@
     </jar>
     <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
+    <!-- copy the localsite server in case we need it -->
+    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServerlocalsite.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServerlocalsite.class" />
+
     <jar destfile="${build.home}/GAI.jar">
       <fileset dir="${build.home}">