Changeset 30568 for main/trunk/gli

Timestamp:

2016-06-10T22:11:15+12:00 (8 years ago)

Author:

ak19

Message:

All the commits for a distributed GS3 on Windows (no changes made for linux yet). In a distributed GS3, the GS3 is installed in a read-only location and the tomcat runs from the writable TMP area, while the collections go to a writable userweb location specified by the user. (The DVD-only mode still works and is separate.) A problem remains, but exists in the TSG patched version too, and since the current commit breaks nothing, I'm committing it. The user needs to modify 4 properties in build.properties, one of which is new.They need to set using.user.web to true, set web.home to the userweb location, set gsdl3home.isreadonly to true and set gsdl3.writablehome to the tmpdir. The problem is that I can't successfully build the simple html collection if the GS3 installed location is read-only, as the perl code wants to create temporary files in gs2build\tmp which is read-only.

Location:

main/trunk/gli

Files:

• gems.bat (modified) (1 diff)
• gli.bat (modified) (2 diffs)

main/trunk/gli/gems.bat

@@ -44 +44 @@
 
 :checkUserPermissions
+
+rem In a distributed GS3 setup like in the labs, we don't require the Greenstone directory to be writable.
+rem If GS3, get the using.user.web property from build.properties and if set to true, we can skip to shiftElevated
+:: http://ss64.com/nt/syntax-substring.html
+    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+        if "%%G" == "using.user.web" if "%%H" == "true" goto :shiftElevated
+    )
+
     echo.
     echo Checking if the Greenstone collection directory is writable ...

main/trunk/gli/gli.bat

@@ -48 +48 @@
 
 :checkUserPermissions
+
+rem In a distributed GS3 setup like in the labs, we don't require the Greenstone directory to be writable.
+rem If GS3, get the using.user.web property from build.properties and if set to true, we can skip to shiftElevated
+:: http://ss64.com/nt/syntax-substring.html 
+    if "%_VERSION%" == "3" if exist "%GSDL3SRCHOME%\build.properties" for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+        if "%%G" == "using.user.web" if "%%H" == "true" goto :shiftElevated
+    )
     echo.
     echo Checking if the Greenstone collection directory is writable ...
@@ -158 +165 @@
 :: Run GS3 if version = 3
 :rungs3
+
+    rem In a distributed GS3 set up like in the labs, gsdl3home.isreadonly would be true and
+    rem we need to run the web server in read-only mode. This section of code borrowed from gs3-server.bat.
+    set USE_TMPDIR_FOR_TOMCAT=
+    for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
+        if "%%G"=="gsdl3home.isreadonly" set USE_TMPDIR_FOR_TOMCAT=%%H
+    )   
+    if "%USE_TMPDIR_FOR_TOMCAT%" == "true" (
+        set gsdl3_writablehome=%TMP%\greenstone\web
+        set opt_properties="-Dgsdl3home.isreadonly=true" -Dgsdl3.writablehome="%gsdl3_writablehome%"
+        echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome%
+        pushd %GSDL3SRCHOME%
+        cmd /c ant.bat %opt_properties% configure-web
+        popd
+    )
+    
     if "%_VERSION%" == "3" "%JAVA_EXECUTABLE%" -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -gsdl3 "%GSDL3HOME%" -gsdl3src "%GSDL3SRCHOME%" -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
     if ERRORLEVEL 2 (