Changeset 32138

Timestamp:

2018-02-13T19:37:02+13:00 (6 years ago)

Author:

ak19

Message:

New class WebGatherer.java to replace GathererApplet.java in JNLP use with Java Web Start. At present it's still an Applet, but now the opening button marked GLI is gone and the dialog requesting the gliserver.pl URL appears immediately instead.

Location:

main/trunk

Files:

• gli/GLIapplet.jnlp (modified) (2 diffs)
• gli/README_WebGLI.txt (modified) (2 diffs)
• gli/makegli.bat (modified) (1 diff)
• gli/src/org/greenstone/gatherer/WebGatherer.java (added)
• greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (1 diff)

main/trunk/gli/GLIapplet.jnlp

@@ -45 +45 @@
   </resources>
   <!--<application-desc main-class="org.greenstone.gatherer.WebGatherer"/>-->
-  <applet-desc main-class="org.greenstone.gatherer.GathererApplet" name="GLIapplet" height="50" width="380">
+  <applet-desc main-class="org.greenstone.gatherer.WebGatherer" name="GLIapplet" height="50" width="380">
     <param name="gwcgi" value="/greenstone3" />
     <param name="gsdl3" value="true" />
@@ -53 +53 @@
     <all-permissions/>
   </security>
-</jnlp> 
+</jnlp>

main/trunk/gli/README_WebGLI.txt

@@ -12 +12 @@
 6. After authorising the GLI to run, the JNLP version of the GLI Applet will eventually run and behave like the usual client-GLI/GLI applet from this point onward. 
 
-----------------------
-    # javawebstart.desktop
+--------------------------
+FILE: javawebstart.desktop
+--------------------------
+    
     # This file makes Ubuntu associate .jnlp files with Java Web Start (javaws)
     # This file should be adjusted and then copied into ~/.local/share/applications
@@ -29 +31 @@
     MimeType=application/x-java-jnlp-file;
 
-----------------------
+--------------------------
 LINKS
-----------------------
+--------------------------
 Reading on Java Web Start and Java Native Launch protocol (JNLP). The relationship between Java Web Start and JNLP:
 https://docs.oracle.com/cd/E84882_01/otn/pdf/E84699_01.pdf

main/trunk/gli/makegli.bat

@@ -141 +141 @@
 :: Sun compiler (tested with 1.5 and 1.6) didn't compile DragTreeSelectionModel.java or MetadataAuditTableModel.java automatically, so we need to put them in explicitly
 "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererProg.java src/org/greenstone/gatherer/util/DragTreeSelectionModel.java src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java 
+"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/WebGatherer.java
 "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet.java
 :: "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet4gs3.java

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

@@ -412 +412 @@
         page_response.appendChild(applet_elem);
         applet_elem.setAttribute("ARCHIVE", "SignedGatherer.jar"); // SignedGatherer.jar should be placed in web/applet. 
-        applet_elem.setAttribute("CODE", "org.greenstone.gatherer.GathererApplet");
+        applet_elem.setAttribute("CODE", "org.greenstone.gatherer.WebGatherer");
         applet_elem.setAttribute("CODEBASE", "applet"); // SignedGatherer.jar is in web/applet. But CODEBASE is the *URL* path to the (jar) file containing the main class, and is relative to documentroot "web".
         applet_elem.setAttribute("HEIGHT", "50");