Changeset 32138

Show
Ignore:
Timestamp:
13.02.2018 19:37:02 (13 days 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:
1 added
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/GLIapplet.jnlp

    r32136 r32138  
    4545  </resources> 
    4646  <!--<application-desc main-class="org.greenstone.gatherer.WebGatherer"/>--> 
    47   <applet-desc main-class="org.greenstone.gatherer.GathererApplet" name="GLIapplet" height="50" width="380"> 
     47  <applet-desc main-class="org.greenstone.gatherer.WebGatherer" name="GLIapplet" height="50" width="380"> 
    4848    <param name="gwcgi" value="/greenstone3" /> 
    4949    <param name="gsdl3" value="true" /> 
     
    5353    <all-permissions/> 
    5454  </security> 
    55 </jnlp>  
     55</jnlp> 
  • main/trunk/gli/README_WebGLI.txt

    r32137 r32138  
    12126. 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.  
    1313 
    14 ---------------------- 
    15     # javawebstart.desktop 
     14-------------------------- 
     15FILE: javawebstart.desktop 
     16-------------------------- 
     17     
    1618    # This file makes Ubuntu associate .jnlp files with Java Web Start (javaws) 
    1719    # This file should be adjusted and then copied into ~/.local/share/applications 
     
    2931    MimeType=application/x-java-jnlp-file; 
    3032 
    31 ---------------------- 
     33-------------------------- 
    3234LINKS 
    33 ---------------------- 
     35-------------------------- 
    3436Reading on Java Web Start and Java Native Launch protocol (JNLP). The relationship between Java Web Start and JNLP: 
    3537https://docs.oracle.com/cd/E84882_01/otn/pdf/E84699_01.pdf 
  • main/trunk/gli/makegli.bat

    r31649 r32138  
    141141:: 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 
    142142"%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  
     143"%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 
    143144"%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 
    144145:: "%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

    r32136 r32138  
    412412        page_response.appendChild(applet_elem); 
    413413        applet_elem.setAttribute("ARCHIVE", "SignedGatherer.jar"); // SignedGatherer.jar should be placed in web/applet.  
    414         applet_elem.setAttribute("CODE", "org.greenstone.gatherer.GathererApplet"); 
     414        applet_elem.setAttribute("CODE", "org.greenstone.gatherer.WebGatherer"); 
    415415        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". 
    416416        applet_elem.setAttribute("HEIGHT", "50");