Changeset 30568 for main/trunk/greenstone3/build.xml

Timestamp:

2016-06-10T22:11:15+12:00 (7 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.

File:

• main/trunk/greenstone3/build.xml (modified) (4 diffs)

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>
+    <bool><available file="${web.home}/WEB-INF/cgi" type="dir"/></bool>
+    <property name="full.web.dir" value="${web.home}"/>
+    <else>
+        <property name="full.web.dir" value="${basedir}/web"/>
+    </else>
+  </if>  
+  
   <!-- jar files needed by applets go here -->
   <property name="web.applet" value="${web.home}/applet"/>
-
+  
   <!-- jar files needed by the servlet (and extra ones) go here -->
   <property name="web.lib" value="${web.home}/WEB-INF/lib"/>
@@ -235 +244 @@
         preservelastmodified="true"
         failonerror="true" >  
-    <fileset dir="${web.home}/WEB-INF" includes="**"/>  
+    <fileset dir="${full.web.dir}/WEB-INF" includes="**"/>  
       </copy>
 
@@ -631 +640 @@
   
   <path id="derby.server.classpath">
-    <pathelement location="${web.lib}/derbynet.jar"/>
-    <pathelement location="${web.lib}/derby.jar"/>
+    <pathelement location="${web.writablelib}/derbynet.jar"/>
+    <pathelement location="${web.writablelib}/derby.jar"/>
   </path>
 
@@ -1272 +1281 @@
     <bool><not><equals arg1="${web.home}" arg2="${web.writablehome}"></equals></not></bool>
     <mkdir dir="${web.writablehome}"/>
-    <copy file="${web.home}/WEB-INF/cgi/gliserver.pl"       tofile="${web.writablehome}/WEB-INF/cgi/gliserver.pl"       overwrite="true"/>
-    <copy file="${web.home}/WEB-INF/cgi/metadata-server.pl" tofile="${web.writablehome}/WEB-INF/cgi/metadata-server.pl" overwrite="true"/>
-    <copy file="${web.home}/WEB-INF/cgi/checksum.pl"        tofile="${web.writablehome}/WEB-INF/cgi/checksum.pl"        overwrite="true"/>
+    <copy file="${full.web.dir}/WEB-INF/cgi/gliserver.pl"       tofile="${web.writablehome}/WEB-INF/cgi/gliserver.pl"       overwrite="true"/>
+    <copy file="${full.web.dir}/WEB-INF/cgi/metadata-server.pl" tofile="${web.writablehome}/WEB-INF/cgi/metadata-server.pl" overwrite="true"/>
+    <copy file="${full.web.dir}/WEB-INF/cgi/checksum.pl"        tofile="${web.writablehome}/WEB-INF/cgi/checksum.pl"        overwrite="true"/>
       </if>