Changeset 30573

Timestamp:

2016-06-15T18:35:56+12:00 (8 years ago)

Author:

ak19

Message:

Terminology change: 'web-distributed' GS3 is a GS3 with dispersed web folder (not 'distributed').

Location:

main/trunk

Files:

• gli/gems.bat (modified) (1 diff)
• gli/gli.bat (modified) (2 diffs)
• greenstone3/build.properties.in (modified) (1 diff)
• greenstone3/build.xml (modified) (1 diff)

main/trunk/gli/gems.bat

@@ -45 +45 @@
 :checkUserPermissions
 
-rem In a distributed GS3 setup like in the labs, we don't require the Greenstone directory to be writable.
+rem In a web-dispersed 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

main/trunk/gli/gli.bat

@@ -49 +49 @@
 :checkUserPermissions
 
-rem In a distributed GS3 setup like in the labs, we don't require the Greenstone directory to be writable.
+rem In a web-dispersed 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 
@@ -166 +166 @@
 :rungs3
 
-    rem In a distributed GS3 set up like in the labs, gsdl3home.isreadonly would be true and
+    rem In a web-dispersed 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=

main/trunk/greenstone3/build.properties.in

@@ -16 +16 @@
 #web.home=${tomcat.installed.path}/webapps/greenstone3
 
-## If creating a distributed GS3 set up, with GS3 in a read-only location, then it will need a
-## distinct user web folder for content (sites and collections), and need to run tomcat from TMP.
-## You need to configure 4 properties to get a distributed GS3 to work on windows:
+## If creating a GS3 set up with a dispersed web folder ("web-dispersed" GS3), with GS3 in a read-only location, then 
+## it will need a distinct user web folder for content (sites and collections), and need to run tomcat from TMP.
+## You need to configure 4 properties to get a "web-dispersed" GS3 to work on windows:
 ## - set web.home above to the writable location where collections and sites should be created (use forward slashes)
 ## - uncomment using.user.web below and set to true, 

main/trunk/greenstone3/build.xml

@@ -169 +169 @@
   <property name="web.home" value="${basedir}/web"/>
   <property name="web.writablehome" value="${gsdl3.writablehome}"/>
-  <!-- If using a distributed GS3, then the user web would not contain everything in the default GS3 web 
-  (it won't contain a CGI or lib folder inside WEB-INF, for instance) -->
+  <!-- If using a dispersed GS3 web folder, then the user web would not contain everything in the
+       default GS3 web (it won't contain a CGI or lib folder inside WEB-INF, for instance) -->
   <if>
     <bool><available file="${web.home}/WEB-INF/cgi" type="dir"/></bool>