Changeset 10136

Timestamp:

2005-06-16T17:40:58+12:00 (19 years ago)

Author:

kjdon

Message:

modified the soap-deploy-site stuff - now you don't need to restart tomcat for it to take effect

File:

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

trunk/gsdl3/build.xml

@@ -712 +712 @@
   </target>
 
-  <target name="soap-deploy-site" depends="get-sitename,get-siteuri,create-deployment-files,restart-tomcat"
+  <target name="soap-deploy-site" depends="get-sitename,get-siteuri,create-deployment-files"
     description="Deploy a SOAP web service for a local Greenstone site">
     <java classname="org.apache.axis.client.AdminClient">
@@ -732 +732 @@
   </target>
 
+  <!-- this target used to deploy the localsite server for the default installation -->
   <target name="deploy-localsite" depends="init" if="tomcat.islocal">
     <antcall target="start-tomcat"/>
@@ -751 +752 @@
   <target name="check-deployment-files" depends="get-sitename">
     <condition property="deploy.exists">
-      <available file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
+      <and>
+    <available file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
+    <available file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/>
+    <available file="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class"/>
+      </and>
     </condition>
-    <condition property="undeploy.exists">
-      <available file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/>
-    </condition>
-    <echo>${axis.sitename}, ${deploy.exists}, ${undeploy.exists}</echo>
-  </target> 
-  <target name="create-deployment-files" depends="get-sitename,check-deployment-files" 
+   </target> 
+
+  <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files" 
     if="axis.sitename" unless="deploy.exists">
     <filter token="sitename" value="${axis.sitename}"/>
@@ -780 +782 @@
       <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java" />
     </javac>
-    <jar destfile="${build.home}/gsdl3.jar">
-      <fileset dir="${build.home}">
-    <include name="org/greenstone/gsdl3/**"/>
-    <exclude name="**/Test.class"/>
-      </fileset>
-      <manifest>
-    <attribute name="Built-By" value="${user.name}" />
-      </manifest>
-    </jar>
-    <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
+    <mkdir dir="${web.classes}/org/greenstone/gsdl3"/>
+    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" />
   </target>