Changeset 15235

Timestamp:

2008-04-29T12:09:18+12:00 (16 years ago)

Author:

ak19

Message:

Small changes: display strings and the name SOAPServer is now a property

File:

• greenstone3/trunk/build.xml (modified) (7 diffs)

greenstone3/trunk/build.xml

@@ -184 +184 @@
   <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
 
-  <!--  ================ A list of all the available web services classes ============== -->
-  <property name="web.services.list" value="SOAPServer, QBRSOAPServer"/>    
+  <!--  ================ Web services related constants ============== -->
+  <!-- A list of all the available web services classes -->
+  <property name="base.webservice.name" value="SOAPServer"/>
+  <property name="web.services.list" value="${base.webservice.name} for Greenstone3's core web services, QBR${base.webservice.name} for Query, Browse and Retrieve services"/>  
 
 <!--  ==================== Compilation Control Options ==================== -->
@@ -762 +764 @@
   </target>
 
-  <!-- this target used to deploy the default web service SOAPServer on the localsite server
+  <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server
 with the default servicename of localsite-->
   <target name="deploy-localsite" depends="init" 
     description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
     <antcall target="start-tomcat"/>
-    <echo>Deploying SOAPServer web services for localsite under service name: localsite</echo>
+    <echo>Deploying ${base.webservice.name} web services for localsite under service name: localsite</echo>
     <antcall target="create-deployment-files">
       <param name="axis.sitename" value="localsite"/>
-      <param name="axis.servicesname" value="SOAPServer"/>
+      <param name="axis.servicesname" value="${base.webservice.name}"/>
       <param name="axis.siteuri" value="localsite"/>
     </antcall>
     <antcall target="deploy-site">
       <param name="axis.sitename" value="localsite"/>
-      <param name="axis.servicesname" value="SOAPServer"/>
+      <param name="axis.servicesname" value="${base.webservice.name}"/>
       <param name="axis.siteuri" value="localsite"/>
     </antcall>
@@ -783 +785 @@
   <target name="get-sitename" unless="axis.sitename">
     <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for?
-Press enter for default:localsite</input>
+Press Enter for default:localsite</input>
   </target>
 
@@ -795 +797 @@
 
   <target name="get-webservices" unless="axis.servicesname">
-    <input addproperty="axis.servicesname" defaultvalue="SOAPServer">Which set of web services do you want to deploy?
+    <input addproperty="axis.servicesname" defaultvalue="${base.webservice.name}">Which set of web services do you want to deploy?
 Choose from: ${web.services.list}
-Or press enter for default:SOAPServer /></input>
+Or press Enter for default:${base.webservice.name} /></input>
     <echo>${axis.servicesname}</echo>
   </target>
 
   <target name="get-siteuri" depends="get-sitename,get-webservices" unless="axis.siteuri">
-    <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.servicesname}${axis.sitename})" 
-          defaultvalue="${axis.servicesname}${axis.sitename}"/>
+    <input addproperty="axis.siteuri" defaultvalue="${axis.servicesname}${axis.sitename}">What name do you want the service to have? (Press Enter for default:${axis.servicesname}${axis.sitename})</input>
     <echo>Site: ${axis.sitename}, services: ${axis.servicesname}, servicesname: ${axis.siteuri}</echo>
   </target>
@@ -809 +810 @@
   <target name="set-soapmethod" description="Determines whether the service in the wsdd should have the style attribute set to message or the provider attribute set to java:RPC"  if="axis.servicesname">
    <condition property="soap.method" value="provider='java:MSG' style='message' use='literal'">
-      <equals arg1="${axis.servicesname}" arg2="SOAPServer"/>
+      <equals arg1="${axis.servicesname}" arg2="${base.webservice.name}"/>
     </condition>
    
@@ -815 +816 @@
    <condition property="soap.method" value="provider='java:RPC'">
      <not>
-      <equals arg1="${axis.servicesname}" arg2="SOAPServer"/>
+      <equals arg1="${axis.servicesname}" arg2="${base.webservice.name}"/>
     </not>
     </condition>
@@ -912 +913 @@
     <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" />
+    <copy file="${build.home}/org/greenstone/gsdl3/${base.webservice.name}localsite.class" tofile="${web.classes}/org/greenstone/gsdl3/${base.webservice.name}localsite.class" />
 
     <jar destfile="${build.home}/GAI.jar">