Ignore:
Timestamp:
10/31/12 20:21:53 (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • gs3-extensions/fedora/trunk/src/build.xml

    r26420 r26434  
    6767    <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"/>
    6868    <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"/>
     69    <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"/>
     70    <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"/>
     71
     72
     73    <copy file="${basedir}/install/server.xml.in" tofile="${basedir}/install/server.xml" filtering="true" overwrite="true"/>
    6974    <copy file="${basedir}/install/install.properties.in" tofile="${basedir}/install/install.properties" filtering="true" overwrite="true"/>
    7075    <copy file="${basedir}/server/config/fedora.fcfg.in" tofile="${basedir}/server/config/fedora.fcfg" filtering="true" overwrite="true"/>
    7176    <copy file="${basedir}/server/config/fedora-users.xml.in" tofile="${basedir}/server/config/fedora-users.xml" filtering="true" overwrite="true"/>
    7277    <copy file="${basedir}/server/config/spring/akubra-llstore.xml.in" tofile="${basedir}/server/config/spring/akubra-llstore.xml" filtering="true" overwrite="true"/>
     78    <copy file="${basedir}/server/config/spring/web/web.properties.in" tofile="${basedir}/server/config/spring/web/web.properties" filtering="true" overwrite="true"/>
     79
     80    <!-- not really important, just host and port values in demo ingest files -->
     81    <copy file="${basedir}/client/bin/fedora-ingest-demos.sh.in" tofile="${basedir}/client/bin/fedora-ingest-demos.sh" filtering="true" overwrite="true"/>
     82    <copy file="${basedir}/client/bin/fedora-ingest-demos.bat.in" tofile="${basedir}/client/bin/fedora-ingest-demos.bat" filtering="true" overwrite="true"/>
    7383
    7484    <!-- zip up fedoragsearch, rename as .war file and put it in the install folder-->
     
    125135    <chmod file="${gsdl3src.home}/packages/tomcat/webapps/fedoragsearch/client/runRESTClient.sh" perm="755"/>
    126136    <chmod file="${gsdl3src.home}/packages/tomcat/webapps/fedoragsearch/client/runSOAPClient.sh" perm="755"/>
     137
     138    <chmod file="${basedir}/client/bin/fedora-ingest-demos.sh" perm="755"/>
    127139   
    128140    <!-- call Update EmptyIndex on GSearch to create the initial index (segments) file:
     
    188200  </target>
    189201 
     202  <target name="uninstall-fedora"
     203      description="Uninstalls the Greenstone 3 Fedora extension (including GSearch). Tomcat must not be running when this target is run.">
     204    <!-- clean up the war files -->
     205    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fedora"/>
     206    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fedoragsearch"/>
     207    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fedora-demo"/>
     208    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/fop"/>
     209    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/imagemanip"/>
     210    <delete dir="${gsdl3src.home}/packages/tomcat/webapps/saxon"/>
     211
     212    <!-- attempt to remove GS3/ext/fedora3 -->
     213    <delete dir="${basedir}"/>
     214    <echo>
     215      *********************************************************
     216      Fedora uninstall complete.
     217      *********************************************************
     218   </echo>
     219   
     220  </target>
     221
    190222</project>
Note: See TracChangeset for help on using the changeset viewer.