[jboss-cvs] JBossAS SVN: r69053 - branches/JBPAPP_4_2_0_GA_CP_4_3_MERGE/build.

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

Author: dbhole
Date: 2008-01-16 17:55:19 -0500 (Wed, 16 Jan 2008)
New Revision: 69053

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

Fix issue that was causing changes to not propagate into minimal config



Modified: branches/JBPAPP_4_2_0_GA_CP_4_3_MERGE/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_4_3_MERGE/build/build.xml	2008-01-16 22:13:25 UTC (rev 69052)
+++ branches/JBPAPP_4_2_0_GA_CP_4_3_MERGE/build/build.xml	2008-01-16 22:55:19 UTC (rev 69053)
@@ -639,8 +639,8 @@
   <target name="partition-build" depends="init">
     <antcall target="partition-production"/>
     <antcall target="partition-default"/>
+    <antcall target="makeConfigChanges"/>
     <antcall target="partition-minimal"/>
-    <antcall target="makeConfigChanges"/>
     <antcall target="replace-messaging"/>
     <antcall target="jboss-all-client"/>
     <!--<antcall target="setup-ejb3-dist"/>-->
@@ -895,41 +895,6 @@
       
   </target>
 
-  <!-- Update config files for 4.2/4.3 -->
-  <target name="makeConfigChanges" 
-          depends="makeProductionConfigChanges">
-
-     <!-- Fix up the EOL characters for Windows files -->
-     <antcall target="fixEOL"/>
-     
-     <condition property="verconf.to.keep" value="43CONF" else="42CONF">
-         <or>
-             <isset property="build.soa"/>
-             <isset property="build.with.jbm"/>
-         </or>
-     </condition>
-
-     <condition property="verconf.to.delete" value="42CONF" else="43CONF">
-         <or>
-             <isset property="build.soa"/>
-             <isset property="build.with.jbm"/>
-         </or>
-     </condition>
-
-     <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
-         flags="gm"
-         match="@.*${verconf.to.keep}\s"
-         replace=""
-     />
-
-     <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
-         flags="gs"
-         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
-         replace=""
-     />
-  
-  </target>
-
   <!-- Modify run.sh for production config -->
   <target name="updateConfigFiles">
 
@@ -1031,6 +996,41 @@
 
   </target>
 
+  <!-- Update config files for 4.2/4.3 -->
+  <target name="makeConfigChanges" 
+          depends="makeProductionConfigChanges">
+
+     <!-- Fix up the EOL characters for Windows files -->
+     <antcall target="fixEOL"/>
+     
+     <condition property="verconf.to.keep" value="43CONF" else="42CONF">
+         <or>
+             <isset property="build.soa"/>
+             <isset property="build.with.jbm"/>
+         </or>
+     </condition>
+
+     <condition property="verconf.to.delete" value="42CONF" else="43CONF">
+         <or>
+             <isset property="build.soa"/>
+             <isset property="build.with.jbm"/>
+         </or>
+     </condition>
+
+     <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
+         flags="gm"
+         match="@.*${verconf.to.keep}\s"
+         replace=""
+     />
+
+     <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
+         flags="gs"
+         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
+         replace=""
+     />
+  
+  </target>
+
   <!-- Before executing <replace> task on Windows, convert the target files from -->
   <!-- UNIX line termination (LF) to Windows line termination (CRLF) so that -->
   <!-- <replace> does not break due to line termination inconsistencies -->