torquebox-server 2.0.0.beta3-java → 2.0.0.cr1-java

data/jboss/README.txt

@@ -4,7 +4,7 @@
 / /_/ / /_/ / /_/ (__  |__  )  / ___ |___/ /     / /  
 \____/_____/\____/____/____/  /_/  |_/____/     /_/   
 
-Welcome to JBoss Application Server 7
+Welcome to JBoss Application Server 7.1.0
 http://www.jboss.org/jbossas/
 
 Go to the above link for documentation, and additional downloads.
@@ -12,27 +12,70 @@ Go to the above link for documentation, and additional downloads.
 Also, once JBoss AS7 is started you can go to http://localhost:8080
 for additional information.
 
-Important Notes
----------------
-JBoss AS now has two distributions:
-
-1. jboss-as-web
-   The Java EE Web Profile "certified" web profile disribution 
-      (includes Servlet 3.0 + JAX-RS/RestEasy + CDI/Weld + 
-       EJB 3 Lite + Bean Validation + JCA + JPA/Hibernate)
-
-2. jboss-as
-   The everything distribution. This distribution is not certified. It includes
-    all of the specs in 1 but also adds JMS/HornetQ, and JAX-WS/JBoss Web Services
-
 
 Key Features
-------------
-
+--------------
+* Java EE 6
 * Fast Startup
 * Small Footprint
 * Modular Design
 * Unified Configuration and Management
+* Distributed Domain Management
 * OSGi
 
-And of course Java EE!
+Release Notes
+-------------
+You can obtain the release notes here:
+https://community.jboss.org/wiki/AS710FinalReleaseNotes
+
+Getting Started
+----------------
+JBoss AS 7 requires JDK 1.6 or later.  For information regarding installation
+of the JDK, see http://www.oracle.com/technetwork/java/index.html
+
+JBoss AS 7 has two modes of operation: Standalone and Domain.  For more
+information regarding these modes, please refer to the documentation 
+available on the JBoss.org site:
+
+https://docs.jboss.org/author/display/AS71/Documentation
+
+
+Starting a Standalone Server
+----------------------------
+An AS7 standalone server runs a single instance of AS7.
+
+<JBOSS_HOME>/bin/standalone.sh      (Unix / Linux)
+
+<JBOSS_HOME>\bin\standalone.bat     (Windows)
+
+
+Starting a Managed Domain
+--------------------------
+An AS7 managed domain allows you to control and configure multiple instances 
+of AS7, potentially across several physical (or virtual) machines.  The default 
+configuration includes a domain controller and a single server group with three 
+servers (two of which start automatically), all running on the localhost.
+
+<JBOSS_HOME>/bin/domain.sh      (Unix / Linux)
+
+<JBOSS_HOME>\bin\domain.bat     (Windows)
+ 
+
+Accessing the Web Console
+--------------------------
+Once the server has started you can access the landing page:
+
+http:/localhost:8080/
+
+This page includes links to online documentation, quick start guides, forums 
+and the administration console.
+
+
+Stopping the Server
+-------------------
+The JBoss AS7 server can be stopped by pressing Ctrl-C on the command line.
+If the server is running in a background process, the server can be stopped
+using the JBoss CLI:
+
+<JBOSS_HOME>/bin/jboss-cli.sh --connect --command=:shutdown
+

data/jboss/appclient/configuration/appclient.xml

@@ -144,7 +144,7 @@
             </core-environment>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:webservices:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:webservices:1.1"/>
     </profile>
 
     <interfaces>

data/jboss/bin/add-user.bat

@@ -1,6 +1,6 @@
 @echo off
 rem -------------------------------------------------------------------------
-rem Ass User script for Windows
+rem Add User script for Windows
 rem -------------------------------------------------------------------------
 rem
 rem A simple utility for adding new users to the properties file used 
@@ -18,11 +18,21 @@ if "%OS%" == "Windows_NT" (
 )
 
 pushd %DIRNAME%..
+set "RESOLVED_JBOSS_HOME=%CD%"
+popd
+
 if "x%JBOSS_HOME%" == "x" (
-  set "JBOSS_HOME=%CD%"
+  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" (

data/jboss/bin/add-user.sh

@@ -2,7 +2,7 @@
 
 # Add User Utility
 #
-# A simple utility for adding new users to the properties file used 
+# A simple utility for adding new users to the properties file used
 # for domain management authentication out of the box.
 #
 
@@ -25,9 +25,16 @@ if $cygwin ; then
 fi
 
 # Setup JBOSS_HOME
+RESOLVED_JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
 if [ "x$JBOSS_HOME" = "x" ]; then
     # get the full path (without any relative bits)
-    JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
+    JBOSS_HOME=$RESOLVED_JBOSS_HOME
+else
+ SANITIZED_JBOSS_HOME=`cd "$JBOSS_HOME"; pwd`
+ if [ "$RESOLVED_JBOSS_HOME" != "$SANITIZED_JBOSS_HOME" ]; then
+   echo "WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur."
+   echo ""
+ fi
 fi
 export JBOSS_HOME
 
@@ -59,6 +66,5 @@ fi
 eval \"$JAVA\" $JAVA_OPTS \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
          -mp \"${JBOSS_MODULEPATH}\" \
-         -logmodule "org.jboss.logmanager" \
          org.jboss.as.domain-add-user \
-         "$@" 
+         "$@"

data/jboss/bin/appclient.bat

@@ -26,11 +26,21 @@ if exist "%STANDALONE_CONF%" (
 )
 
 pushd %DIRNAME%..
+set "RESOLVED_JBOSS_HOME=%CD%"
+popd
+
 if "x%JBOSS_HOME%" == "x" (
-  set "JBOSS_HOME=%CD%"
+  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" (
@@ -81,7 +91,6 @@ if "x%JBOSS_MODULEPATH%" == "x" (
  "-Dlogging.configuration=file:%JBOSS_HOME%/standalone/configuration/logging.properties" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
     -mp "%JBOSS_MODULEPATH%" ^
-    -logmodule "org.jboss.logmanager" ^
     -jaxpmodule "javax.xml.jaxp-provider" ^
      org.jboss.as.standalone ^
     -Djboss.home.dir="%JBOSS_HOME%" ^

data/jboss/bin/appclient.sh

@@ -44,9 +44,16 @@ if $cygwin ; then
 fi
 
 # Setup JBOSS_HOME
+RESOLVED_JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
 if [ "x$JBOSS_HOME" = "x" ]; then
     # get the full path (without any relative bits)
-    JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
+    JBOSS_HOME=$RESOLVED_JBOSS_HOME
+else
+ SANITIZED_JBOSS_HOME=`cd "$JBOSS_HOME"; pwd`
+ if [ "$RESOLVED_JBOSS_HOME" != "$SANITIZED_JBOSS_HOME" ]; then
+   echo "WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur."
+   echo ""
+ fi
 fi
 export JBOSS_HOME
 
@@ -114,7 +121,6 @@ eval \"$JAVA\" $JAVA_OPTS \
  \"-Dlogging.configuration=file:$JBOSS_HOME/appclient/configuration/logging.properties\" \
  org.jboss.modules.Main \
  -mp \"${JBOSS_MODULEPATH}\" \
- -logmodule "org.jboss.logmanager" \
  -jaxpmodule javax.xml.jaxp-provider \
  org.jboss.as.appclient \
  -Djboss.home.dir=\"$JBOSS_HOME\" \

data/jboss/bin/client/README.txt

@@ -0,0 +1,40 @@
+This folder contains a combined client jar for JBoss AS7, for use in non-maven environments. This jar should be used
+with standalone clients only, not with deployments are that deployed to an AS7 instance.
+
+This jar contains the classes required for remote JMS and EJB usage, and consists of the following shaded artifacts:
+
+org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec
+org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec
+org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec
+
+org.jboss:jboss-remote-naming
+org.jboss.logging:jboss-logging
+org.jboss.marshalling:jboss-marshalling
+org.jboss.marshalling:jboss-marshalling-river
+org.jboss.remoting3:jboss-remoting
+org.jboss.remoting3:remoting-jmx
+org.jboss.sasl:jboss-sasl
+org.jboss.xnio:xnio-api
+org.jboss.xnio:xnio-nio
+org.jboss.netty:netty
+org.hornetq:hornetq-core-client
+org.hornetq:hornetq-jms-client
+
+
+Maven users should not use this jar, but should use the following BOM dependencies instead
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-ejb-client-bom</artifactId>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-jms-client-bom</artifactId>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+
+This is because using maven with a shaded jar has a very high chance of causing class version conflicts, which is why
+we do not publish this jar to the maven repository.

data/jboss/bin/domain.bat

@@ -26,11 +26,21 @@ if exist "%DOMAIN_CONF%" (
 )
 
 pushd %DIRNAME%..
+set "RESOLVED_JBOSS_HOME=%CD%"
+popd
+
 if "x%JBOSS_HOME%" == "x" (
-  set "JBOSS_HOME=%CD%"
+  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" (
@@ -53,7 +63,8 @@ if "x%JAVA_HOME%" == "x" (
 rem Add -server to the JVM options, if supported
 "%JAVA%" -server -version 2>&1 | findstr /I hotspot > nul
 if not errorlevel == 1 (
-  set "JAVA_OPTS=%JAVA_OPTS% -server"
+  set "PROCESS_CONTROLLER_JAVA_OPTS=%PROCESS_CONTROLLER_JAVA_OPTS% -server"
+  set "HOST_CONTROLLER_JAVA_OPTS=%HOST_CONTROLLER_JAVA_OPTS% -server"
 )
 
 rem Find run.jar, or we can't continue
@@ -75,6 +86,19 @@ if "x%JBOSS_MODULEPATH%" == "x" (
   set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
+rem Set the domain base dir
+if "x%JBOSS_BASE_DIR%" == "x" (
+  set  "JBOSS_BASE_DIR=%JBOSS_HOME%\domain"
+)
+rem Set the domain log dir
+if "x%JBOSS_LOG_DIR%" == "x" (
+  set  "JBOSS_LOG_DIR=%JBOSS_BASE_DIR%\log"
+)
+rem Set the domain configuration dir
+if "x%JBOSS_CONFIG_DIR%" == "x" (
+  set  "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%/configuration"
+)
+
 echo ===============================================================================
 echo.
 echo   JBoss Bootstrap Environment
@@ -90,17 +114,16 @@ echo.
 
 :RESTART
 "%JAVA%" %PROCESS_CONTROLLER_JAVA_OPTS% ^
- "-Dorg.jboss.boot.log.file=%JBOSS_HOME%\domain\log\process-controller\boot.log" ^
- "-Dlogging.configuration=file:%JBOSS_HOME%/domain/configuration/logging.properties" ^
+ "-Dorg.jboss.boot.log.file=%JBOSS_LOG_DIR%\process-controller.log" ^
+ "-Dlogging.configuration=file:%JBOSS_CONFIG_DIR%/logging.properties" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
     -mp "%JBOSS_MODULEPATH%" ^
-    -logmodule "org.jboss.logmanager" ^
      org.jboss.as.process-controller ^
     -jboss-home "%JBOSS_HOME%" ^
     -jvm "%JAVA%" ^
     -- ^
-    "-Dorg.jboss.boot.log.file=%JBOSS_HOME%\domain\log\host-controller\boot.log" ^
-    "-Dlogging.configuration=file:%JBOSS_HOME%/domain/configuration/logging.properties" ^
+    "-Dorg.jboss.boot.log.file=%JBOSS_LOG_DIR%\host-controller.log" ^
+    "-Dlogging.configuration=file:%JBOSS_CONFIG_DIR%/logging.properties" ^
     %HOST_CONTROLLER_JAVA_OPTS% ^
     -- ^
     -default-jvm "%JAVA%" ^

data/jboss/bin/domain.conf

@@ -44,6 +44,7 @@ fi
 if [ "x$JAVA_OPTS" = "x" ]; then
    JAVA_OPTS="-Xms64m -Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
    JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
+   JAVA_OPTS="$JAVA_OPTS -Djboss.domain.default.config=domain.xml -Djboss.host.default.config=host.xml"
 else
    echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"
 fi

data/jboss/bin/domain.conf.bat

@@ -55,6 +55,9 @@ 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 files to use if -c, --domain-config or --host-config are not used
+set "JAVA_OPTS=%JAVA_OPTS% -Djboss.domain.default.config=domain.xml -Djboss.host.default.config=host.xml"
+
 rem # Use JBoss Modules lockless mode
 rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"
 

data/jboss/bin/domain.sh

@@ -44,9 +44,16 @@ if $cygwin ; then
 fi
 
 # Setup JBOSS_HOME
+RESOLVED_JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
 if [ "x$JBOSS_HOME" = "x" ]; then
     # get the full path (without any relative bits)
-    JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
+    JBOSS_HOME=$RESOLVED_JBOSS_HOME
+else
+ SANITIZED_JBOSS_HOME=`cd "$JBOSS_HOME"; pwd`
+ if [ "$RESOLVED_JBOSS_HOME" != "$SANITIZED_JBOSS_HOME" ]; then
+   echo "WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur."
+   echo ""
+ fi
 fi
 export JBOSS_HOME
 
@@ -84,7 +91,8 @@ if [ "x$SERVER_SET" = "x" ]; then
     if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" ]; then
         # MacOS does not support -server flag
         if [ "$darwin" != "true" ]; then
-            JAVA_OPTS="-server $JAVA_OPTS"
+            PROCESS_CONTROLLER_JAVA_OPTS="-server $PROCESS_CONTROLLER_JAVA_OPTS"
+            HOST_CONTROLLER_JAVA_OPTS="-server $HOST_CONTROLLER_JAVA_OPTS"
             JVM_OPTVERSION="-server $JVM_OPTVERSION"
         fi
     fi
@@ -96,6 +104,38 @@ if [ "x$JBOSS_MODULEPATH" = "x" ]; then
     JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
+if $linux; then
+    # consolidate the host-controller and command line opts
+    HOST_CONTROLLER_OPTS="$HOST_CONTROLLER_JAVA_OPTS $@"
+    # process the host-controller options
+    for var in $HOST_CONTROLLER_OPTS
+    do
+      case $var in
+        -Djboss.domain.base.dir=*)
+             JBOSS_BASE_DIR=`readlink -m ${var#*=}`
+             ;;
+        -Djboss.domain.log.dir=*)
+             JBOSS_LOG_DIR=`readlink -m ${var#*=}`
+             ;;
+        -Djboss.domain.config.dir=*)
+             JBOSS_CONFIG_DIR=`readlink -m ${var#*=}`
+             ;;
+      esac
+    done
+fi
+# determine the default base dir, if not set
+if [ "x$JBOSS_BASE_DIR" = "x" ]; then
+   JBOSS_BASE_DIR="$JBOSS_HOME/domain"
+fi
+# determine the default log dir, if not set
+if [ "x$JBOSS_LOG_DIR" = "x" ]; then
+   JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log"
+fi
+# determine the default configuration dir, if not set
+if [ "x$JBOSS_CONFIG_DIR" = "x" ]; then
+   JBOSS_CONFIG_DIR="$JBOSS_BASE_DIR/configuration"
+fi
+
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
     JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
@@ -122,18 +162,17 @@ echo ""
 while true; do
    if [ "x$LAUNCH_JBOSS_IN_BACKGROUND" = "x" ]; then
       # Execute the JVM in the foreground
-      eval \"$JAVA\" $PROCESS_CONTROLLER_JAVA_OPTS \
-         \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-controller/boot.log\" \
-         \"-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties\" \
+      eval \"$JAVA\" -D\"[Process Controller]\" $PROCESS_CONTROLLER_JAVA_OPTS \
+         \"-Dorg.jboss.boot.log.file=$JBOSS_LOG_DIR/process-controller.log\" \
+         \"-Dlogging.configuration=file:$JBOSS_CONFIG_DIR/logging.properties\" \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
          -mp \"${JBOSS_MODULEPATH}\" \
-         -logmodule "org.jboss.logmanager" \
          org.jboss.as.process-controller \
          -jboss-home \"$JBOSS_HOME\" \
          -jvm \"$JAVA\" \
          -- \
-         \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/host-controller/boot.log\" \
-         \"-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties\" \
+         \"-Dorg.jboss.boot.log.file=$JBOSS_LOG_DIR/host-controller.log\" \
+         \"-Dlogging.configuration=file:$JBOSS_CONFIG_DIR/logging.properties\" \
          $HOST_CONTROLLER_JAVA_OPTS \
          -- \
          -default-jvm \"$JAVA\" \
@@ -141,18 +180,17 @@ while true; do
       JBOSS_STATUS=$?
    else
       # Execute the JVM in the background
-      eval \"$JAVA\" $PROCESS_CONTROLLER_JAVA_OPTS \
-         \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-controller/boot.log\" \
-         \"-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties\" \
+      eval \"$JAVA\" -D\"[Process Controller]\" $PROCESS_CONTROLLER_JAVA_OPTS \
+         \"-Dorg.jboss.boot.log.file=$JBOSS_LOG_DIR/process-controller.log\" \
+         \"-Dlogging.configuration=file:$JBOSS_CONFIG_DIR/logging.properties\" \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
          -mp \"${JBOSS_MODULEPATH}\" \
-         -logmodule "org.jboss.logmanager" \
          org.jboss.as.process-controller \
          -jboss-home \"$JBOSS_HOME\" \
          -jvm \"$JAVA\" \
          -- \
-         \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/host-controller/boot.log\" \
-         \"-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties\" \
+         \"-Dorg.jboss.boot.log.file=$JBOSS_LOG_DIR/host-controller.log\" \
+         \"-Dlogging.configuration=file:$JBOSS_CONFIG_DIR/logging.properties\" \
          $HOST_CONTROLLER_JAVA_OPTS \
          -- \
          -default-jvm \"$JAVA\" \
@@ -189,7 +227,7 @@ while true; do
       fi
       if [ "x$JBOSS_PIDFILE" != "x" ]; then
             grep "$JBOSS_PID" $JBOSS_PIDFILE && rm $JBOSS_PIDFILE
-      fi 
+      fi
    fi
    if [ "$JBOSS_STATUS" -eq 10 ]; then
       echo "Restarting JBoss..."

data/jboss/bin/{jboss-admin.bat → jboss-cli.bat}

@@ -15,17 +15,27 @@ if "%OS%" == "Windows_NT" (
 )
 
 pushd %DIRNAME%..
+set "RESOLVED_JBOSS_HOME=%CD%"
+popd
+
 if "x%JBOSS_HOME%" == "x" (
-  set "JBOSS_HOME=%CD%"
+  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=jboss-admin.bat"
+  set "PROGNAME=jboss-cli.bat"
 )
 
 rem Setup JBoss specific properties
@@ -50,7 +60,6 @@ if exist "%JBOSS_HOME%\jboss-modules.jar" (
 
 "%JAVA%" %JAVA_OPTS% ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -logmodule "org.jboss.logmanager"  ^
     -mp "%JBOSS_HOME%\modules" ^
      org.jboss.as.cli ^
      %*

data/jboss/bin/{jboss-admin.sh → jboss-cli.sh}

@@ -31,9 +31,16 @@ if $cygwin ; then
 fi
 
 # Setup JBOSS_HOME
+RESOLVED_JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
 if [ "x$JBOSS_HOME" = "x" ]; then
     # get the full path (without any relative bits)
-    JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
+    JBOSS_HOME=$RESOLVED_JBOSS_HOME
+else
+ SANITIZED_JBOSS_HOME=`cd "$JBOSS_HOME"; pwd`
+ if [ "$RESOLVED_JBOSS_HOME" != "$SANITIZED_JBOSS_HOME" ]; then
+   echo "WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur."
+   echo ""
+ fi
 fi
 export JBOSS_HOME
 
@@ -60,4 +67,4 @@ fi
 # Sample JPDA settings for remote socket debugging
 #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
 
-eval \"$JAVA\" $JAVA_OPTS -jar \"$JBOSS_HOME/jboss-modules.jar\" -logmodule "org.jboss.logmanager" -mp \"$JBOSS_HOME/modules\" org.jboss.as.cli '"$@"'
+eval \"$JAVA\" $JAVA_OPTS -jar \"$JBOSS_HOME/jboss-modules.jar\" -mp \"$JBOSS_HOME/modules\" org.jboss.as.cli '"$@"'

data/jboss/bin/jconsole.bat

@@ -0,0 +1,93 @@
+@echo off
+rem -------------------------------------------------------------------------
+rem jconsole script for Windows
+rem -------------------------------------------------------------------------
+rem
+rem A script for running jconsole with the remoting-jmx libraries on the classpath. 
+
+rem $Id$
+
+@if not "%ECHO%" == ""  echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+  set "DIRNAME=%~dp0%"
+) else (
+  set DIRNAME=.\
+)
+
+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=jdr.bat"
+)
+
+rem Setup JBoss specific properties
+if "x%JAVA_HOME%" == "x" (  
+  echo JAVA_HOME is not set. Unable to locate the jars needed to run jconsole.
+  goto END
+)
+
+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 Set default module root paths
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
+)
+
+rem Setup The Classpath
+
+set CLASSPATH=%JAVA_HOME%\lib\jconsole.jar
+set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\remoting3\remoting-jmx\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\remoting3\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\logging\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\xnio\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\xnio\nio\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\sasl\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\marshalling\main
+call :SearchForJars %JBOSS_MODULEPATH%\org\jboss\marshalling\river\main
+  
+echo %CLASSPATH%
+
+"%JAVA_HOME%\bin\jconsole.exe" -J"-Djava.class.path=%CLASSPATH%" 
+
+:END
+goto :EOF
+
+:SearchForJars
+pushd %1
+for %%j in (*.jar) do call :ClasspathAdd %1\%%j
+popd
+goto :EOF
+
+:ClasspathAdd
+SET CLASSPATH=%CLASSPATH%;%1
+
+:EOF

data/jboss/bin/jconsole.sh

@@ -35,9 +35,16 @@ if $cygwin ; then
 fi
 
 # Setup JBOSS_HOME
+RESOLVED_JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
 if [ "x$JBOSS_HOME" = "x" ]; then
     # get the full path (without any relative bits)
-    JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
+    JBOSS_HOME=$RESOLVED_JBOSS_HOME
+else
+ SANITIZED_JBOSS_HOME=`cd "$JBOSS_HOME"; pwd`
+ if [ "$RESOLVED_JBOSS_HOME" != "$SANITIZED_JBOSS_HOME" ]; then
+   echo "WARNING JBOSS_HOME may be pointing to a different installation - unpredictable results may occur."
+   echo ""
+ fi
 fi
 export JBOSS_HOME