Ignore:
Timestamp:
2008-04-29T12:09:18+12:00 (15 years ago)
Author:
ak19
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r15229 r15235  
    184184  <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
    185185
    186   <!--  ================ A list of all the available web services classes ============== -->
    187   <property name="web.services.list" value="SOAPServer, QBRSOAPServer"/>   
     186  <!--  ================ Web services related constants ============== -->
     187  <!-- A list of all the available web services classes -->
     188  <property name="base.webservice.name" value="SOAPServer"/>
     189  <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"/> 
    188190
    189191<!--  ==================== Compilation Control Options ==================== -->
     
    762764  </target>
    763765
    764   <!-- this target used to deploy the default web service SOAPServer on the localsite server
     766  <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server
    765767with the default servicename of localsite-->
    766768  <target name="deploy-localsite" depends="init"
    767769    description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
    768770    <antcall target="start-tomcat"/>
    769     <echo>Deploying SOAPServer web services for localsite under service name: localsite</echo>
     771    <echo>Deploying ${base.webservice.name} web services for localsite under service name: localsite</echo>
    770772    <antcall target="create-deployment-files">
    771773      <param name="axis.sitename" value="localsite"/>
    772       <param name="axis.servicesname" value="SOAPServer"/>
     774      <param name="axis.servicesname" value="${base.webservice.name}"/>
    773775      <param name="axis.siteuri" value="localsite"/>
    774776    </antcall>
    775777    <antcall target="deploy-site">
    776778      <param name="axis.sitename" value="localsite"/>
    777       <param name="axis.servicesname" value="SOAPServer"/>
     779      <param name="axis.servicesname" value="${base.webservice.name}"/>
    778780      <param name="axis.siteuri" value="localsite"/>
    779781    </antcall>
     
    783785  <target name="get-sitename" unless="axis.sitename">
    784786    <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for?
    785 Press enter for default:localsite</input>
     787Press Enter for default:localsite</input>
    786788  </target>
    787789
     
    795797
    796798  <target name="get-webservices" unless="axis.servicesname">
    797     <input addproperty="axis.servicesname" defaultvalue="SOAPServer">Which set of web services do you want to deploy?
     799    <input addproperty="axis.servicesname" defaultvalue="${base.webservice.name}">Which set of web services do you want to deploy?
    798800Choose from: ${web.services.list}
    799 Or press enter for default:SOAPServer /></input>
     801Or press Enter for default:${base.webservice.name} /></input>
    800802    <echo>${axis.servicesname}</echo>
    801803  </target>
    802804
    803805  <target name="get-siteuri" depends="get-sitename,get-webservices" unless="axis.siteuri">
    804     <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.servicesname}${axis.sitename})"
    805           defaultvalue="${axis.servicesname}${axis.sitename}"/>
     806    <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>
    806807    <echo>Site: ${axis.sitename}, services: ${axis.servicesname}, servicesname: ${axis.siteuri}</echo>
    807808  </target>
     
    809810  <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">
    810811   <condition property="soap.method" value="provider='java:MSG' style='message' use='literal'">
    811       <equals arg1="${axis.servicesname}" arg2="SOAPServer"/>
     812      <equals arg1="${axis.servicesname}" arg2="${base.webservice.name}"/>
    812813    </condition>
    813814   
     
    815816   <condition property="soap.method" value="provider='java:RPC'">
    816817     <not>
    817       <equals arg1="${axis.servicesname}" arg2="SOAPServer"/>
     818      <equals arg1="${axis.servicesname}" arg2="${base.webservice.name}"/>
    818819    </not>
    819820    </condition>
     
    912913    <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
    913914    <!-- copy the localsite server in case we need it -->
    914     <copy file="${build.home}/org/greenstone/gsdl3/SOAPServerlocalsite.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServerlocalsite.class" />
     915    <copy file="${build.home}/org/greenstone/gsdl3/${base.webservice.name}localsite.class" tofile="${web.classes}/org/greenstone/gsdl3/${base.webservice.name}localsite.class" />
    915916
    916917    <jar destfile="${build.home}/GAI.jar">
Note: See TracChangeset for help on using the changeset viewer.