Ignore:
Timestamp:
Nov 23, 2007, 3:50:59 PM (14 years ago)
Author:
mbayer
Message:

first commit of this branch

  • have added JSP page for custom input.html to take parameters that allows the plugin to configure an entire experiment itself
  • have modified the plugin class to take the parameters and print them out -- normal input disabled right now
  • build file modified slightly -- new targets included etc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/uk_ac_ebi_Tab2MageImporter/build.xml

    r473 r486  
    11<?xml version="1.0" encoding="UTF-8"?>
    2 <project name="EBIPlugin"  default="build.plugin" basedir="."  >
     2<project name="EBIPlugin" default="copyToServer" basedir=".">
    33
    44  <!-- variables used -->
     
    88  <property name="util.src.plugins" location="${src.plugins}/uk/ac/ebi/nugo/common/" />
    99  <property name="core.src.plugins" location="${src.plugins}/uk/ac/ebi/nugo/plugins" />
    10    
    11   <property name="javac.arg" value="-Xlint:unchecked"
    12       description="Extra arguments sent to Java compiler" />
     10
    1311  <property name="plugin.name" value="Tab2MageImporter" />
    1412  <property name="utils.name" value="ebi-plugins-utils" />
     13  <property name="jspDir" location="jsp" />
    1514 
     15  <!-- tomcat -->
     16  <!-- property name="tomcat.home" value="${env.CATALINA_HOME}" / -->
     17  <property name="tomcat.home" value="C:\tomcat\apache-tomcat-6.0.13"/>
     18  <property name="tomcat.shutdownscript" value="${tomcat.home}/bin/shutdown.bat" />
     19  <property name="tomcat.startupscript" value="${tomcat.home}/bin/startup.bat" />
     20 
     21
    1622  <!-- set up classpath for compiling -->
    1723  <path id="nugo.plugin.compile.classpath">
    1824    <fileset dir="${lib.plugins}">
    19       <include name="**/*.jar"/>
     25      <include name="**/*.jar" />
    2026    </fileset>
    2127  </path>
    22    
    23   <target
    24     name="build.plugin"
    25     depends= "utils,plugin.compile"
    26     description="Compile the plugin"
    27   />
    28    
    29   <target name="utils"
    30     depends="clean"
    31     description="compile the common ebi -plugin util classes"
    32     >
    33     <javac
    34       encoding="ISO-8859-1"
    35       srcdir="${util.src.plugins}"
    36       destdir="${bin.plugins}"
    37       classpathref="nugo.plugin.compile.classpath"
    38       debug="true"
    39       deprecation="true"
    40       >
    41       <compilerarg value="${javac.arg}" />
     28
     29  <target name="build.plugin" depends="utils,plugin.compile" description="Compile the plugin" />
     30
     31  <target name="utils" depends="clean" description="compile the common ebi -plugin util classes">
     32    <javac encoding="ISO-8859-1" srcdir="${util.src.plugins}" destdir="${bin.plugins}" classpathref="nugo.plugin.compile.classpath" debug="true" deprecation="true">
    4233    </javac>
    43     <jar
    44       basedir="${bin.plugins}"
    45       jarfile="${lib.plugins}\ebi-plugins-utils.jar"
    46     />
    47     <jar
    48       basedir="${bin.plugins}"
    49       jarfile="${utils.name}.jar"
    50     />
     34    <jar basedir="${bin.plugins}" jarfile="${lib.plugins}\ebi-plugins-utils.jar" />
     35    <jar basedir="${bin.plugins}" jarfile="${utils.name}.jar" />
    5136    <delete includeemptydirs="true">
    52       <fileset dir="${bin.plugins}" includes="**/*"/>
     37      <fileset dir="${bin.plugins}" includes="**/*" />
    5338    </delete>
    5439  </target>
    55  
    56   <target
    57       name="plugin.compile"
    58       depends="clean"
    59       description="compile the ta2mage importer plugin source code, without dependencies and put in a jar file"
    60       >
    61       <javac
    62         encoding="ISO-8859-1"
    63         srcdir="${core.src.plugins}"
    64         destdir="${bin.plugins}"
    65         classpathref="nugo.plugin.compile.classpath"
    66         debug="true"
    67         deprecation="true"
    68         >
    69         <compilerarg value="${javac.arg}" />
    70       </javac>
    71       <jar
    72         basedir="${bin.plugins}"
    73         jarfile="${plugin.name}.jar"
    74         manifest="MANIFEST.MF"
    75    
    76       />
    77       <delete includeemptydirs="true">
    78         <fileset dir="${bin.plugins}" includes="**/*"/>
    79       </delete>
     40
     41  <target name="plugin.compile" depends="clean" description="compile the ta2mage importer plugin source code, without dependencies and put in a jar file">
     42    <javac source="1.5" target="1.5" encoding="ISO-8859-1" srcdir="${core.src.plugins}" destdir="${bin.plugins}" classpathref="nugo.plugin.compile.classpath" debug="true" deprecation="true">
     43    </javac>
     44    <jar basedir="${bin.plugins}" jarfile="${plugin.name}.jar" manifest="MANIFEST.MF" />
     45    <delete includeemptydirs="true">
     46      <fileset dir="${bin.plugins}" includes="**/*" />
     47    </delete>
    8048  </target>
    81  
    82   <target
    83       name="all"
    84       depends="clean"
    85       description="compile all the ta2mage importer plugin source code with dependencies and put in a jar file"
    86       >
    87       <javac
    88         encoding="ISO-8859-1"
    89         srcdir="${src.plugins}"
    90         destdir="${bin.plugins}"
    91         classpathref="nugo.plugin.compile.classpath"
    92         debug="true"
    93         deprecation="true"
    94         >
    95         <compilerarg value="${javac.arg}" />
    96       </javac>
    97       <jar
    98         basedir="${bin.plugins}"
    99         jarfile="${plugin.name}.jar"
    100         manifest="MANIFEST.MF"
    101       />
     49
     50  <target name="all" depends="clean" description="compile all the ta2mage importer plugin source code with dependencies and put in a jar file">
     51    <javac source="1.5" target="1.5" encoding="ISO-8859-1" srcdir="${src.plugins}" destdir="${bin.plugins}" classpathref="nugo.plugin.compile.classpath" debug="true" deprecation="true">
     52    </javac>
     53    <jar basedir="${bin.plugins}" jarfile="${plugin.name}.jar" manifest="MANIFEST.MF" />
    10254  </target>
    103  
    104   <target
    105       name="clean"
    106       depends=""
    107       description="clean/clear the bin folder"
    108       >
    109       <delete includeemptydirs="true">
    110         <fileset dir="${bin.plugins}" includes="**/*"/>
    111       </delete>
     55
     56  <target name="clean" depends="" description="clean/clear the bin folder">
     57    <delete includeemptydirs="true">
     58      <fileset dir="${bin.plugins}" includes="**/*" />
     59    </delete>
    11260  </target>
    113  
    114 </project>
     61
     62
     63  <target name="copyJSPs">
     64    <copy todir="C:\tomcat\apache-tomcat-6.0.13\webapps\base\plugins\" verbose="true">
     65      <fileset dir="${jspDir}" />
     66    </copy>
     67  </target>
     68
     69
     70  <target name="copyToServer" depends="build.plugin,copyJSPs">
     71    <copy file="${plugin.name}.jar" todir="C:\tomcat\apache-tomcat-6.0.13\webapps\base\WEB-INF\lib" verbose="true" />
     72    <!-- now restart tomcat to reload the application -->
     73    <echo message="tomcat home = "/>
     74    <echo message="${tomcat.home}"/>
     75    <echo message="shutting down tomcat" />
     76    <exec executable="${tomcat.shutdownscript}" spawn="yes" />
     77    <echo message="starting up tomcat" />
     78    <exec executable="${tomcat.startupscript}" spawn="yes" />
     79  </target>
     80
     81
     82
     83</project>
Note: See TracChangeset for help on using the changeset viewer.