Changeset 38949

Timestamp:

2024-04-23T19:43:27+12:00 (11 hours ago)

Author:

anupama

Message:

Like GsdlCollageApplet, JPhind when run as a commandline application or applet (a.o.t. webswing application/applet) also needs webswing-api.jar to be in the web/applet folder, since we started importing webswing packages (even if not run as a webswing program). 1. Adjusted the now unused service PhindPhraseBrowse's applet archive attribute to include this jar file in the list of those needed. 2. Added the jar mention in the comment to JPhind.java with a sample command on how to successfully launch JPhind from the commandline. 3. build.xml's compile-core target now tries to put this jar file into web/applet if it doesn't yet exist there. But this assumes that ext/webswing has already been setup at this stage, which I think is the case.

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (4 diffs)
• src/java/org/greenstone/applet/phind/JPhind.java (modified) (1 diff)
• src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -3499 +3499 @@
 
   <target name="update-core" depends="init,svnupdate-core,clean-core,compile-core"
-    description="Update only the Greenstone core" />
+      description="Update only the Greenstone core" />
   
   <target name="svnupdate-core" unless="nosvn.mode">
@@ -3511 +3511 @@
 
   <target name="clean-core"
-    description="Clean only the Greenstone core">
+      description="Clean only the Greenstone core">
     <!-- should this delete the gsdl3.jar from web/WEB-INF?? -->
     <delete dir="${build.home}"/>
@@ -3618 +3618 @@
     <mkdir dir="${web.applet}"/>
     <copy file="${build.home}/GsdlCollageApplet.jar" todir="${web.applet}"/>
-    <!-- TODO: Does GsdlCollageApplet (like phind) also needs xercesImpl.jar and xml-apis.jar to be in web/applet??? -->
-
+    
+    <!-- phind and GsdlCollage also need webswing-api.jar to be in web/applet -->
+    <if>
+      <bool>
+    <and>
+      <not><available file="${web.applet}/webswing-api.jar"/></not>
+      <available file="${web.writablehome}/ext/webswing/api/webswing-api.jar"/>
+    </and>
+      </bool>
+      <copy file="${web.writablehome}/ext/webswing/api/webswing-api.jar" todir="${web.applet}"/>
+      <else>
+    <echo>Could not find ${web.writablehome}/ext/webswing/api/webswing-api.jar</echo>
+    <echo>to copy into ${web.applet}</echo>
+      </else>
+    </if>
+    
    <if>
       <bool><istrue value="${tomcat.islocal}"/></bool>
@@ -3719 +3733 @@
       <copy file="${basedir}/TransformingLibrary.launch.in" tofile="${basedir}/TransformingLibrary.launch" filtering="true" overwrite="true"/>
     </if>
-<!--
-    <if>
-      <bool><not><available file="${basedir}/LibraryCommandline.launch"/></not></bool>          
-      <copy file="${basedir}/LibraryCommandline.launch.in" tofile="${basedir}/LibraryCommandline.launch" filtering="true" overwrite="true"/>
-    </if>
--->
+    <!--
+    <if>
+    <bool><not><available file="${basedir}/LibraryCommandline.launch"/></not></bool>        
+    <copy file="${basedir}/LibraryCommandline.launch.in" tofile="${basedir}/LibraryCommandline.launch" filtering="true" overwrite="true"/>
+    </if>
+    -->
   </target>
   

main/trunk/greenstone3/src/java/org/greenstone/applet/phind/JPhind.java

@@ -41 +41 @@
 To run this applet as an application, for which purpose this class has a main() method, run as:
 
-java -cp ./web/WEB-INF/lib/gsdl3.jar:./web/WEB-INF/lib/gutil.jar:./web/applet/phind.jar:./web/applet/xercesImpl.jar:./web/applet/xml-apis.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.phind.JPhind "http://localhost:8383/greenstone3/library?a=a&rt=d&s=PhindApplet&c=tudor" --collection tudor --classifier 1 --phindcgi "?a=a&rt=r&s=PhindApplet&o=xml&ro=1" --library "library" --backdrop "interfaces/default/images/phindbg1.jpg" --xtraParams "orientation=vertical&depth=2&resultorder=L,l,E,e,D,d&fontsize=10&blocksize=10"
+java -cp ./web/WEB-INF/lib/gsdl3.jar:./web/WEB-INF/lib/gutil.jar:./web/applet/phind.jar:./web/applet/webswing-api.jar:./web/applet/xercesImpl.jar:./web/applet/xml-apis.jar:./web/WEB-INF/lib/log4j-1.2.8.jar:./web/WEB-INF/classes org.greenstone.applet.phind.JPhind "http://localhost:8383/greenstone3/library?a=a&rt=d&s=PhindApplet&c=tudor" --collection tudor --classifier 1 --phindcgi "?a=a&rt=r&s=PhindApplet&o=xml&ro=1" --library "library" --backdrop "interfaces/default/images/phindbg1.jpg" --xtraParams "orientation=vertical&depth=2&resultorder=L,l,E,e,D,d&fontsize=10&blocksize=10"
 
 Basic version:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -102 +102 @@
     // this is left blank at this end, and must be filled in by applet action - if the library name is not needed, this param is left out
     // phindcgi param now is not complete - library must be prepended to it.
-    String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='applet' CODE='org.greenstone.applet.phind.JPhind.class' ARCHIVE='phind.jar, xercesImpl.jar, xml-apis.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE=''/> <PARAM NAME='phindcgi' VALUE='?";
+    String app_info = "<"+GSXML.APPLET_ELEM+" CODEBASE='applet' CODE='org.greenstone.applet.phind.JPhind.class' ARCHIVE='phind.jar, xercesImpl.jar, xml-apis.jar, webswing-api.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE=''/> <PARAM NAME='phindcgi' VALUE='?";
     app_info += GSParams.ACTION +"=a&amp;"+GSParams.REQUEST_TYPE +"=r&amp;"+GSParams.SERVICE+"="+PHIND_SERVICE+"&amp;"+GSParams.OUTPUT+"=xml&amp;"+GSParams.RESPONSE_ONLY+"=1'/>";
     app_info +="<PARAM NAME='collection'   VALUE='";