Changeset 32136 for main/trunk

Timestamp:

2018-02-13T18:46:04+13:00 (6 years 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:

• gli/GLIapplet.jnlp (added)
• gli/README_WebGLI.txt (added)
• gli/makejar.bat (modified) (1 diff)
• gli/manifest.mf (added)
• greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (1 diff)

main/trunk/gli/makejar.bat

@@ -165 +165 @@
 :: include all the properties (and other loose) files in the toplevel classes directory into the GLI.jar
 :: (Do something similar to get any and all folders inside the toplevel jar folder included into GLI.jar?)
-"%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
-
+:: Note that order of manifest and jar file should match order of "mf" vs "fm" params to jar command
+"%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
+
+:: Not (yet) included in the new manifest.mf:
+:: Codebase: http://localhost:8383/greenstone3/applet
 
 :: Tidy up

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -427 +427 @@
         gsdl3_param_elem.setAttribute("value", "true");
         applet_elem.appendChild(gsdl3_param_elem);
-        
-        Node default_text = doc.createTextNode("GLI applet");
+                
+        // 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
+        // The display text will be:
+        //      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>
+        Node default_text = doc.createTextNode("Applets don't seem to work in your browser. In place of the GLI Applet, try running its alternative ");
+        Element link_to_jnlp = doc.createElement("a");
+        link_to_jnlp.setAttribute("href", "applet/GLIapplet.jnlp");
+        Node anchor_text = doc.createTextNode("Java Web Start (JNLP) version");
+        link_to_jnlp.appendChild(anchor_text);      
         applet_elem.appendChild(default_text);
+        applet_elem.appendChild(link_to_jnlp);
         
         return page_response;