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

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

Author: dbhole
Date: 2007-09-05 17:48:11 -0400 (Wed, 05 Sep 2007)
New Revision: 65129

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

Fix JBAPP-202:

Make fixEOL run before ant replace tasks
Make production config items build by default



Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2007-09-05 20:54:54 UTC (rev 65128)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2007-09-05 21:48:11 UTC (rev 65129)
@@ -625,7 +625,6 @@
   </target>
 
   <target name="partition-production"
-    if="build.production" depends="check.production"
     description="A configuration tailored for production environments">
     <!-- Copy server/all to server/production and then customize the settings
     to values appropriate to production runs -->
@@ -855,11 +854,13 @@
 
   <!-- Modify run.sh for production config -->
   <target name="makeProductionConfigChanges" 
-          if="build.production"
           depends="partition-production">
 
-  <!-- Set all JVMs except darwin to use -server -->
+        <!-- Fix up the EOL characters for Windows files -->
+        <antcall target="fixEOL"/>
 
+        <!-- Set all JVMs except darwin to use -server -->
+
         <replace file="${install.bin}/run.sh"
                  summary="true">
 
@@ -1241,9 +1242,6 @@
 ]]></replacevalue>
 
         </replace>
-
-        <!-- Fix up the EOL characters for Windows files -->
-        <antcall target="fixEOL"/>
   </target>
 
   <!-- Before executing <replace> task on Windows, convert the target files from -->
@@ -1289,13 +1287,6 @@
     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
   </target>
 
-  <!-- check if the the user wants a production config -->
-  <target name="check.production">
-    <condition property="build.production">
-      <isset property="build.production"/>
-    </condition>
-  </target>
-
   <target name="check.windows">
     <condition property="is.windows">
       <os family="windows"/>