torquebox-server 2.0.3-java → 2.1.0-java

data/jboss/bin/run.bat

@@ -1,9 +1,9 @@
-@ECHO OFF
-REM Placeholder for people used to run.bat from older version redirecting them to read the readme
-echo.
-echo =======================================================================================
-echo.
-echo To start JBoss Application Server please see %CD%\..\README.txt
-echo.
-echo ========================================================================================
-echo.
+@ECHO OFF
+REM Placeholder for people used to run.bat from older version redirecting them to read the readme
+echo.
+echo =======================================================================================
+echo.
+echo To start JBoss Application Server please see %CD%\..\README.txt
+echo.
+echo ========================================================================================
+echo.

data/jboss/bin/run.sh

@@ -1,9 +1,10 @@
 #!/bin/sh
 # Placeholder for people used to run.sh from older version redirecting them to read the readme
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo 
 echo ========================================================================================
 echo 
-echo To start JBoss Application Server please see `pwd`/../README.txt
+echo To start JBoss Application Server please see $DIR/../README.txt
 echo 
 echo ========================================================================================
 echo

data/jboss/bin/standalone.bat

@@ -1,153 +1,157 @@
-@echo off
-rem -------------------------------------------------------------------------
-rem JBoss Bootstrap Script for Windows
-rem -------------------------------------------------------------------------
-
-rem $Id$
-
-@if not "%ECHO%" == ""  echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
-
-if "%OS%" == "Windows_NT" (
-  set "DIRNAME=%~dp0%"
-) else (
-  set DIRNAME=.\
-)
-
-rem Read an optional configuration file.
-if "x%STANDALONE_CONF%" == "x" (
-   set "STANDALONE_CONF=%DIRNAME%standalone.conf.bat"
-)
-if exist "%STANDALONE_CONF%" (
-   echo Calling "%STANDALONE_CONF%"
-   call "%STANDALONE_CONF%" %*
-) else (
-   echo Config file not found "%STANDALONE_CONF%"
-)
-
-pushd %DIRNAME%..
-set "RESOLVED_JBOSS_HOME=%CD%"
-popd
-
-if "x%JBOSS_HOME%" == "x" (
-  set "JBOSS_HOME=%RESOLVED_JBOSS_HOME%"
-)
-
-pushd "%JBOSS_HOME%"
-set "SANITIZED_JBOSS_HOME=%CD%"
-popd
-
-if "%RESOLVED_JBOSS_HOME%" NEQ "%SANITIZED_JBOSS_HOME%" (
-    echo WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur.
-)
-
-set DIRNAME=
-
-if "%OS%" == "Windows_NT" (
-  set "PROGNAME=%~nx0%"
-) else (
-  set "PROGNAME=standalone.bat"
-)
-
-rem Setup JBoss specific properties
-set JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%
-
-if "x%JAVA_HOME%" == "x" (
-  set  JAVA=java
-  echo JAVA_HOME is not set. Unexpected results may occur.
-  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
-) else (
-  set "JAVA=%JAVA_HOME%\bin\java"
-)
-
-if not "%PRESERVE_JAVA_OPTS%" == "true" (
-  rem Add -client to the JVM options, if supported (32 bit VM), and not overriden
-  echo "%JAVA_OPTS%" | findstr /I \-server > nul
-  if errorlevel == 1 (
-    "%JAVA%" -client -version 2>&1 | findstr /I /C:"Client VM" > nul
-    if not errorlevel == 1 (
-      set "JAVA_OPTS=-client %JAVA_OPTS%"
-    )
-  )
-
-  rem Add compressed oops, if supported (64 bit VM), and not overriden
-  echo "%JAVA_OPTS%" | findstr /I "\-XX:\-UseCompressedOops \-client" > nul
-  if errorlevel == 1 (
-    "%JAVA%" -XX:+UseCompressedOops -version > nul 2>&1
-    if not errorlevel == 1 (
-      set "JAVA_OPTS=-XX:+UseCompressedOops %JAVA_OPTS%"
-    )
-  )
-
-  rem Add tiered compilation, if supported (64 bit VM), and not overriden
-  echo "%JAVA_OPTS%" | findstr /I "\-XX:\-TieredCompilation \-client" > nul
-  if errorlevel == 1 (
-    "%JAVA%" -XX:+TieredCompilation -version > nul 2>&1
-    if not errorlevel == 1 (
-      set "JAVA_OPTS=-XX:+TieredCompilation %JAVA_OPTS%"
-    )
-  )
-)
-
-rem Find jboss-modules.jar, or we can't continue
-if exist "%JBOSS_HOME%\jboss-modules.jar" (
-    set "RUNJAR=%JBOSS_HOME%\jboss-modules.jar"
-) else (
-  echo Could not locate "%JBOSS_HOME%\jboss-modules.jar".
-  echo Please check that you are in the bin directory when running this script.
-  goto END
-)
-
-rem Setup JBoss specific properties
-
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-rem Set default module root paths
-if "x%JBOSS_MODULEPATH%" == "x" (
-  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
-)
-
-rem Set the standalone base dir
-if "x%JBOSS_BASE_DIR%" == "x" (
-  set  "JBOSS_BASE_DIR=%JBOSS_HOME%\standalone"
-)
-rem Set the standalone log dir
-if "x%JBOSS_LOG_DIR%" == "x" (
-  set  "JBOSS_LOG_DIR=%JBOSS_BASE_DIR%\log"
-)
-rem Set the standalone configuration dir
-if "x%JBOSS_CONFIG_DIR%" == "x" (
-  set  "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%/configuration"
-)
-
-echo ===============================================================================
-echo.
-echo   JBoss Bootstrap Environment
-echo.
-echo   JBOSS_HOME: %JBOSS_HOME%
-echo.
-echo   JAVA: %JAVA%
-echo.
-echo   JAVA_OPTS: %JAVA_OPTS%
-echo.
-echo ===============================================================================
-echo.
-
-:RESTART
-"%JAVA%" %JAVA_OPTS% ^
- "-Dorg.jboss.boot.log.file=%JBOSS_LOG_DIR%\boot.log" ^
- "-Dlogging.configuration=file:%JBOSS_CONFIG_DIR%/logging.properties" ^
-    -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -mp "%JBOSS_MODULEPATH%" ^
-    -jaxpmodule "javax.xml.jaxp-provider" ^
-     org.jboss.as.standalone ^
-    -Djboss.home.dir="%JBOSS_HOME%" ^
-     %*
-
-if ERRORLEVEL 10 goto RESTART
-
-:END
-if "x%NOPAUSE%" == "x" pause
-
-:END_NO_PAUSE
+@echo off
+rem -------------------------------------------------------------------------
+rem JBoss Bootstrap Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id$
+
+@if not "%ECHO%" == ""  echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+  set "DIRNAME=%~dp0%"
+) else (
+  set DIRNAME=.\
+)
+
+rem Read an optional configuration file.
+if "x%STANDALONE_CONF%" == "x" (
+   set "STANDALONE_CONF=%DIRNAME%standalone.conf.bat"
+)
+if exist "%STANDALONE_CONF%" (
+   echo Calling "%STANDALONE_CONF%"
+   call "%STANDALONE_CONF%" %*
+) else (
+   echo Config file not found "%STANDALONE_CONF%"
+)
+
+pushd %DIRNAME%..
+set "RESOLVED_JBOSS_HOME=%CD%"
+popd
+
+if "x%JBOSS_HOME%" == "x" (
+  set "JBOSS_HOME=%RESOLVED_JBOSS_HOME%"
+)
+
+pushd "%JBOSS_HOME%"
+set "SANITIZED_JBOSS_HOME=%CD%"
+popd
+
+if "%RESOLVED_JBOSS_HOME%" NEQ "%SANITIZED_JBOSS_HOME%" (
+    echo WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur.
+)
+
+set DIRNAME=
+
+if "%OS%" == "Windows_NT" (
+  set "PROGNAME=%~nx0%"
+) else (
+  set "PROGNAME=standalone.bat"
+)
+
+rem Setup JBoss specific properties
+set JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%
+
+if "x%JAVA_HOME%" == "x" (
+  set  JAVA=java
+  echo JAVA_HOME is not set. Unexpected results may occur.
+  echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+  set "JAVA=%JAVA_HOME%\bin\java"
+)
+
+if not "%PRESERVE_JAVA_OPTS%" == "true" (
+  rem Add -client to the JVM options, if supported (32 bit VM), and not overriden
+  echo "%JAVA_OPTS%" | findstr /I \-server > nul
+  if errorlevel == 1 (
+    "%JAVA%" -client -version 2>&1 | findstr /I /C:"Client VM" > nul
+    if not errorlevel == 1 (
+      set "JAVA_OPTS=-client %JAVA_OPTS%"
+    )
+  )
+)
+
+if not "%PRESERVE_JAVA_OPTS%" == "true" (
+  rem Add compressed oops, if supported (64 bit VM), and not overriden
+  echo "%JAVA_OPTS%" | findstr /I "\-XX:\-UseCompressedOops \-client" > nul
+  if errorlevel == 1 (
+    "%JAVA%" -XX:+UseCompressedOops -version > nul 2>&1
+    if not errorlevel == 1 (
+      set "JAVA_OPTS=-XX:+UseCompressedOops %JAVA_OPTS%"
+    )
+  )
+)
+
+if not "%PRESERVE_JAVA_OPTS%" == "true" (
+  rem Add tiered compilation, if supported (64 bit VM), and not overriden
+  echo "%JAVA_OPTS%" | findstr /I "\-XX:\-TieredCompilation \-client" > nul
+  if errorlevel == 1 (
+    "%JAVA%" -XX:+TieredCompilation -version > nul 2>&1
+    if not errorlevel == 1 (
+      set "JAVA_OPTS=-XX:+TieredCompilation %JAVA_OPTS%"
+    )
+  )
+)
+
+rem Find jboss-modules.jar, or we can't continue
+if exist "%JBOSS_HOME%\jboss-modules.jar" (
+    set "RUNJAR=%JBOSS_HOME%\jboss-modules.jar"
+) else (
+  echo Could not locate "%JBOSS_HOME%\jboss-modules.jar".
+  echo Please check that you are in the bin directory when running this script.
+  goto END
+)
+
+rem Setup JBoss specific properties
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Set default module root paths
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
+)
+
+rem Set the standalone base dir
+if "x%JBOSS_BASE_DIR%" == "x" (
+  set  "JBOSS_BASE_DIR=%JBOSS_HOME%\standalone"
+)
+rem Set the standalone log dir
+if "x%JBOSS_LOG_DIR%" == "x" (
+  set  "JBOSS_LOG_DIR=%JBOSS_BASE_DIR%\log"
+)
+rem Set the standalone configuration dir
+if "x%JBOSS_CONFIG_DIR%" == "x" (
+  set  "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%/configuration"
+)
+
+echo ===============================================================================
+echo.
+echo   JBoss Bootstrap Environment
+echo.
+echo   JBOSS_HOME: %JBOSS_HOME%
+echo.
+echo   JAVA: %JAVA%
+echo.
+echo   JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo ===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% ^
+ "-Dorg.jboss.boot.log.file=%JBOSS_LOG_DIR%\boot.log" ^
+ "-Dlogging.configuration=file:%JBOSS_CONFIG_DIR%/logging.properties" ^
+    -jar "%JBOSS_HOME%\jboss-modules.jar" ^
+    -mp "%JBOSS_MODULEPATH%" ^
+    -jaxpmodule "javax.xml.jaxp-provider" ^
+     org.jboss.as.standalone ^
+    -Djboss.home.dir="%JBOSS_HOME%" ^
+     %*
+
+if ERRORLEVEL 10 goto RESTART
+
+:END
+if "x%NOPAUSE%" == "x" pause
+
+:END_NO_PAUSE

data/jboss/bin/standalone.conf

@@ -67,4 +67,4 @@ fi
 #JAVA_OPTS="$JAVA_OPTS -Djboss.modules.metrics=true"
 
 
-JAVA_OPTS="$JAVA_OPTS -Xss2048k $APPEND_JAVA_OPTS"
+JAVA_OPTS="$JAVA_OPTS -Xss2048k -Djruby.compile.invokedynamic=false $APPEND_JAVA_OPTS"

data/jboss/bin/standalone.conf.bat

@@ -1,75 +1,75 @@
-rem ### -*- batch file -*- ######################################################
-rem #                                                                          ##
-rem #  JBoss Bootstrap Script Configuration                                    ##
-rem #                                                                          ##
-rem #############################################################################
-
-rem # $Id: run.conf.bat 88820 2009-05-13 15:25:44Z dimitris@jboss.org $
-
-rem #
-rem # This batch file is executed by run.bat to initialize the environment
-rem # variables that run.bat uses. It is recommended to use this file to
-rem # configure these variables, rather than modifying run.bat itself.
-rem #
-
-rem Uncomment the following line to disable manipulation of JAVA_OPTS (JVM parameters)
-rem set PRESERVE_JAVA_OPTS=true
-
-if not "x%JAVA_OPTS%" == "x" (
-  echo "JAVA_OPTS already set in environment; overriding default settings with values: %JAVA_OPTS%"
-  goto JAVA_OPTS_SET
-)
-
-rem #
-rem # Specify the JBoss Profiler configuration file to load.
-rem #
-rem # Default is to not load a JBoss Profiler configuration file.
-rem #
-rem set "PROFILER=%JBOSS_HOME%\bin\jboss-profiler.properties"
-
-rem #
-rem # Specify the location of the Java home directory (it is recommended that
-rem # this always be set). If set, then "%JAVA_HOME%\bin\java" will be used as
-rem # the Java VM executable; otherwise, "%JAVA%" will be used (see below).
-rem #
-rem set "JAVA_HOME=C:\opt\jdk1.6.0_23"
-
-rem #
-rem # Specify the exact Java VM executable to use - only used if JAVA_HOME is
-rem # not set. Default is "java".
-rem #
-rem set "JAVA=C:\opt\jdk1.6.0_23\bin\java"
-
-rem #
-rem # Specify options to pass to the Java VM. Note, there are some additional
-rem # options that are always passed by run.bat.
-rem #
-
-rem # JVM memory allocation pool parameters - modify as appropriate.
-set "JAVA_OPTS=-Xms64M -Xmx512M -XX:MaxPermSize=256M"
-
-rem # Reduce the RMI GCs to once per hour for Sun JVMs.
-set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true"
-
-rem # Warn when resolving remote XML DTDs or schemas.
-set "JAVA_OPTS=%JAVA_OPTS% -Dorg.jboss.resolver.warning=true"
-
-rem # Make Byteman classes visible in all module loaders
-rem # This is necessary to inject Byteman rules into AS7 deployments
-set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.system.pkgs=org.jboss.byteman"
-
-rem # Set the default configuration file to use if -c or --server-config are not used
-set "JAVA_OPTS=%JAVA_OPTS% -Djboss.server.default.config=standalone.xml"
-
-rem # Sample JPDA settings for remote socket debugging
-rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
-
-rem # Sample JPDA settings for shared memory debugging
-rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
-
-rem # Use JBoss Modules lockless mode
-rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"
-
-:JAVA_OPTS_SET
-
-set "JAVA_OPTS=%JAVA_OPTS% -Xss2048k %APPEND_JAVA_OPTS%"
+rem ### -*- batch file -*- ######################################################
+rem #                                                                          ##
+rem #  JBoss Bootstrap Script Configuration                                    ##
+rem #                                                                          ##
+rem #############################################################################
+
+rem # $Id: run.conf.bat 88820 2009-05-13 15:25:44Z dimitris@jboss.org $
+
+rem #
+rem # This batch file is executed by run.bat to initialize the environment
+rem # variables that run.bat uses. It is recommended to use this file to
+rem # configure these variables, rather than modifying run.bat itself.
+rem #
+
+rem Uncomment the following line to disable manipulation of JAVA_OPTS (JVM parameters)
+rem set PRESERVE_JAVA_OPTS=true
+
+if not "x%JAVA_OPTS%" == "x" (
+  echo "JAVA_OPTS already set in environment; overriding default settings with values: %JAVA_OPTS%"
+  goto JAVA_OPTS_SET
+)
+
+rem #
+rem # Specify the JBoss Profiler configuration file to load.
+rem #
+rem # Default is to not load a JBoss Profiler configuration file.
+rem #
+rem set "PROFILER=%JBOSS_HOME%\bin\jboss-profiler.properties"
+
+rem #
+rem # Specify the location of the Java home directory (it is recommended that
+rem # this always be set). If set, then "%JAVA_HOME%\bin\java" will be used as
+rem # the Java VM executable; otherwise, "%JAVA%" will be used (see below).
+rem #
+rem set "JAVA_HOME=C:\opt\jdk1.6.0_23"
+
+rem #
+rem # Specify the exact Java VM executable to use - only used if JAVA_HOME is
+rem # not set. Default is "java".
+rem #
+rem set "JAVA=C:\opt\jdk1.6.0_23\bin\java"
+
+rem #
+rem # Specify options to pass to the Java VM. Note, there are some additional
+rem # options that are always passed by run.bat.
+rem #
+
+rem # JVM memory allocation pool parameters - modify as appropriate.
+set "JAVA_OPTS=-Xms64M -Xmx512M -XX:MaxPermSize=256M"
+
+rem # Reduce the RMI GCs to once per hour for Sun JVMs.
+set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true"
+
+rem # Warn when resolving remote XML DTDs or schemas.
+set "JAVA_OPTS=%JAVA_OPTS% -Dorg.jboss.resolver.warning=true"
+
+rem # Make Byteman classes visible in all module loaders
+rem # This is necessary to inject Byteman rules into AS7 deployments
+set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.system.pkgs=org.jboss.byteman"
+
+rem # Set the default configuration file to use if -c or --server-config are not used
+set "JAVA_OPTS=%JAVA_OPTS% -Djboss.server.default.config=standalone.xml"
+
+rem # Sample JPDA settings for remote socket debugging
+rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+
+rem # Sample JPDA settings for shared memory debugging
+rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
+
+rem # Use JBoss Modules lockless mode
+rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"
+
+:JAVA_OPTS_SET
+
+set "JAVA_OPTS=%JAVA_OPTS% -Xss2048k -Djruby.compile.invokedynamic=false %APPEND_JAVA_OPTS%"