LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Addendum to previous commit (r2657). 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2658 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2014-05-30 06:32:31 +00:00
parent 1fcdb94194
commit b6f2cc147c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-core/bin/libexec/build.xml
View File

@ -92,14 +92,14 @@
<if> <if>
<resourceexists> <resourceexists>
<file file="${ccm.repo.dir}/${packagename}/web/WEB-INF/web.${packagename}.xml"/> <file file="${ccm.repo.dir}/${packagename}/web/WEB-INF/web.d/web.${packagename}.xml"/>
</resourceexists> </resourceexists>
<then> <then>
<echo message="Merging web.${packagename}.xml" /> <echo message="Merging web.${packagename}.xml" />
<webxmlmerge originalfile="${ccm.home.dir}/WEB-INF/web.xml" <webxmlmerge originalfile="${ccm.home.dir}/WEB-INF/web.xml"
mergefile="${ccm.repo.dir}/${packagename}/web/WEB-INF/web.${packagename}.xml" mergefile="${ccm.repo.dir}/${packagename}/web/WEB-INF/web.d/web.${packagename}.xml"
destfile="${ccm.home.dir}/WEB-INF/.merged.web.xml" /> destfile="${ccm.home.dir}/WEB-INF/.merged.web.xml" />
<copy file="${ccm.home.dir}/WEB-INF/.merged.web.xml" <copy file="${ccm.home.dir}/WEB-INF/.merged.web.xml"