Changeset 10075


Ignore:
Timestamp:
2005-06-13T15:37:56+12:00 (19 years ago)
Author:
kjdon
Message:

changed the catalina.dir property to catalina.home

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/greenstone3-extensions/vishnu/build.xml

    r9874 r10075  
    1515
    1616  <!-- if vishnu is installed as a package inside greenstone -->
    17   <property name="prefix" value="../../"/>
     17  <property name="prefix" value="../.."/>
    1818  <!-- use if vishnu is standalone -->
    1919  <property name="prefix" value="${basedir}"/>
    20   <property name="catalina.dir" value="${prefix}/comms/jakarta/tomcat"/>
    21   <property name="web.lib.dir" value="${prefix}/web/lib"/>
    22   <property name="web.classes.dir" value="${prefix}/web/WEB-INF/classes"/>
     20  <property name="catalina.home" value="${env.CATALINA_HOME}"/>
     21  <property name="web.lib" value="${prefix}/web/WEB-INF/lib"/>
     22  <property name="web.classes" value="${prefix}/web/WEB-INF/classes"/>
    2323
    2424
    … …  
    4545  make sure all the specified jar files are on the environment CLASSPATH -->
    4646  <path id="compile.classpath">
    47     <pathelement location="${prefix}/lib/java/mg.jar"/>
    48     <pathelement location="${prefix}/lib/java/lucene-1.4.1.jar"/>
    49     <pathelement location="${catalina.dir}/common/lib/servlet-api.jar"/>
    50     <pathelement location="${catalina.dir}/common/endorsed/xercesImpl.jar"/>
     47    <pathelement location="${prefix}/lib/jni/mg.jar"/>
     48    <pathelement location="${web.lib}/lucene-1.4.1.jar"/>
     49    <pathelement location="${catalina.home}/common/lib/servlet-api.jar"/>
     50    <pathelement location="${catalina.home}/common/endorsed/xercesImpl.jar"/>
    5151    <pathelement path="${env.CLASSPATH}"/>
    5252  </path>
    5353
    5454  <path id="ld.library.path">
    55     <pathelement location="${prefix}/lib"/>
     55    <pathelement location="${prefix}/lib/jni"/>
    5656  </path>
    5757  <target name="all" depends="clean,compile"/>
    … …  
    8282      </manifest>
    8383    </jar>     
    84     <copy file="${build.dir}/vishnu.jar" todir="${web.lib.dir}"/>
    85     <mkdir dir="${web.classes.dir}/vishnu/server"/>
     84    <copy file="${build.dir}/vishnu.jar" todir="${web.lib}"/>
     85    <!--<mkdir dir="${web.classes}/vishnu/server"/>
    8686    <copy file="${build.dir}/vishnu/server/VisServlet.class"
    87       todir="${web.classes.dir}/vishnu/server"/>
     87      todir="${web.classes}/vishnu/server"/>-->
    8888
    8989

  • trunk/gsdl3/build.xml

    r10073 r10075  
    885885    <!-- vishnu : just call the ant target -->
    886886    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
    887       inheritall="false" target="clean"/>
    888 
     887      inheritall="false" target="clean">
     888      <property name="catalina.home" value="${catalina.home}"/>
     889    </ant>
    889890    <!-- gsdl-as : just call the ant target-->
    890891    <ant antfile="${gsdl-as.home}/build.xml" dir="${gsdl-as.home}"
    … …  
    945946    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
    946947      inheritall="false" target="compile">
    947       <property name="catalina.dir" value="${catalina.home}"/>
     948      <property name="catalina.home" value="${catalina.home}"/>
    948949    </ant>
    949950

  • trunk/gsdl3/extensions/vishnu/build.xml

    r9874 r10075  
    1515
    1616  <!-- if vishnu is installed as a package inside greenstone -->
    17   <property name="prefix" value="../../"/>
     17  <property name="prefix" value="../.."/>
    1818  <!-- use if vishnu is standalone -->
    1919  <property name="prefix" value="${basedir}"/>
    20   <property name="catalina.dir" value="${prefix}/comms/jakarta/tomcat"/>
    21   <property name="web.lib.dir" value="${prefix}/web/lib"/>
    22   <property name="web.classes.dir" value="${prefix}/web/WEB-INF/classes"/>
     20  <property name="catalina.home" value="${env.CATALINA_HOME}"/>
     21  <property name="web.lib" value="${prefix}/web/WEB-INF/lib"/>
     22  <property name="web.classes" value="${prefix}/web/WEB-INF/classes"/>
    2323
    2424
    … …  
    4545  make sure all the specified jar files are on the environment CLASSPATH -->
    4646  <path id="compile.classpath">
    47     <pathelement location="${prefix}/lib/java/mg.jar"/>
    48     <pathelement location="${prefix}/lib/java/lucene-1.4.1.jar"/>
    49     <pathelement location="${catalina.dir}/common/lib/servlet-api.jar"/>
    50     <pathelement location="${catalina.dir}/common/endorsed/xercesImpl.jar"/>
     47    <pathelement location="${prefix}/lib/jni/mg.jar"/>
     48    <pathelement location="${web.lib}/lucene-1.4.1.jar"/>
     49    <pathelement location="${catalina.home}/common/lib/servlet-api.jar"/>
     50    <pathelement location="${catalina.home}/common/endorsed/xercesImpl.jar"/>
    5151    <pathelement path="${env.CLASSPATH}"/>
    5252  </path>
    5353
    5454  <path id="ld.library.path">
    55     <pathelement location="${prefix}/lib"/>
     55    <pathelement location="${prefix}/lib/jni"/>
    5656  </path>
    5757  <target name="all" depends="clean,compile"/>
    … …  
    8282      </manifest>
    8383    </jar>     
    84     <copy file="${build.dir}/vishnu.jar" todir="${web.lib.dir}"/>
    85     <mkdir dir="${web.classes.dir}/vishnu/server"/>
     84    <copy file="${build.dir}/vishnu.jar" todir="${web.lib}"/>
     85    <!--<mkdir dir="${web.classes}/vishnu/server"/>
    8686    <copy file="${build.dir}/vishnu/server/VisServlet.class"
    87       todir="${web.classes.dir}/vishnu/server"/>
     87      todir="${web.classes}/vishnu/server"/>-->
    8888
    8989

  • trunk/gsdl3/packages/vishnu/build.xml

    r9874 r10075  
    1515
    1616  <!-- if vishnu is installed as a package inside greenstone -->
    17   <property name="prefix" value="../../"/>
     17  <property name="prefix" value="../.."/>
    1818  <!-- use if vishnu is standalone -->
    1919  <property name="prefix" value="${basedir}"/>
    20   <property name="catalina.dir" value="${prefix}/comms/jakarta/tomcat"/>
    21   <property name="web.lib.dir" value="${prefix}/web/lib"/>
    22   <property name="web.classes.dir" value="${prefix}/web/WEB-INF/classes"/>
     20  <property name="catalina.home" value="${env.CATALINA_HOME}"/>
     21  <property name="web.lib" value="${prefix}/web/WEB-INF/lib"/>
     22  <property name="web.classes" value="${prefix}/web/WEB-INF/classes"/>
    2323
    2424
    … …  
    4545  make sure all the specified jar files are on the environment CLASSPATH -->
    4646  <path id="compile.classpath">
    47     <pathelement location="${prefix}/lib/java/mg.jar"/>
    48     <pathelement location="${prefix}/lib/java/lucene-1.4.1.jar"/>
    49     <pathelement location="${catalina.dir}/common/lib/servlet-api.jar"/>
    50     <pathelement location="${catalina.dir}/common/endorsed/xercesImpl.jar"/>
     47    <pathelement location="${prefix}/lib/jni/mg.jar"/>
     48    <pathelement location="${web.lib}/lucene-1.4.1.jar"/>
     49    <pathelement location="${catalina.home}/common/lib/servlet-api.jar"/>
     50    <pathelement location="${catalina.home}/common/endorsed/xercesImpl.jar"/>
    5151    <pathelement path="${env.CLASSPATH}"/>
    5252  </path>
    5353
    5454  <path id="ld.library.path">
    55     <pathelement location="${prefix}/lib"/>
     55    <pathelement location="${prefix}/lib/jni"/>
    5656  </path>
    5757  <target name="all" depends="clean,compile"/>
    … …  
    8282      </manifest>
    8383    </jar>     
    84     <copy file="${build.dir}/vishnu.jar" todir="${web.lib.dir}"/>
    85     <mkdir dir="${web.classes.dir}/vishnu/server"/>
     84    <copy file="${build.dir}/vishnu.jar" todir="${web.lib}"/>
     85    <!--<mkdir dir="${web.classes}/vishnu/server"/>
    8686    <copy file="${build.dir}/vishnu/server/VisServlet.class"
    87       todir="${web.classes.dir}/vishnu/server"/>
     87      todir="${web.classes}/vishnu/server"/>-->
    8888
    8989
Note: See TracChangeset for help on using the changeset viewer.