Changeset 1157

Timestamp:

Sep 15, 2009, 12:46:01 PM (14 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:

• META-INF/extensions.xml (modified) (1 diff)
• build.xml (modified) (3 diffs)
• resources/mev_jnlp.jsp (modified) (2 diffs)
• src/server (added)
• src/server/net (moved) (moved from extensions/net.sf.basedb.mev/trunk/src/net)
• src/webstart (added)
• src/webstart/net (added)
• src/webstart/net/sf (added)
• src/webstart/net/sf/basedb (added)
• src/webstart/net/sf/basedb/mev (added)
• src/webstart/net/sf/basedb/mev/webstart (added)
• src/webstart/net/sf/basedb/mev/webstart/CmdLine.java (added)
• src/webstart/net/sf/basedb/mev/webstart/MevUtil.java (added)
• src/webstart/net/sf/basedb/mev/webstart/StartMev.java (added)

extensions/net.sf.basedb.mev/trunk/META-INF/extensions.xml

@@ -29 +29 @@
       </factory-class>
       <parameters>
-        <requireSpotData>true</requireSpotData>
         <title>Start MeV</title>
         <tooltip>

extensions/net.sf.basedb.mev/trunk/build.xml

@@ -30 +30 @@
       <include name="**/*.jar" />
     </fileset>
+    <fileset dir="resources/jar">
+      <include name="mev-base.jar" />
+      <include name="args4j-2.0.9.jar" />
+    </fileset>
   </path>
 
@@ -64 +68 @@
   </target> 
   
-  <target 
+  <target
     name="jar"
-    depends="build"
-    description="Creates the extension JAR file"
-    >
-    <copy todir="${build}">
+    depends="jar.server"
+  />
+  
+  <target 
+    name="jar.server"
+    depends="build.server,jar.webstart"
+    description="Creates the server-side plugin/extension JAR file"
+    >
+    <copy todir="${build}/server">
       <fileset dir="." includes="META-INF/*" />
     </copy>
-    <replace token="%%plugins.jar%%" value="${jar.name}" file="${build}/META-INF/base-plugins.xml" />
+    <replace token="%%plugins.jar%%" value="${jar.name}" file="${build}/server/META-INF/base-plugins.xml" />
     <jar 
       jarfile="${jar.name}" 
       >
-      <fileset dir="${build}" />
+      <fileset dir="${build}/server" />
       <fileset dir="." includes="resources/**" />
     </jar>
   </target>
+
+  <target 
+    name="jar.webstart"
+    depends="build.webstart"
+    description="Creates the webstart wrapper JAR file"
+    >
+    <mkdir dir="${build}/server/resources/jar/" />
+    <jar
+      jarfile="${build}/server/resources/jar/base-mev-wrapper.jar"
+      >
+      <fileset dir="${build}/webstart" includes="**/*" />
+    </jar>
+    <signjar
+      alias="mev-base" 
+      keystore="./jarsign/mev-base.key"
+      storepass="mev-base"
+      lazy="true">
+      <fileset 
+        dir="${build}/server/resources/jar/"
+        includes="*.jar" 
+      />
+    </signjar>
+  </target>
   
   <target 
     name="build"
+    depends="build.server,build.webstart"
+  />
+  
+  <target 
+    name="build.server"
     depends="init,checkjar"
-    description="Compiles the plugin and put in jar"
-    >
-    <mkdir dir="${build}" />
+    description="Compiles the server-side plugin/extension"
+    >
+    <mkdir dir="${build}/server" />
     <javac 
-      encoding="${javac.encoding}" 
-      srcdir="${src}" 
-      destdir="${build}" 
+      srcdir="${src}/server" 
+      destdir="${build}/server" 
       debug="true" 
       classpathref="classpath"
+      encoding="${javac.encoding}" 
       source="${javac.source}"
       target="${javac.target}"
@@ -100 +137 @@
   </target>
   
+  <target 
+    name="build.webstart"
+    depends="init,checkjar"
+    description="Compiles the webstart wrapper"
+    >
+    <mkdir dir="${build}/webstart" />
+    <javac 
+      srcdir="${src}/webstart" 
+      destdir="${build}/webstart" 
+      debug="true" 
+      classpathref="classpath"
+      encoding="${javac.encoding}" 
+      source="${javac.source}"
+      target="${javac.target}"
+      >
+      <compilerarg value="${javac.arg}" />
+    </javac>
+  </target>
   <target 
     name="checkjar"

extensions/net.sf.basedb.mev/trunk/resources/mev_jnlp.jsp

@@ -89 +89 @@
 
   <resources>
-    <jar href="mev-base.jar"/> <!-- must be first since main class is here -->
+    <jar href="base-mev-wrapper.jar" /><!-- must be first since main class is here -->
+    <jar href="mev-base.jar"/> 
     <jar href="mev-algorithm-impl.jar"/>
     <jar href="mev-algorithm-support.jar"/>
@@ -145 +146 @@
   </resources>
   
-  <application-desc main-class="org.tigr.microarray.mev.TMEV">
+  <application-desc main-class="net.sf.basedb.mev.webstart.StartMev">
     <argument>-fileType</argument>
     <argument><%=mevFileType%></argument>