Changeset 3102

Timestamp:

Feb 5, 2007, 11:02:35 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #10 and #352. MeV jsp uses Servlet API to retrieve server information (name,port,...).

Location:

trunk/www/plugins/org/tigr/microarray/mev

Files:

• launch_mev.jsp (modified) (5 diffs)
• others.jsp (moved) (moved from trunk/www/plugins/org/tigr/microarray/mev/others.jnlp) (1 diff)

trunk/www/plugins/org/tigr/microarray/mev/launch_mev.jsp

@@ -5 +5 @@
   This file is part of BASE - BioArray Software Environment.
   Available at http://base.thep.lu.se/
-
-  This file is part of BASE.
 
   BASE is free software; you can redistribute it and/or
@@ -29 +27 @@
 
 <%@ page session="false"
-  import="net.sf.basedb.util.Values"
-  import="net.sf.basedb.plugins.BioAssaySetExporter"
 %>
 <%
 final String SessionID=request.getParameter("ID");
-final int bioassaysetId=Values.getInt(request.getParameter("bioassayset_id"));
-final BioAssaySetExporter base=null;
+final String bioassaysetId=request.getParameter("bioassayset_id");
+final String serverName=request.getServerName();
+final int serverPort=request.getServerPort();
+final String serverPath=request.getContextPath();
 %>
 
@@ -46 +44 @@
  
 <jnlp spec="1.0"
-  codebase="http://localhost:8080/base/plugins/org/tigr/microarray/mev"
+  codebase="http://<%=serverName%>:<%=serverPort%><%=serverPath%>/plugins/org/tigr/microarray/mev"
   version="4.0">
 
@@ -92 +90 @@
     <jar href="vecmath.jar"/>
     <jar href="xerces.jar"/>
-    <extension name="others" href="others.jnlp"/>
+    <extension name="others" href="others.jsp"/>
     <j2se version="1.4.2+"
       max-heap-size="512M"
@@ -98 +96 @@
   </resources>
   <application-desc main-class="org.tigr.microarray.mev.TMEV">
-    <argument>-download_url http://localhost:8080/base/plugins/org/tigr/microarray/mev/export?ID=<%=SessionID%>&bioassayset_id=<%=bioassaysetId%></argument>
+    <argument>-download_url http://<%=serverName%>:<%=serverPort%><%=serverPath%>/plugins/org/tigr/microarray/mev/export?ID=<%=SessionID%>&bioassayset_id=<%=bioassaysetId%></argument>
     <argument>-row 1</argument>
     <argument>-column 20</argument>

trunk/www/plugins/org/tigr/microarray/mev/others.jsp

@@ -26 +26 @@
 -->
 
-<?xml version="1.0" encoding="utf-8"?>
+<%@ page session="false"
+%>
+<%
+final String serverName=request.getServerName();
+final int serverPort=request.getServerPort();
+final String serverPath=request.getContextPath();
+%>
+
+<%@page contentType="application/x-java-jnlp-file"%>
+<%
+response.setHeader("Expires", "0");
+%>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc.//DTD JNLP 1.5//EN" "http://www.netbeans.org/jnlp/DTD/jnlp.dtd">
 
 <jnlp spec="1.0"
-      codebase="http://localhost:8080/base/plugins/org/tigr/microarray/mev"
+  codebase="http://<%=serverName%>:<%=serverPort%><%=serverPath%>/plugins/org/tigr/microarray/mev"
       version="4.0">
   <information>