Changeset 4391


Ignore:
Timestamp:
Dec 5, 2012, 2:43:28 PM (10 years ago)
Author:
olle
Message:

Refs #793. Ant build.xml files updated to refer to environment variable $CATALINA_BASE instead of $CATALINA_HOME:

  1. build.xml
  2. api/core/build.xml
  3. api/core/test/build.xml
  4. api/waf/build.xml
  5. client/ftpd/build.xml
  6. client/servlet/build.xml
  7. client/servlet/test/build.xml
  8. contrib/immun/build.xml
  9. contrib/SpectrumFileInspector/build.xml
  10. contrib/SpectrumLibraryExport/build.xml
  11. misc/myExtension/build.xml
  12. plugin/build.xml
  13. plugin/test/build.xml
Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/api/core/build.xml

    r4055 r4391  
    188188  <!-- ================================= -->
    189189  <target name="dev"
    190           description="copmiles files directly into $CATALINA_HOME/webapps/proteios/WEB-INF/classes">
     190          description="compiles files directly into $CATALINA_BASE/webapps/proteios/WEB-INF/classes">
    191191    <property environment="env"/>
    192192    <antcall target="compile">
    193193      <param name="build"
    194              value="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     194             value="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    195195    </antcall>
    196196  </target>
     
    200200    <antcall target="hibernate">
    201201      <param name="build"
    202              value="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     202             value="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    203203    </antcall>
    204204  </target>
  • trunk/api/core/test/build.xml

    r3716 r4391  
    4343      <include name="**/*.jar" />
    4444    </fileset>
    45     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     45    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    4646      <include name="*.jar" />
    4747    </fileset>
    4848
    49     <pathelement location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     49    <pathelement location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    5050    <dirset dir="${build}" />
    5151
  • trunk/api/waf/build.xml

    r3979 r4391  
    7575  <!-- ================================= -->
    7676  <target name="dev"
    77           description="copmiles files directly into $CATALINA_HOME/webapps/proteios/WEB-INF/classes">
     77          description="compiles files directly into $CATALINA_BASE/webapps/proteios/WEB-INF/classes">
    7878    <property environment="env" />
    7979    <antcall target="compile">
    8080      <param name="build"
    81              value="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     81             value="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    8282    </antcall>
    8383  </target>
  • trunk/build.xml

    r4380 r4391  
    290290  <target name="clean-dev">
    291291    <property environment="env"/>
    292     <delete dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes/org"/>
    293     <delete dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes/se"/>
     292    <delete dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes/org"/>
     293    <delete dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes/se"/>
    294294    <delete>
    295       <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     295      <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    296296        <include name="proteios*.jar"/>
    297297      </fileset>
  • trunk/client/ftpd/build.xml

    r3979 r4391  
    7171  <!-- ================================= -->
    7272  <target name="dev"
    73           description="copmiles files directly into $CATALINA_HOME/webapps/proteios/WEB-INF/classes">
     73          description="compiles files directly into $CATALINA_BASE/webapps/proteios/WEB-INF/classes">
    7474    <property environment="env"/>
    7575    <antcall target="compile">
    7676      <param name="build"
    77              value="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     77             value="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    7878    </antcall>
    7979  </target>
  • trunk/client/servlet/build.xml

    r3895 r4391  
    9595  <!-- ================================= -->
    9696  <target name="dev"
    97           description="copmiles files directly into $CATALINA_HOME/webapps/proteios/WEB-INF/classes">
     97          description="compiles files directly into $CATALINA_BASE/webapps/proteios/WEB-INF/classes">
    9898    <property environment="env"/>
    9999    <antcall target="compile">
    100100      <param name="build"
    101              value="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     101             value="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    102102    </antcall>
    103     <copy todir="${env.CATALINA_HOME}/webapps/proteios/static">
     103    <copy todir="${env.CATALINA_BASE}/webapps/proteios/static">
    104104      <fileset dir="www/static">
    105105        <exclude name="**/static/img/orig/**" />
  • trunk/client/servlet/test/build.xml

    r3895 r4391  
    4545    </fileset>
    4646    <dirset dir="../build" />
    47     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     47    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    4848      <include name="*.jar" />
    4949    </fileset>
    5050 
    51     <pathelement location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     51    <pathelement location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    5252    <dirset dir="${build}" />
    5353  </path>
  • trunk/contrib/SpectrumFileInspector/build.xml

    r3623 r4391  
    1515  <property name="src" location="src" />
    1616  <property name="build" location="build" />
    17   <property name="dist" location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib" />
     17  <property name="dist" location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib" />
    1818  <property name="test" location="test" />
    1919  <path id="classpath">
    20     <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_HOME -->
    21     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     20    <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_BASE -->
     21    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    2222      <include name="**/*.jar" />
    2323    </fileset>
     
    9393  <target name="testVersion">
    9494    <java classname="org.proteios.core.Application" classpathref="classpath" outputproperty="proteios-version" />
    95     <fail unless="proteios-version" message="Please set CATALINA_HOME and make sure proteios is installed" />
     95    <fail unless="proteios-version" message="Please set CATALINA_BASE and make sure proteios is installed" />
    9696  </target>
    9797 
  • trunk/contrib/SpectrumLibraryExport/build.xml

    r3698 r4391  
    1515  <property name="src" location="src" />
    1616  <property name="build" location="build" />
    17   <property name="dist" location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib" />
     17  <property name="dist" location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib" />
    1818  <property name="test" location="test" />
    1919  <path id="classpath">
    20     <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_HOME -->
    21     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     20    <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_BASE -->
     21    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    2222      <include name="**/*.jar" />
    2323    </fileset>
     
    8989  <target name="testVersion">
    9090    <java classname="org.proteios.core.Application" classpathref="classpath" outputproperty="proteios-version" />
    91     <fail unless="proteios-version" message="Please set CATALINA_HOME and make sure proteios is installed" />
     91    <fail unless="proteios-version" message="Please set CATALINA_BASE and make sure proteios is installed" />
    9292  </target>
    9393 
  • trunk/contrib/immun/build.xml

    r3623 r4391  
    3737  <property name="src" location="src" />
    3838  <property name="build" location="build" />
    39   <property name="dist" location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib" />
     39  <property name="dist" location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib" />
    4040  <property name="test" location="test" />
    4141  <property environment="env" />
    4242  <path id="classpath">
    43     <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_HOME -->
    44     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     43    <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_BASE -->
     44    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    4545      <include name="**/*.jar" />
    4646    </fileset>
     
    102102  <target name="testVersion">
    103103    <java classname="org.proteios.core.Application" classpathref="classpath" outputproperty="proteios-version" />
    104     <fail unless="proteios-version" message="Please set CATALINA_HOME and make sure proteios is installed" />
     104    <fail unless="proteios-version" message="Please set CATALINA_BASE and make sure proteios is installed" />
    105105  </target>
    106106 
  • trunk/misc/myExtension/build.xml

    r3987 r4391  
    1919 <property name="baseurl" value="http://www.proteios.org/trac/raw-attachment/wiki/Extensions/Manual"/>
    2020  <path id="classpath">
    21     <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_HOME -->
    22     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     21    <!-- Point it to your tomcat installation should work nicely if you have set CATALINA_BASE -->
     22    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    2323      <include name="**/*.jar" />
    2424    </fileset>
    25   <pathelement location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     25  <pathelement location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    2626  </path>
    2727
     
    9191  <target name="testVersion">
    9292    <java classname="org.proteios.core.Application" classpathref="classpath" outputproperty="proteios-version" />
    93     <fail unless="proteios-version" message="Please set CATALINA_HOME and make sure proteios is installed" />
     93    <fail unless="proteios-version" message="Please set CATALINA_BASE and make sure proteios is installed" />
    9494  </target>
    9595 
  • trunk/plugin/build.xml

    r3979 r4391  
    8181  <!-- ================================= -->
    8282  <target name="dev"
    83           description="copmiles files directly into $CATALINA_HOME/webapps/proteios/WEB-INF/classes">
     83          description="compiles files directly into $CATALINA_BASE/webapps/proteios/WEB-INF/classes">
    8484    <property environment="env"/>
    8585    <antcall target="compile">
    8686      <param name="build"
    87              value="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     87             value="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    8888    </antcall>
    8989  </target>
  • trunk/plugin/test/build.xml

    r3716 r4391  
    4343      <include name="**/*.jar" />
    4444    </fileset>
    45     <fileset dir="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/lib">
     45    <fileset dir="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/lib">
    4646      <include name="*.jar" />
    4747    </fileset>
     
    5050    <dirset dir="../conf" />
    5151
    52     <pathelement location="${env.CATALINA_HOME}/webapps/proteios/WEB-INF/classes"/>
     52    <pathelement location="${env.CATALINA_BASE}/webapps/proteios/WEB-INF/classes"/>
    5353    <dirset dir="${build}" />
    5454  </path>
Note: See TracChangeset for help on using the changeset viewer.