From b6f2cc147cc6059313009756b75ae3c0c79ea3e2 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 30 May 2014 06:32:31 +0000
Subject: [PATCH] Addendum to previous commit (r2657).

git-svn-id: https://svn.libreccm.org/ccm/trunk@2658 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/bin/libexec/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ccm-core/bin/libexec/build.xml b/ccm-core/bin/libexec/build.xml
index 82cfb04a5..0b534e658 100644
--- a/ccm-core/bin/libexec/build.xml
+++ b/ccm-core/bin/libexec/build.xml
@@ -92,14 +92,14 @@
 
         <if>
             <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>
 
             <then>
                 <echo message="Merging  web.${packagename}.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"    /> 
 
                 <copy  file="${ccm.home.dir}/WEB-INF/.merged.web.xml"