Changeset 32136

Show
Ignore:
Timestamp:
13.02.2018 18:46:04 (13 days ago)
Author:
ak19
Message:

Committing the first checkpoint of getting the GLIApplet to work with Java Web Start/JNLP, along with the important gli\README_WebGLI.txt with instructions. This commit uses the Java Web Start as fallback if the GLI applet can't be displayed. Some strings are hardcoded in the version of the gli\GLIApplet.jnlp file at this point.

Location:
main/trunk
Files:
3 added
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/makejar.bat

    r31649 r32136  
    165165:: include all the properties (and other loose) files in the toplevel classes directory into the GLI.jar 
    166166:: (Do something similar to get any and all folders inside the toplevel jar folder included into GLI.jar?) 
    167 "%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help %propfiles% -C classes images -C classes xml -C jar com -C jar de -C jar org -C jar javax 
    168  
     167:: Note that order of manifest and jar file should match order of "mf" vs "fm" params to jar command 
     168"%JARPATH%\jar" cmf manifest.mf GLI.jar .java.policy metadata.zip %optional% help %propfiles% -C classes images -C classes xml -C jar com -C jar de -C jar org -C jar javax 
     169 
     170:: Not (yet) included in the new manifest.mf: 
     171:: Codebase: http://localhost:8383/greenstone3/applet 
    169172 
    170173:: Tidy up 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

    r32127 r32136  
    427427        gsdl3_param_elem.setAttribute("value", "true"); 
    428428        applet_elem.appendChild(gsdl3_param_elem); 
    429          
    430         Node default_text = doc.createTextNode("GLI applet"); 
     429                 
     430        // When an applet doesn't work in the browser, set the default display text to provide a link to the JNLP file to run with Java Web Start 
     431        // The display text will be: 
     432        //      Applets don't seem to work in your browser. In place of the GLI Applet, try running its alternative <a href="applet/GLIapplet.jnlp">Java Web Start (JNLP) version</a> 
     433        Node default_text = doc.createTextNode("Applets don't seem to work in your browser. In place of the GLI Applet, try running its alternative "); 
     434        Element link_to_jnlp = doc.createElement("a"); 
     435        link_to_jnlp.setAttribute("href", "applet/GLIapplet.jnlp"); 
     436        Node anchor_text = doc.createTextNode("Java Web Start (JNLP) version"); 
     437        link_to_jnlp.appendChild(anchor_text);       
    431438        applet_elem.appendChild(default_text); 
     439        applet_elem.appendChild(link_to_jnlp); 
    432440         
    433441        return page_response;