Project

General

Profile

« Previous | Next » 

Revision 4086

Added by daigle over 16 years ago

use build.tomcat.dir to get to tomcat jar

View differences:

build.properties
4 4 
metacat.version=1.9.0
5 5 

  		




  6
  6
  
    
# Tomcat dev deployment directory


  		




  7
  
  
    
# dev.tomcat.dir=/usr/local/tomcat


  		




  8
  
  
    
dev.deploy.dir=/usr/local/devtools/jakarta-tomcat


  		




  
  7
  
    
# build.tomcat.dir=/usr/local/tomcat


  		




  
  8
  
    
build.tomcat.dir=/usr/local/devtools/jakarta-tomcat


  		




  9
  9
  
    

  		




  10
  10
  
    

  		




  11
  11
  
    
## metacat.context will be used to name war only


  		












  

    
      build.xml
    
  





  35
  35
  
    

  		




  36
  36
  
    
  <!-- Determine which tomcat we are using and tomcat-specific settings -->


  		




  37
  37
  
    
	 <!-- MCD HACK -->


  		




  38
  
  
    
	<property name="jsdk" value="/usr/local/tomcat/common/lib/servlet-api.jar"/>


  		




  
  38
  
    
	<property name="jsdk" value="${build.tomcat.dir}/common/lib/servlet-api.jar"/>


  		




  39
  39
  
    
  <!-- MCD BYE condition property="jsdk" value="${tomcat}/common/lib/servlet.jar">


  		




  40
  40
  
    
    <equals arg1="${tomcatversion}" arg2="tomcat4" />


  		




  41
  41
  
    
  </condition>


  		




  ......




  286
  286
  
    
      <property name="testtorun" value="BuildIndexTest" />


  		




  287
  287
  
    
      <property name="junittestsdir" value="./test/edu/ucsb/nceas/metacattest" />


  		




  288
  288
  
    
      <property name="junitnettestsdir" value="./test/edu/ucsb/nceas/metacatnettest" />


  		




  289
  
  
    
   	  <property name="dev.deploy.dir" value="${dev.tomcat.dir}/webapps" />


  		




  
  289
  
    
   	  <property name="dev.deploy.dir" value="${build.tomcat.dir}/webapps" />


  		




  290
  290
  
    
      <property name="build.dir" value="./build"/>


  		




  291
  291
  
    
      <property name="build.src" value="${build.dir}/src"/>


  		




  292
  292
  
    
      <property name="build.dest" value="${build.dir}/classes"/>


  		












Also available in:  Unified diff