Changeset 995

Timestamp:

Mar 25, 2009, 8:48:27 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #162: Upgrade to MeV 4.3

Got rid of hardcoded 'http' in the jnlp file. Now it should work even if BASE is installed on a secure (https) web server.

Location:

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

Files:

• launch_mev.jsp (modified) (1 diff)
• others.jsp (modified) (1 diff)

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

@@ -39 +39 @@
 final String ID = sc.getId();
 final int bioAssaySetId = Values.getInt(request.getParameter("bioassayset_id"));
+final String scheme = request.getScheme();
 final String serverName = request.getServerName();
 final int serverPort = request.getServerPort();
 final String homeUrl = ExtensionsControl.getHomeUrl("net.sf.basedb.mev.launchmev");
-final String fullHomeUrl = "http://" + serverName + ":" + serverPort + homeUrl;
+final String fullHomeUrl = scheme + "://" + serverName + ":" + serverPort + homeUrl;
 final int jvmMaxMemory = Values.getInt(sc.getUserClientSetting("net.sf.basedb.mev.launchmev.jvm.maxmemory"), 512);
 out.clearBuffer();

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

@@ -32 +32 @@
 <%
 response.setHeader("Expires", "0");
+final String scheme = request.getScheme();
 final String serverName = request.getServerName();
 final int serverPort = request.getServerPort();
 final String homeUrl = ExtensionsControl.getHomeUrl("net.sf.basedb.mev.launchmev");
-final String fullHomeUrl = "http://" + serverName + ":" + serverPort + homeUrl;
+final String fullHomeUrl = scheme + "://" + serverName + ":" + serverPort + homeUrl;
 out.clearBuffer();
 %><?xml version="1.0" encoding="UTF-8"?>