Changeset 26434 for gs3-extensions/fedora/trunk/src/build.xml

Timestamp:

2012-10-31T20:21:53+13:00 (11 years ago)

Author:

ak19

Message:

While getting GS3-with-Fedora collections to work on Puka discovered more issues. 1. Several additional files needed to become template files with placeholder values for the GS3 tomcat server and port, fedora password and index write lock timeout value. Other files needed further modifications (particularly fedora.fcfg.in and gsearch's fgsconfig-basic.properties) to make sure server and port values weren't fixed to localhost and 8383 defaults. 2. The build.xml had to be updated to make changes to these new and modified files during the installation process. 3. There's now a new target in build.xml: uninstall-fedora. 4. README file update with all this information, as well as corrections and clarifications.

File:

• gs3-extensions/fedora/trunk/src/build.xml (modified) (3 diffs)

gs3-extensions/fedora/trunk/src/build.xml

@@ -67 +67 @@
     <copy file="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/fgsconfig-basic.properties.in" tofile="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/fgsconfig-basic.properties" filtering="true" overwrite="true"/>
     <copy file="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/FgsConfigIndexTemplate/Lucene/index.properties.in" tofile="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/FgsConfigIndexTemplate/Lucene/index.properties" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/FgsConfigIndexTemplate/Lucene/foxmlToLucene.xslt.in" tofile="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/FgsConfigIndexTemplate/Lucene/foxmlToLucene.xslt" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/FgsConfigIndexTemplate/Lucene/foxmlToLuceneGenerated.xslt.in" tofile="${basedir}/adjust_war_files/fedoragsearch/FgsConfig/FgsConfigIndexTemplate/Lucene/foxmlToLuceneGenerated.xslt" filtering="true" overwrite="true"/>
+
+
+    <copy file="${basedir}/install/server.xml.in" tofile="${basedir}/install/server.xml" filtering="true" overwrite="true"/>
     <copy file="${basedir}/install/install.properties.in" tofile="${basedir}/install/install.properties" filtering="true" overwrite="true"/>
     <copy file="${basedir}/server/config/fedora.fcfg.in" tofile="${basedir}/server/config/fedora.fcfg" filtering="true" overwrite="true"/>
     <copy file="${basedir}/server/config/fedora-users.xml.in" tofile="${basedir}/server/config/fedora-users.xml" filtering="true" overwrite="true"/>
     <copy file="${basedir}/server/config/spring/akubra-llstore.xml.in" tofile="${basedir}/server/config/spring/akubra-llstore.xml" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/server/config/spring/web/web.properties.in" tofile="${basedir}/server/config/spring/web/web.properties" filtering="true" overwrite="true"/>
+
+    <!-- not really important, just host and port values in demo ingest files -->
+    <copy file="${basedir}/client/bin/fedora-ingest-demos.sh.in" tofile="${basedir}/client/bin/fedora-ingest-demos.sh" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/client/bin/fedora-ingest-demos.bat.in" tofile="${basedir}/client/bin/fedora-ingest-demos.bat" filtering="true" overwrite="true"/>
 
     <!-- zip up fedoragsearch, rename as .war file and put it in the install folder-->
@@ -125 +135 @@
     <chmod file="${gsdl3src.home}/packages/tomcat/webapps/fedoragsearch/client/runRESTClient.sh" perm="755"/>
     <chmod file="${gsdl3src.home}/packages/tomcat/webapps/fedoragsearch/client/runSOAPClient.sh" perm="755"/>
+
+    <chmod file="${basedir}/client/bin/fedora-ingest-demos.sh" perm="755"/>
     
     <!-- call Update EmptyIndex on GSearch to create the initial index (segments) file:
@@ -188 +200 @@
   </target>
   
+  <target name="uninstall-fedora" 
+      description="Uninstalls the Greenstone 3 Fedora extension (including GSearch). Tomcat must not be running when this target is run.">
+    <!-- clean up the war files -->
+    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fedora"/>
+    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fedoragsearch"/>
+    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fedora-demo"/>
+    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fop"/>
+    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/imagemanip"/>
+    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/saxon"/>
+
+    <!-- attempt to remove GS3/ext/fedora3 -->
+    <delete dir="${basedir}"/>
+    <echo>
+      *********************************************************
+      Fedora uninstall complete.
+      *********************************************************
+   </echo>
+    
+  </target>
+
 </project>