mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 01:54:22 +00:00
[DS-3104] Filter log4j configs on fresh_install too
This commit is contained in:
Mark H. Wood
@@ -33,14 +33,14 @@ Common usage:
|
||||
% ant -Dconfig=/installdir/config/dspace.cfg update
|
||||
|
||||
========================================================================
|
||||
</description>
|
||||
|
||||
<!-- DS-1391: Ant 1.8.0+ is required, fail if not available. -->
|
||||
<fail message="Ant 1.8.0+ is required, ${ant.version} is not supported">
|
||||
</description>
|
||||
|
||||
<!-- DS-1391: Ant 1.8.0+ is required, fail if not available. -->
|
||||
<fail message="Ant 1.8.0+ is required, ${ant.version} is not supported">
|
||||
<condition>
|
||||
<not>
|
||||
<antversion atleast="1.8.0"/>
|
||||
</not>
|
||||
<not>
|
||||
<antversion atleast="1.8.0"/>
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
|
||||
@@ -84,11 +84,11 @@ Common usage:
|
||||
|
||||
<!-- Default location of GeoLiteCity.dat.gz to download. This may be overridden, if URL path changes. -->
|
||||
<property name="geolite" value="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz" />
|
||||
|
||||
|
||||
<!-- Default location of lucene-core JAR to download (for update_solr_indexes). This may be overridden, if URL path changes. -->
|
||||
<!-- NOTE: this URL should have the version of the JAR replaced with "[version]" -->
|
||||
<property name="lucene-core" value="http://search.maven.org/remotecontent?filepath=org/apache/lucene/lucene-core/[version]/lucene-core-[version].jar" />
|
||||
|
||||
|
||||
|
||||
<!-- ============================================================= -->
|
||||
<!-- The DSpace class path for executing installation targets -->
|
||||
@@ -105,8 +105,8 @@ Common usage:
|
||||
<!-- ============================================================= -->
|
||||
<!-- Load various Ant libraries which define extra tasks. -->
|
||||
<!-- ============================================================= -->
|
||||
<!--Load/initialize all Ant-Contrib libraries from DSpace 'class.path' above.
|
||||
For more info, see:
|
||||
<!--Load/initialize all Ant-Contrib libraries from DSpace 'class.path' above.
|
||||
For more info, see:
|
||||
http://ant-contrib.sourceforge.net/tasks/index.html -->
|
||||
<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="class.path"/>
|
||||
|
||||
@@ -748,7 +748,7 @@ Common usage:
|
||||
|
||||
<mkdir dir="${handle.dir}" />
|
||||
|
||||
<mkdir dir="${log.dir}" />
|
||||
<mkdir dir="${dspace.dir}/log" />
|
||||
|
||||
<mkdir dir="${upload.temp.dir}" />
|
||||
|
||||
@@ -768,10 +768,10 @@ Common usage:
|
||||
<!-- ============================================================= -->
|
||||
|
||||
<!-- Copies the configuration files to ${dspace.dir}/config. -->
|
||||
<target name="init_configs" depends="init_installation">
|
||||
<target name="init_configs" depends="init_installation,prepare_configs">
|
||||
|
||||
<copy todir="${dspace.dir}/config" preservelastmodified="true" failonerror="false">
|
||||
<fileset dir="config" excludes="dspace.cfg" />
|
||||
<fileset dir="config-temp" excludes="dspace.cfg" />
|
||||
</copy>
|
||||
|
||||
<copy file="${config}" tofile="${dspace.dir}/config/dspace.cfg" preservelastmodified="true" />
|
||||
@@ -808,7 +808,7 @@ Common usage:
|
||||
<!-- ============================================================= -->
|
||||
<!-- Install fresh code but do not touch the database -->
|
||||
<!-- ============================================================= -->
|
||||
|
||||
|
||||
<target name="install_code"
|
||||
depends="init_installation,init_configs"
|
||||
description="Do a fresh install of the code, preserving any data."
|
||||
@@ -915,10 +915,10 @@ Common usage:
|
||||
====================================================================
|
||||
WARNING : FAILED TO DOWNLOAD GEOLITE DATABASE FILE
|
||||
(Used for DSpace Solr Usage Statistics)
|
||||
|
||||
|
||||
Underlying Error: ${geolite.error}
|
||||
|
||||
In order to use DSpace Solr Usage Statistics, you will need to
|
||||
|
||||
In order to use DSpace Solr Usage Statistics, you will need to
|
||||
manually re-run:
|
||||
|
||||
ant update_geolite
|
||||
@@ -929,12 +929,12 @@ You may manually install this file by following these steps:
|
||||
(1) Download the file from ${geolite}
|
||||
(2) Unzip it to create a file named 'GeoLiteCity.dat'
|
||||
(3) Copy that file to '${dspace.dir}/config/GeoLiteCity.dat'
|
||||
|
||||
|
||||
====================================================================
|
||||
</echo>
|
||||
</catch>
|
||||
</trycatch>
|
||||
|
||||
</trycatch>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="check_geolite">
|
||||
@@ -948,12 +948,12 @@ You may manually install this file by following these steps:
|
||||
<target name="init_geolite" depends="check_geolite" if="need.geolite">
|
||||
<antcall target="update_geolite" />
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Check if any Solr indexes need updating to the version of Solr/Lucene we are using. -->
|
||||
<target name="update_solr_indexes">
|
||||
<echo>Checking if any Solr indexes (${dspace.dir}/solr/*) need upgrading...</echo>
|
||||
|
||||
<!--
|
||||
<!--
|
||||
For each index, this is currently a two step process:
|
||||
(1) Ensure the index is upgraded to Solr/Lucene 3.5.0
|
||||
(really old indexes need upgrading to this version first)
|
||||
@@ -1037,7 +1037,7 @@ You may manually install this file by following these steps:
|
||||
<fileset dir="." includes="lucene-core-*.jar"/>
|
||||
</delete>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Target to check an existing Solr index to see if it -->
|
||||
<!-- meets a particular version requirement. -->
|
||||
<!-- If the index is outdated, "upgrade_solr_index" is -->
|
||||
@@ -1047,7 +1047,7 @@ You may manually install this file by following these steps:
|
||||
<!-- * version = Version of Solr to check against. -->
|
||||
<!-- * included = Whether this version of Solr/Lucene is already -->
|
||||
<!-- included in DSpace classpath. -->
|
||||
<target name="check_solr_index">
|
||||
<target name="check_solr_index">
|
||||
<!-- Check if the Solr Statistics index is AT LEAST compatible with Solr/Lucene version 3.5 -->
|
||||
<echo>Checking if the Solr index at ${indexDir} is >= Solr ${version}</echo>
|
||||
<java classname="org.dspace.app.util.IndexVersion" classpathref="class.path" fork="yes" resultproperty="version_returncode" outputproperty="version_compare">
|
||||
@@ -1070,7 +1070,7 @@ You may manually install this file by following these steps:
|
||||
ERROR occurred while checking Solr index version:
|
||||
${version_compare}
|
||||
</fail>
|
||||
|
||||
|
||||
<!-- If the above java command returned -1, that means this index is NOT yet
|
||||
upgraded to the specified Solr version. So, let's upgrade it! -->
|
||||
<if>
|
||||
@@ -1089,7 +1089,7 @@ ${version_compare}
|
||||
</else>
|
||||
</if>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Target to actually *upgrade* an existing Solr index -->
|
||||
<!-- REQUIRES these params: -->
|
||||
<!-- * indexDir = Full path to Index directory -->
|
||||
@@ -1102,7 +1102,7 @@ ${version_compare}
|
||||
|
||||
<!-- Replace the "[version]" placeholders in ${lucene-core} with the actual ${version}-->
|
||||
<propertyregex property="lucene-core.jar" input="${lucene-core}" regexp="\[version\]" replace="${version}" global="true"/>
|
||||
|
||||
|
||||
<!-- Download the appropriate version of the lucene-core.jar, if we
|
||||
haven't already AND it's not included on our DSpace classpath. -->
|
||||
<if>
|
||||
@@ -1148,7 +1148,7 @@ For more information, please see the Upgrade Instructions.
|
||||
</trycatch>
|
||||
</then>
|
||||
</if>
|
||||
|
||||
|
||||
<!-- If we downloaded a "lucene-core-*.jar" in the previous step,
|
||||
then use that downloaded JAR to upgrade the Solr/Lucene Index -->
|
||||
<if>
|
||||
|
||||
Reference in New Issue
Block a user