Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

Commit

Permalink
Remove the copy of the log4j libraries. TDS doesn't need them and it …
Browse files Browse the repository at this point in the history
…messes things up.

git-svn-id: file:///home/users/tmap/svn/repos/baker/trunk@23491 fdbf22ae-c210-0410-be80-ca943da6b8f8
  • Loading branch information
noaaroland committed Mar 24, 2017
1 parent aaeb008 commit befc542
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions build.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@
<include name="resources/iosp/**" />
</fileset>
</copy>
<copy todir="${jakarta.home}/webapps/thredds/WEB-INF/lib">
<fileset dir="WebContent/WEB-INF/lib">
<include name="log4j-*.jar" />
</fileset>
</copy>
<copy file="JavaSource/resources/ferret/FerretBackendConfig.xml"
tofile="${jakarta.home}/webapps/thredds/WEB-INF/classes/resources/iosp/FerretConfig.xml" />
</target>
Expand All @@ -193,11 +188,6 @@
</copy>
<copy file="JavaSource/resources/ferret/FerretBackendConfig.xml"
tofile="${jakarta.home}/webapps/thredds/WEB-INF/classes/resources/iosp/FerretConfig.xml" />
<copy todir="${jakarta.home}/webapps/thredds/WEB-INF/lib">
<fileset dir="WebContent/WEB-INF/lib">
<include name="log4j-*.jar" />
</fileset>
</copy>
<!-- remove any symbolic links because the delete task follows symbolic links -->
<exec executable="find">
<arg line="${deploy.home} -type l -delete" />
Expand Down Expand Up @@ -260,8 +250,8 @@
<mkdir dir="${addxml-build}" />
</target>
<target name="addxml-compile" depends="addxml-init">
<copy file="${addxml-src}/gov/noaa/pmel/tmap/addxml/log4j.xml"
tofile="${addxml-build}/log4j.xml" />
<copy file="${addxml-src}/gov/noaa/pmel/tmap/addxml/log4j2.xml"
tofile="${addxml-build}/log4j2.xml" />
<javac
srcdir="${addxml-src}"
destdir="${addxml-build}">
Expand Down

0 comments on commit befc542

Please sign in to comment.