Project

General

Profile

« Previous | Next » 

Revision 2978

Added by Jing Tao over 18 years ago

Add code to handle server-config.wsdd. it is necessary to run "ant deploy-ecogrid"

View differences:

build.xml
789 789
   	     <property name="target" value="${ecogrid-target-name}"/>
790 790
   	     <property name="metacat.dir" value="${metacat.dir}"/>
791 791
   	  </ant>
792
   	  <war destfile="${ecogrid-dir}/build/${metacat.context}.war" update="true">
793
  	      <webinf dir="${ecogrid-dir}/lib">
794
   	        <include name="server-config.wsdd"/>
795
   	      </webinf>
796
   	  </war>
792 797
   	  <copy file="${ecogrid-dir}/build/${metacat.context}.war" todir="${dist.dir}" overwrite="true"/>
798
   	  
799
   
793 800
   </target>
794 801
   
795 802
   <target name="get-ecogrid" depends="init" if="ecogrid.required" description="Check out ecogrid module">
......
802 809
   <target name="upgrade" depends="install"
803 810
          description="* Upgrade an existing metacat installation with a new version *">
804 811
       <unwar src="${deploy.dir}/${metacat.context}.war" dest="${deploy.dir}/${metacat.context}" />
805
   	   <echo>Note: If you enable to install ecogrid, please run "ant deploy-ecogrid" after restart tomcat</echo>
806 812
   </target>
807 813
	
808
   <target name="deploy-ecogrid" depends="init" if="enable.ecogrid" description="Automately generate wsdd for ecogrid service">
814
   <target name="deploy-ecogrid" depends="clean-ecogrid-server-config-wsdd" if="enable.ecogrid" description="Automately generate wsdd for ecogrid service">
809 815
   	 <ant antfile="build_new.xml" dir="${ecogrid-dir}" target ="deploy" inheritall="false">
810 816
   	   	 <property name="context" value="${metacat.context}"/>
811 817
   	   	 <property name="target" value="${ecogrid-target-name}"/>
......
814 820
   	     <property name="port" value="${config.port}"/>
815 821
   	 </ant>
816 822
   </target>
823
	
824
   <target name="clean-ecogrid-server-config-wsdd" depends="init" description="Automately generate wsdd for ecogrid service">
825
      <delete file="${deploy.dir}/${metacat.context}/WEB-INF/server-config.wsdd"/>
826
   </target>
817 827

  
818 828
   <target name="install-registry" depends="init,getConversionXSL"
819 829
            description="Install Registry">

Also available in: Unified diff