[jboss-cvs] JBossAS SVN: r64751 - in branches/JBPAPP_4_2_0_GA_CP: system/src/bin and 1 other directory.

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

Author: dbhole
Date: 2007-08-21 17:00:53 -0400 (Tue, 21 Aug 2007)
New Revision: 64751

Modified:
   branches/JBPAPP_4_2_0_GA_CP/build/build.xml
   branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat
Log:

Fixes for JBPAPP-239 and JBPAPP-202:

Set org.jboss.web logging to INFO
Fix EOL issues for Windows build
Revert run.bat to old version (which sets -server for HotSpot only)



Modified: branches/JBPAPP_4_2_0_GA_CP/build/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2007-08-21 19:26:58 UTC (rev 64750)
+++ branches/JBPAPP_4_2_0_GA_CP/build/build.xml	2007-08-21 21:00:53 UTC (rev 64751)
@@ -1176,6 +1176,27 @@
 
         </replace>
 
+        <replace file="${install.production.conf}/jboss-log4j.xml"
+                 summary="true">
+
+            <replacetoken><![CDATA[
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+]]></replacetoken>
+
+            <replacevalue><![CDATA[
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="org.jboss.web">
+     <priority value="INFO" />
+   </category>
+]]></replacevalue>
+
+        </replace>
+
   <!-- Increase time between scans for hot deploy -->
 
         <replace file="${install.production.conf}/jboss-minimal.xml"
@@ -1221,8 +1242,25 @@
 
         </replace>
 
+        <!-- Fix up the EOL characters for Windows files -->
+        <antcall target="fixEOL"/>
   </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 -->
+  <target name="fixEOL" depends="check.windows" if="is.windows">
+    <echo message="Fixing EOL characters for multi-line text replacement on Windows"/>
+    <fixcrlf srcdir="${install.bin}" includes="run.conf" eol="crlf"/>
+    <fixcrlf srcdir="${install.bin}" includes="run.sh" eol="crlf"/>
+    <fixcrlf srcdir="${install.production}/deploy/uuid-key-generator.sar/META-INF" includes="jboss-service.xml" eol="crlf"/>
+    <fixcrlf srcdir="${install.production}/deploy-hasingleton/jms" includes="jbossmq-destinations-service.xml" eol="crlf"/>
+    <fixcrlf srcdir="${install.production.conf}" includes="jboss-log4j.xml" eol="crlf"/>
+    <fixcrlf srcdir="${install.production.conf}" includes="jboss-minimal.xml" eol="crlf"/>
+    <fixcrlf srcdir="${install.production.conf}" includes="jboss-service.xml" eol="crlf"/>
+    <fixcrlf srcdir="${install.production}/deploy" includes="jbossjca-service.xml" eol="crlf"/>
+  </target>
+
   <!-- set proxy settings -->
   <condition property="hasproxyauth">
         <and>
@@ -1258,4 +1296,10 @@
     </condition>
   </target>
 
+  <target name="check.windows">
+    <condition property="is.windows">
+      <os family="windows"/>
+    </condition>
+  </target>
+
 </project>

Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat	2007-08-21 19:26:58 UTC (rev 64750)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.bat	2007-08-21 21:00:53 UTC (rev 64751)
@@ -79,8 +79,9 @@
 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
 
-rem Add -server to the JVM options
-set JAVA_OPTS=%JAVA_OPTS% -server
+rem Add -server to the JVM options, if supported
+"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
+if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
 
 rem JVM memory allocation pool parameters. Modify as appropriate.
 set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m