Changeset 9558


Ignore:
Timestamp:
2005-04-05T14:25:48+12:00 (19 years ago)
Author:
kjdon
Message:

catalina-ant.jar comes with tomcat, so changed the taskdef classpaths to the tomcat jar file (and no longer need the one in lib/java). However this means that when you run ant the first time the jar file is not there, so moved the taskdefs to a target - this needs to be called by any targets that want to use teh tasks.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/ant-install-branch/gsdl3/build.xml

    r9554 r9558  
    1515  <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/>
    1616
    17 <!-- Configure the custom Ant tasks for the Tomcat Manager application -->
    18   <taskdef name="deploy"    classname="org.apache.catalina.ant.DeployTask"
    19     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    20   <taskdef name="list"      classname="org.apache.catalina.ant.ListTask"
    21     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    22   <taskdef name="reload"    classname="org.apache.catalina.ant.ReloadTask"
    23     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    24   <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask"
    25     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    26   <taskdef name="roles"     classname="org.apache.catalina.ant.RolesTask"
    27     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    28   <taskdef name="start"     classname="org.apache.catalina.ant.StartTask"
    29     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    30   <taskdef name="stop"      classname="org.apache.catalina.ant.StopTask"
    31     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    32   <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
    33     classpath="${basedir}/lib/java/catalina-ant.jar"/>
    3417
    3518
    … …  
    692675
    693676<!-- ============ running targets ========================-->
     677
     678  <target name="setup-catalina-ant-tasks">
     679    <!-- Configure the custom Ant tasks for the Tomcat Manager application -->
     680    <taskdef name="deploy"    classname="org.apache.catalina.ant.DeployTask"
     681      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     682    <taskdef name="list"      classname="org.apache.catalina.ant.ListTask"
     683      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     684    <taskdef name="reload"    classname="org.apache.catalina.ant.ReloadTask"
     685      classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     686  <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask"
     687    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     688  <taskdef name="roles"     classname="org.apache.catalina.ant.RolesTask"
     689    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     690  <taskdef name="start"     classname="org.apache.catalina.ant.StartTask"
     691    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     692  <taskdef name="stop"      classname="org.apache.catalina.ant.StopTask"
     693    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     694  <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
     695    classpath="${catalina.home}/server/lib/catalina-ant.jar"/>
     696  </target>
     697
    694698  <target name="gli" description="Run the Greenstone Librarian Interface" depends="gli-local,gli-external"/>
    695699
    … …  
    712716
    713717  <target name="reload" description="Reload web application"
    714           depends="">
     718          depends="init,setup-catalina-ant-tasks">
    715719    <reload  url="http://kanuka:7070/manager" username="admin" password="admin"
    716720            path="/gsdl3"/>
Note: See TracChangeset for help on using the changeset viewer.