hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 22:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-3104] Filter log4j configs on fresh_install too

Browse Source
This commit is contained in:
Mark H. Wood
2016-04-22 23:15:13 -04:00
parent a2724615b7
commit 211b241aa1
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace/src/main/config/build.xml
View File

@@ -33,14 +33,14 @@ Common usage:
% ant -Dconfig=/installdir/config/dspace.cfg update % ant -Dconfig=/installdir/config/dspace.cfg update
======================================================================== ========================================================================
</description> </description>
<!-- DS-1391: Ant 1.8.0+ is required, fail if not available. --> <!-- 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"> <fail message="Ant 1.8.0+ is required, ${ant.version} is not supported">
<condition> <condition>
<not> <not>
<antversion atleast="1.8.0"/> <antversion atleast="1.8.0"/>
</not> </not>
</condition> </condition>
</fail> </fail>
@@ -105,7 +105,7 @@ Common usage:
<!-- ============================================================= --> <!-- ============================================================= -->
<!-- Load various Ant libraries which define extra tasks. --> <!-- Load various Ant libraries which define extra tasks. -->
<!-- ============================================================= --> <!-- ============================================================= -->
<!--Load/initialize all Ant-Contrib libraries from DSpace 'class.path' above. <!--Load/initialize all Ant-Contrib libraries from DSpace 'class.path' above.
For more info, see: For more info, see:
http://ant-contrib.sourceforge.net/tasks/index.html --> http://ant-contrib.sourceforge.net/tasks/index.html -->
<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="class.path"/> <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="class.path"/>
@@ -748,7 +748,7 @@ Common usage:
<mkdir dir="${handle.dir}" /> <mkdir dir="${handle.dir}" />
<mkdir dir="${log.dir}" /> <mkdir dir="${dspace.dir}/log" />
<mkdir dir="${upload.temp.dir}" /> <mkdir dir="${upload.temp.dir}" />
@@ -768,10 +768,10 @@ Common usage:
<!-- ============================================================= --> <!-- ============================================================= -->
<!-- Copies the configuration files to ${dspace.dir}/config. --> <!-- 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"> <copy todir="${dspace.dir}/config" preservelastmodified="true" failonerror="false">
<fileset dir="config" excludes="dspace.cfg" /> <fileset dir="config-temp" excludes="dspace.cfg" />
</copy> </copy>
<copy file="${config}" tofile="${dspace.dir}/config/dspace.cfg" preservelastmodified="true" /> <copy file="${config}" tofile="${dspace.dir}/config/dspace.cfg" preservelastmodified="true" />