[jboss-cvs] JBossAS SVN: r71293 - trunk/main/src/bin.

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

Author: mladen.turk at jboss.com
Date: 2008-03-26 04:29:02 -0400 (Wed, 26 Mar 2008)
New Revision: 71293

Modified:
   trunk/main/src/bin/run.bat
Log:
Remove JBOSS_NATIVE_OPTS var. It was used to deal (badly) with broken JBAS-5240.

Modified: trunk/main/src/bin/run.bat
===================================================================
--- trunk/main/src/bin/run.bat	2008-03-26 08:07:49 UTC (rev 71292)
+++ trunk/main/src/bin/run.bat	2008-03-26 08:29:02 UTC (rev 71293)
@@ -58,7 +58,7 @@
   if /I "%PROCESSOR_ARCHITECTURE%"=="IA64"  (set JAVA_PLATFORM=ia64
   ) else if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set JAVA_PLATFORM=x64
   ) else if /I "%PROCESSOR_ARCHITECTURE%"=="x64"   (set JAVA_PLATFORM=x64
-  ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64"  (set JAVA_PLATFORM=ia64
+  ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64"  (set JAVA_PLATFORM=i64
   ) else if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (set JAVA_PLATFORM=x64
   ) else (
     echo PROCESSOR_ARCHITECTURE is not set. Unexpected results may occur.
@@ -76,10 +76,9 @@
   set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\native"
 )
 
-set JBOSS_NATIVE_OPTS=
 if not "x%JBOSS_NATIVE_HOME%" == "x" (
-  set "PATH=%JBOSS_NATIVE_HOME%;%PATH%"
-  set JBOSS_NATIVE_OPTS=-Djava.library.path="%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
+  set "PATH=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
+  set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
 )
 
 rem Read all command line arguments
@@ -151,7 +150,6 @@
 
 :RESTART
 "%JAVA%" %JAVA_OPTS% ^
-   %JBOSS_NATIVE_OPTS% ^
    -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" ^
    -classpath "%JBOSS_CLASSPATH%" ^
    org.jboss.Main %*