Changeset 1157


Ignore:
Timestamp:
Sep 15, 2009, 12:46:01 PM (13 years ago)
Author:
Nicklas Nordborg
Message:

References #241: Add MeV Analysis file as a file type for bioassay sets

Restructured the source code. Added wrapper that allows us to download and start MeV with an analysis file.

Location:
extensions/net.sf.basedb.mev/trunk
Files:
10 added
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.mev/trunk/META-INF/extensions.xml

    r1153 r1157  
    2929      </factory-class>
    3030      <parameters>
    31         <requireSpotData>true</requireSpotData>
    3231        <title>Start MeV</title>
    3332        <tooltip>
  • extensions/net.sf.basedb.mev/trunk/build.xml

    r1155 r1157  
    3030      <include name="**/*.jar" />
    3131    </fileset>
     32    <fileset dir="resources/jar">
     33      <include name="mev-base.jar" />
     34      <include name="args4j-2.0.9.jar" />
     35    </fileset>
    3236  </path>
    3337
     
    6468  </target>
    6569 
    66   <target 
     70  <target
    6771    name="jar"
    68     depends="build"
    69     description="Creates the extension JAR file"
    70     >
    71     <copy todir="${build}">
     72    depends="jar.server"
     73  />
     74 
     75  <target
     76    name="jar.server"
     77    depends="build.server,jar.webstart"
     78    description="Creates the server-side plugin/extension JAR file"
     79    >
     80    <copy todir="${build}/server">
    7281      <fileset dir="." includes="META-INF/*" />
    7382    </copy>
    74     <replace token="%%plugins.jar%%" value="${jar.name}" file="${build}/META-INF/base-plugins.xml" />
     83    <replace token="%%plugins.jar%%" value="${jar.name}" file="${build}/server/META-INF/base-plugins.xml" />
    7584    <jar
    7685      jarfile="${jar.name}"
    7786      >
    78       <fileset dir="${build}" />
     87      <fileset dir="${build}/server" />
    7988      <fileset dir="." includes="resources/**" />
    8089    </jar>
    8190  </target>
     91
     92  <target
     93    name="jar.webstart"
     94    depends="build.webstart"
     95    description="Creates the webstart wrapper JAR file"
     96    >
     97    <mkdir dir="${build}/server/resources/jar/" />
     98    <jar
     99      jarfile="${build}/server/resources/jar/base-mev-wrapper.jar"
     100      >
     101      <fileset dir="${build}/webstart" includes="**/*" />
     102    </jar>
     103    <signjar
     104      alias="mev-base"
     105      keystore="./jarsign/mev-base.key"
     106      storepass="mev-base"
     107      lazy="true">
     108      <fileset
     109        dir="${build}/server/resources/jar/"
     110        includes="*.jar"
     111      />
     112    </signjar>
     113  </target>
    82114 
    83115  <target
    84116    name="build"
     117    depends="build.server,build.webstart"
     118  />
     119 
     120  <target
     121    name="build.server"
    85122    depends="init,checkjar"
    86     description="Compiles the plugin and put in jar"
    87     >
    88     <mkdir dir="${build}" />
     123    description="Compiles the server-side plugin/extension"
     124    >
     125    <mkdir dir="${build}/server" />
    89126    <javac
    90       encoding="${javac.encoding}"
    91       srcdir="${src}"
    92       destdir="${build}"
     127      srcdir="${src}/server"
     128      destdir="${build}/server"
    93129      debug="true"
    94130      classpathref="classpath"
     131      encoding="${javac.encoding}"
    95132      source="${javac.source}"
    96133      target="${javac.target}"
     
    100137  </target>
    101138 
     139  <target
     140    name="build.webstart"
     141    depends="init,checkjar"
     142    description="Compiles the webstart wrapper"
     143    >
     144    <mkdir dir="${build}/webstart" />
     145    <javac
     146      srcdir="${src}/webstart"
     147      destdir="${build}/webstart"
     148      debug="true"
     149      classpathref="classpath"
     150      encoding="${javac.encoding}"
     151      source="${javac.source}"
     152      target="${javac.target}"
     153      >
     154      <compilerarg value="${javac.arg}" />
     155    </javac>
     156  </target>
    102157  <target
    103158    name="checkjar"
  • extensions/net.sf.basedb.mev/trunk/resources/mev_jnlp.jsp

    r1156 r1157  
    8989
    9090  <resources>
    91     <jar href="mev-base.jar"/> <!-- must be first since main class is here -->
     91    <jar href="base-mev-wrapper.jar" /><!-- must be first since main class is here -->
     92    <jar href="mev-base.jar"/>
    9293    <jar href="mev-algorithm-impl.jar"/>
    9394    <jar href="mev-algorithm-support.jar"/>
     
    145146  </resources>
    146147 
    147   <application-desc main-class="org.tigr.microarray.mev.TMEV">
     148  <application-desc main-class="net.sf.basedb.mev.webstart.StartMev">
    148149    <argument>-fileType</argument>
    149150    <argument><%=mevFileType%></argument>
Note: See TracChangeset for help on using the changeset viewer.