[jboss-cvs] JBossAS SVN: r88978 - in branches/Branch_5_x/main/src: main/org/jboss and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2009-05-16 14:18:45 -0400 (Sat, 16 May 2009)
New Revision: 88978

Modified:
   branches/Branch_5_x/main/src/bin/run.bat
   branches/Branch_5_x/main/src/bin/run.sh
   branches/Branch_5_x/main/src/main/org/jboss/Main.java
Log:
JBAS-6931 set property xb.builder.useUnorderedSequence in org.jboss.Main

Modified: branches/Branch_5_x/main/src/bin/run.bat
===================================================================
--- branches/Branch_5_x/main/src/bin/run.bat	2009-05-16 16:03:22 UTC (rev 88977)
+++ branches/Branch_5_x/main/src/bin/run.bat	2009-05-16 18:18:45 UTC (rev 88978)
@@ -119,9 +119,6 @@
 
 rem Setup JBoss specific properties
 
-rem This should be removed when JBoss configuration XML files can be validated JBAS-6744
-set JAVA_OPTS=%JAVA_OPTS% -Dxb.builder.useUnorderedSequence=true
-
 rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 

Modified: branches/Branch_5_x/main/src/bin/run.sh
===================================================================
--- branches/Branch_5_x/main/src/bin/run.sh	2009-05-16 16:03:22 UTC (rev 88977)
+++ branches/Branch_5_x/main/src/bin/run.sh	2009-05-16 18:18:45 UTC (rev 88978)
@@ -228,9 +228,6 @@
 # Setup JBoss specific properties
 JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
 
-# This should be removed when JBoss configuration XML files can be validated JBAS-6744
-JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
-
 # Setup the java endorsed dirs
 JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
 

Modified: branches/Branch_5_x/main/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_5_x/main/src/main/org/jboss/Main.java	2009-05-16 16:03:22 UTC (rev 88977)
+++ branches/Branch_5_x/main/src/main/org/jboss/Main.java	2009-05-16 18:18:45 UTC (rev 88978)
@@ -114,6 +114,11 @@
     */
    public void boot(final String[] args) throws Exception
    {
+	   // remove this when JBAS-6744 is fixed
+	   String useUnorderedSequence = System.getProperty("xb.builder.useUnorderedSequence");
+	   if(useUnorderedSequence == null)
+		   System.setProperty("xb.builder.useUnorderedSequence", "true");
+	   
       // First process the command line to pickup custom props/settings
       processCommandLine(args);