From fb39b409c8ca560c4ef55130285dbe803d2fb5fe Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Apr 2003 10:03:15 +0000
Subject: [PATCH] Force overwriting for non-default JBoss configuration files
 copying.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113378 13f79535-47bb-0310-9956-ffa450edef68
---
 jboss/plugin.jelly      | 4 ++--
 jboss/xdocs/changes.xml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/jboss/plugin.jelly b/jboss/plugin.jelly
index fdcd82e9..7979e1ed 100644
--- a/jboss/plugin.jelly
+++ b/jboss/plugin.jelly
@@ -85,7 +85,7 @@
          specific configuration (if any) -->
     <j:set var="jbossconfX" value="${maven.jboss.conf.dir}X"/>
     <j:if test="${jbossconfX != 'X'}">
-      <copy todir="${maven.jboss.build.conf.dir}">
+      <copy todir="${maven.jboss.build.conf.dir}" overwrite="true">
         <fileset dir="${maven.jboss.conf.dir}"/>
       </copy>
     </j:if>
@@ -94,7 +94,7 @@
          specific configuration (if any) -->
     <j:set var="jbossdeployX" value="${maven.jboss.deploy.dir}X"/>
     <j:if test="${jbossdeployX != 'X'}">
-      <copy todir="${maven.jboss.build.deploy.dir}">
+      <copy todir="${maven.jboss.build.deploy.dir}" overwrite="true">
         <fileset dir="${maven.jboss.deploy.dir}"/>
       </copy>
     </j:if>
diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml
index 1dde786f..83aab889 100644
--- a/jboss/xdocs/changes.xml
+++ b/jboss/xdocs/changes.xml
@@ -8,6 +8,10 @@
   <body>
 
     <release version="1.1" date="in CVS">
+      <action dev="vmassol" type="fix" due-to="Willie Vu" due-to-email="ctwillie@ust.hk">
+        Application-specific JBoss configuration files now correctly overwrite
+        the default JBoss configuration files.
+      </action>
       <action dev="vmassol" type="update">
         Allowed deployments of EAR, WAR or EJB-JAR (only EAR was previously 
         supported) by adding the <code>jboss:package-ear</code>, 
