Changeset 38253 for gs3-installations

Timestamp:

2023-09-28T17:03:09+13:00 (8 months ago)

Author:

davidb

Message:

Changes so location on this directory/GSDL3SRCHOME on disk fed into web.xml, which is then used by the Java code

Location:

gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet

Files:

• INSTALL.bat (modified) (1 diff)
• src/main/java/org/greenstone/tabletop/ConnectProxyServlet.java (modified) (1 diff)
• src/main/webapp/WEB-INF/web.xml (modified) (1 diff)
• src/main/webapp/WEB-INF/web.xml.in (added)

gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet/INSTALL.bat

@@ -1 +1 @@
 @echo off
+
+if "%GSDL3SRCHOME%" == "" (
+   echo The environment variable GSDL3SRCHOME is not set
+   echo Have you source Greenstone3's SETUP.bat?
+   exit 1
+)
+
+set "GSDL3SRCHOME_UNIX=%GSDL3SRCHOME:\=/%"
+::set "GSDL3SRCHOME_UNIX_ESCAPED=%GSDL3SRCHOME_UNIX:/=\/%"
+
+:: Assuming 'sed' is on your PATH, from running Greenstone3's SETUP.bat
+
+:: sed.exe "s!@GSDL3SRCHOME@!%GSDL3SRCHOME%!" src\main\webapp\WEB-INF\web.xml.in > src\main\webapp\WEB-INF\web.xml
+
+sed.exe "s!@GSDL3SRCHOME@!%GSDL3SRCHOME_UNIX%!" src\main\webapp\WEB-INF\web.xml.in > src\main\webapp\WEB-INF\web.xml
+
 
 call mvn install

gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet/src/main/java/org/greenstone/tabletop/ConnectProxyServlet.java

@@ -303 +303 @@
 
         //final String __dirname = ".";
-        final String __dirname = "C:/Temp";
-        
+        //final String __dirname = "C:/Temp";
+        final String __dirname = GSDL3SRCHOME_ + "/web/sites/computing50/ConnectProxyServlet";
+        
         if (export_filename != null) {
 

gs3-installations/computing50/trunk/sites/computing50/ConnectProxyServlet/src/main/webapp/WEB-INF/web.xml

@@ -36 +36 @@
         <init-param>
           <param-name>GSDL3SRCHOME</param-name>
-          <param-value>C:/Table/Projects/greenstone3-svn</param-value>
+          <param-value>D:/Table/Projects/greenstone3-svn</param-value>
         </init-param>