Changeset 995


Ignore:
Timestamp:
Mar 25, 2009, 8:48:27 AM (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.mev/trunk/resources/launch_mev.jsp

    r978 r995  
    3939final String ID = sc.getId();
    4040final int bioAssaySetId = Values.getInt(request.getParameter("bioassayset_id"));
     41final String scheme = request.getScheme();
    4142final String serverName = request.getServerName();
    4243final int serverPort = request.getServerPort();
    4344final String homeUrl = ExtensionsControl.getHomeUrl("net.sf.basedb.mev.launchmev");
    44 final String fullHomeUrl = "http://" + serverName + ":" + serverPort + homeUrl;
     45final String fullHomeUrl = scheme + "://" + serverName + ":" + serverPort + homeUrl;
    4546final int jvmMaxMemory = Values.getInt(sc.getUserClientSetting("net.sf.basedb.mev.launchmev.jvm.maxmemory"), 512);
    4647out.clearBuffer();
  • extensions/net.sf.basedb.mev/trunk/resources/others.jsp

    r978 r995  
    3232<%
    3333response.setHeader("Expires", "0");
     34final String scheme = request.getScheme();
    3435final String serverName = request.getServerName();
    3536final int serverPort = request.getServerPort();
    3637final String homeUrl = ExtensionsControl.getHomeUrl("net.sf.basedb.mev.launchmev");
    37 final String fullHomeUrl = "http://" + serverName + ":" + serverPort + homeUrl;
     38final String fullHomeUrl = scheme + "://" + serverName + ":" + serverPort + homeUrl;
    3839out.clearBuffer();
    3940%><?xml version="1.0" encoding="UTF-8"?>
Note: See TracChangeset for help on using the changeset viewer.