[jboss-cvs] JBossAS SVN: r69668 - branches/JBPAPP_4_2_0_GA_CP/build.

[jboss-cvs-commits at lists.jboss.org]

Author: dbhole
Date: 2008-02-06 14:47:49 -0500 (Wed, 06 Feb 2008)
New Revision: 69668

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build.xml
Log:

Fix processing of deploy/jms/jbossmq-destinations-service.xml for the default
config, so that the prod/devconf annotations are properly processed.



Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2008-02-06 17:33:33 UTC (rev 69667)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2008-02-06 19:47:49 UTC (rev 69668)
@@ -956,7 +956,18 @@
             replace=""
         />
 
+        <replaceregexp file="${config.dir}/deploy/jms/jbossmq-destinations-service.xml"
+            flags="gm"
+            match="@.*${conf.to.keep}\s"
+            replace=""
+        />
 
+        <replaceregexp file="${config.dir}/deploy/jms/jbossmq-destinations-service.xml"
+            flags="gs"
+            match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+            replace=""
+        />
+
         <!-- Reduce log verbosity -->
 
         <replaceregexp file="${config.dir}/conf/jboss-log4j.xml"