Changeset 37332

Timestamp:

2023-02-20T11:23:02+13:00 (4 weeks ago)

Author:

davidb

Message:

Improvements to configuring and installing. Now controling the values of the libary_url and ws: urls via properties set in the top-level build.xml

Location:

gs3-extensions/webswing/trunk

Files:

• build.xml (modified) (2 diffs)
• web/etc/webswing.config.in (modified) (2 diffs)
• web/etc/webswing.properties.in (modified) (1 diff)

gs3-extensions/webswing/trunk/build.xml

@@ -60 +60 @@
   </pathconvert>
 
-  <!-- should be set by -D -->
+  <!-- if not set by -D argument from top-level build.xml, then provide some
+       useful/plausable backup-defaults for testing on a local machine -->
   <property name="gsdlos" value="linux"/>
+  <property name="internal.websocket-baseurl" value="ws://localhost:8383"/>
+  <property name="internal.servleturl" value="http://localhost:8383/greenstone3/library"/>
+  <property name="external.servleturl" value="http://localhost:8383/greenstone3/library"/>
+
+  <property name="internal.ws-webswingserver" value="${internal.websocket-baseurl}/webswing-server/"/>  
+  
   <!-- local ext paths -->
   <loadproperties prefix="gs3." srcFile="${basedir}/../../build.properties"/> 
@@ -169 +176 @@
         <filter token="gsdl3srchomeunix" value="${gsdl3srchome.unix}"/>
         <filter token="gsdlos" value="${gsdlos}"/>
+        <filter token="internal-ws-webswingserver" value="${internal.ws-webswingserver}"/>
+        <filter token="internal-servleturl" value="${internal.servlet-url}"/>
+        <filter token="external-servleturl" value="${external.servlet-url}"/>
       </filterset>
     </copy>

gs3-extensions/webswing/trunk/web/etc/webswing.config.in

@@ -28 +28 @@
     "path" : "/gli",
     "security" : {
-      "module" : "INHERITED",
+      "module" : "NONE",
       "config" : { },
       "classPath" : [ ]
@@ -55 +55 @@
       "allowUpload" : true,
       "allowJsLink" : true,
+      "allowLocalClipboard" : true,
       "launcherType" : "Desktop",
       "launcherConfig" : {
         "mainClass" : "org.greenstone.gatherer.GathererProg",
-    "args": "-gsdl @gsdl3srchomeunix@/gs2build -gsdlos @gsdlos@ -gsdl3 @gsdl3srchomeunix@/web -gsdl3src @gsdl3srchomeunix@ -library_url http://localhost:8383/greenstone3/library -webswing"
+    "args": "-gsdl @gsdl3srchomeunix@/gs2build -gsdlos @gsdlos@ -gsdl3 @gsdl3srchomeunix@/web -gsdl3src @gsdl3srchomeunix@ -library_url @external-servleturl@ -webswing"
       },
-      "homeDir" : "@gsdl3srchomeunix@/gli"
+      "homeDir" : "@gsdl3srchomeunix@/gli",
+      "goodbyeUrl" : "/"
     },
-    "maxClients" : 1,
+    "maxClients" : 4,
+    "maxConnections" : 4,
     "allowStealSession" : true,
     "name" : "Greenstone Librarian Interface",
     "sessionMode" : "CONTINUE_FOR_BROWSER",
-    "uploadMaxSize" : 5,
+    "uploadMaxSize" : 100,
     "webHomeDir" : "@gsdl3srchomeunix@/gli"
   }

gs3-extensions/webswing/trunk/web/etc/webswing.properties.in

@@ -7 +7 @@
 
 # websocket URL of this server, if deployed outside embedded Jetty
-webswing.server.websocketUrl = ws://localhost:8383/webswing-server/
+webswing.server.websocketUrl = @internal-ws-webswingserver@
 
 #Custom ssl context configuration for websocket connection to Webswing server