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

data/jboss/bin/add-user.bat

@@ -55,13 +55,13 @@ rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Set default module root paths
-if "x%MODULEPATH%" == "x" (
-  set  "MODULEPATH=%JBOSS_HOME%\modules"
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
 "%JAVA%" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -mp "%MODULEPATH%" ^
+    -mp "%JBOSS_MODULEPATH%" ^
      org.jboss.as.domain-add-user ^
      %*
 

data/jboss/bin/add-user.sh

@@ -40,8 +40,8 @@ if [ "x$JAVA" = "x" ]; then
     fi
 fi
 
-if [ "x$MODULEPATH" = "x" ]; then
-    MODULEPATH="$JBOSS_HOME/modules"
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
 # For Cygwin, switch paths to Windows format before running java
@@ -50,7 +50,7 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
     JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-    MODULEPATH=`cygpath --path --windows "$MODULEPATH"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
 fi
 
 # Sample JPDA settings for remote socket debugging
@@ -58,7 +58,7 @@ fi
 
 eval \"$JAVA\" $JAVA_OPTS \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
-         -mp \"${MODULEPATH}\" \
+         -mp \"${JBOSS_MODULEPATH}\" \
          -logmodule "org.jboss.logmanager" \
          org.jboss.as.domain-add-user \
          "$@" 

data/jboss/bin/appclient.bat

@@ -71,8 +71,8 @@ rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Set default module root paths
-if "x%MODULEPATH%" == "x" (
-  set  "MODULEPATH=%JBOSS_HOME%\modules"
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
 
@@ -80,7 +80,7 @@ if "x%MODULEPATH%" == "x" (
  "-Dorg.jboss.boot.log.file=%JBOSS_HOME%\standalone\log\boot.log" ^
  "-Dlogging.configuration=file:%JBOSS_HOME%/standalone/configuration/logging.properties" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -mp "%MODULEPATH%" ^
+    -mp "%JBOSS_MODULEPATH%" ^
     -logmodule "org.jboss.logmanager" ^
     -jaxpmodule "javax.xml.jaxp-provider" ^
      org.jboss.as.standalone ^

data/jboss/bin/appclient.conf.bat

@@ -62,6 +62,6 @@ 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 #JAVA_OPTS="$JAVA_OPTS -Djboss.modules.lockless=true"
+rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"
 
 :JAVA_OPTS_SET

data/jboss/bin/appclient.sh

@@ -92,8 +92,8 @@ else
     JVM_OPTVERSION="-server $JVM_OPTVERSION"
 fi
 
-if [ "x$MODULEPATH" = "x" ]; then
-    MODULEPATH="$JBOSS_HOME/modules"
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
 # For Cygwin, switch paths to Windows format before running java
@@ -102,7 +102,7 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
     JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-    MODULEPATH=`cygpath --path --windows "$MODULEPATH"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
 fi
 
 CLASSPATH="$CLASSPATH:$JBOSS_HOME/jboss-modules.jar"
@@ -113,7 +113,7 @@ eval \"$JAVA\" $JAVA_OPTS \
  \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/appclient/log/boot.log\" \
  \"-Dlogging.configuration=file:$JBOSS_HOME/appclient/configuration/logging.properties\" \
  org.jboss.modules.Main \
- -mp \"${MODULEPATH}\" \
+ -mp \"${JBOSS_MODULEPATH}\" \
  -logmodule "org.jboss.logmanager" \
  -jaxpmodule javax.xml.jaxp-provider \
  org.jboss.as.appclient \

data/jboss/bin/domain.bat

@@ -71,8 +71,8 @@ rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Set default module root paths
-if "x%MODULEPATH%" == "x" (
-  set  "MODULEPATH=%JBOSS_HOME%\modules"
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
 echo ===============================================================================
@@ -93,7 +93,7 @@ echo.
  "-Dorg.jboss.boot.log.file=%JBOSS_HOME%\domain\log\process-controller\boot.log" ^
  "-Dlogging.configuration=file:%JBOSS_HOME%/domain/configuration/logging.properties" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -mp "%MODULEPATH%" ^
+    -mp "%JBOSS_MODULEPATH%" ^
     -logmodule "org.jboss.logmanager" ^
      org.jboss.as.process-controller ^
     -jboss-home "%JBOSS_HOME%" ^

data/jboss/bin/domain.conf.bat

@@ -46,7 +46,7 @@ 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"
+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"
@@ -56,7 +56,7 @@ rem # This is necessary to inject Byteman rules into AS7 deployments
 set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.system.pkgs=org.jboss.byteman"
 
 rem # Use JBoss Modules lockless mode
-rem #JAVA_OPTS="$JAVA_OPTS -Djboss.modules.lockless=true"
+rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"
 
 rem The ProcessController process uses its own set of java options
 set "PROCESS_CONTROLLER_JAVA_OPTS=%JAVA_OPTS%"

data/jboss/bin/domain.sh

@@ -92,8 +92,8 @@ else
     JVM_OPTVERSION="-server $JVM_OPTVERSION"
 fi
 
-if [ "x$MODULEPATH" = "x" ]; then
-    MODULEPATH="$JBOSS_HOME/modules"
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
 # For Cygwin, switch paths to Windows format before running java
@@ -102,7 +102,7 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
     JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-    MODULEPATH=`cygpath --path --windows "$MODULEPATH"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
 fi
 
 # Display our environment
@@ -126,7 +126,7 @@ while true; do
          \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-controller/boot.log\" \
          \"-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties\" \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
-         -mp \"${MODULEPATH}\" \
+         -mp \"${JBOSS_MODULEPATH}\" \
          -logmodule "org.jboss.logmanager" \
          org.jboss.as.process-controller \
          -jboss-home \"$JBOSS_HOME\" \
@@ -145,7 +145,7 @@ while true; do
          \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/domain/log/process-controller/boot.log\" \
          \"-Dlogging.configuration=file:$JBOSS_HOME/domain/configuration/logging.properties\" \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
-         -mp \"${MODULEPATH}\" \
+         -mp \"${JBOSS_MODULEPATH}\" \
          -logmodule "org.jboss.logmanager" \
          org.jboss.as.process-controller \
          -jboss-home \"$JBOSS_HOME\" \

data/jboss/bin/jboss-admin.sh

@@ -52,6 +52,11 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
 fi
 
+if $darwin ; then
+    # Add the apple gui packages for the gui client
+    JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=com.apple.laf,com.apple.laf.resources"
+fi
+
 # Sample JPDA settings for remote socket debugging
 #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
 

data/jboss/bin/jconsole.sh

@@ -0,0 +1,82 @@
+#!/bin/sh
+
+DIRNAME=`dirname "$0"`
+GREP="grep"
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+linux=false;
+case "`uname`" in
+    CYGWIN*)
+        cygwin=true
+        ;;
+
+    Darwin*)
+        darwin=true
+        ;;
+
+    Linux)
+        linux=true
+        ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$JBOSS_HOME" ] &&
+        JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+    [ -n "$JAVA_HOME" ] &&
+        JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+    [ -n "$JAVAC_JAR" ] &&
+        JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"`
+fi
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_HOME=`cd "$DIRNAME/.."; pwd`
+fi
+export JBOSS_HOME
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+        JAVA="$JAVA_HOME/bin/java"
+    else
+        JAVA="java"
+    fi
+fi
+
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+    JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
+    JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
+fi
+
+CLASSPATH=$JAVA_HOME/lib/jconsole.jar
+CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
+
+MODULES="org/jboss/remoting3/remoting-jmx org/jboss/remoting3 org/jboss/logging org/jboss/xnio org/jboss/xnio/nio org/jboss/sasl org/jboss/marshalling org/jboss/marshalling/river"
+
+for MODULE in $MODULES
+do
+    for JAR in `cd "$JBOSS_MODULEPATH/$MODULE/main/" && ls -1 *.jar`
+    do
+        CLASSPATH="$CLASSPATH:$JBOSS_MODULEPATH/$MODULE/main/$JAR"
+    done
+done
+
+
+echo CLASSPATH $CLASSPATH
+
+jconsole -J-Djava.class.path="$CLASSPATH"

data/jboss/bin/standalone.bat

@@ -71,8 +71,8 @@ rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Set default module root paths
-if "x%MODULEPATH%" == "x" (
-  set  "MODULEPATH=%JBOSS_HOME%\modules"
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
 echo ===============================================================================
@@ -93,7 +93,7 @@ echo.
  "-Dorg.jboss.boot.log.file=%JBOSS_HOME%\standalone\log\boot.log" ^
  "-Dlogging.configuration=file:%JBOSS_HOME%/standalone/configuration/logging.properties" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -mp "%MODULEPATH%" ^
+    -mp "%JBOSS_MODULEPATH%" ^
     -logmodule "org.jboss.logmanager" ^
     -jaxpmodule "javax.xml.jaxp-provider" ^
     -mbeanserverbuildermodule "org.jboss.as.jmx" ^

data/jboss/bin/standalone.conf.bat

@@ -46,7 +46,7 @@ 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"
+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"
@@ -62,6 +62,6 @@ 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 #JAVA_OPTS="$JAVA_OPTS -Djboss.modules.lockless=true"
+rem set "JAVA_OPTS=%JAVA_OPTS% -Djboss.modules.lockless=true"
 
 :JAVA_OPTS_SET

data/jboss/bin/standalone.sh

@@ -92,8 +92,8 @@ else
     JVM_OPTVERSION="-server $JVM_OPTVERSION"
 fi
 
-if [ "x$MODULEPATH" = "x" ]; then
-    MODULEPATH="$JBOSS_HOME/modules"
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
 # For Cygwin, switch paths to Windows format before running java
@@ -102,7 +102,7 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
     JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-    MODULEPATH=`cygpath --path --windows "$MODULEPATH"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
 fi
 
 # Display our environment
@@ -126,7 +126,7 @@ while true; do
          \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/standalone/log/boot.log\" \
          \"-Dlogging.configuration=file:$JBOSS_HOME/standalone/configuration/logging.properties\" \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
-         -mp \"${MODULEPATH}\" \
+         -mp \"${JBOSS_MODULEPATH}\" \
          -logmodule "org.jboss.logmanager" \
          -jaxpmodule "javax.xml.jaxp-provider" \
          -mbeanserverbuildermodule "org.jboss.as.jmx" \
@@ -140,7 +140,7 @@ while true; do
          \"-Dorg.jboss.boot.log.file=$JBOSS_HOME/standalone/log/boot.log\" \
          \"-Dlogging.configuration=file:$JBOSS_HOME/standalone/configuration/logging.properties\" \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
-         -mp \"${MODULEPATH}\" \
+         -mp \"${JBOSS_MODULEPATH}\" \
          -logmodule "org.jboss.logmanager" \
          -jaxpmodule "javax.xml.jaxp-provider" \
          -mbeanserverbuildermodule "org.jboss.as.jmx" \

data/jboss/bin/util/jdr.bat

@@ -57,13 +57,13 @@ rem Setup the java endorsed dirs
 set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
 
 rem Set default module root paths
-if "x%MODULEPATH%" == "x" (
-  set  "MODULEPATH=%JBOSS_HOME%\modules"
+if "x%JBOSS_MODULEPATH%" == "x" (
+  set  "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
 )
 
 "%JAVA%" ^
     -jar "%JBOSS_HOME%\jboss-modules.jar" ^
-    -mp "%MODULEPATH%" ^
+    -mp "%JBOSS_MODULEPATH%" ^
      org.jboss.as.jdr ^
     -Djboss.home.dir="%JBOSS_HOME%" ^
      %*

data/jboss/bin/util/jdr.sh

@@ -42,8 +42,8 @@ if [ "x$JAVA" = "x" ]; then
     fi
 fi
 
-if [ "x$MODULEPATH" = "x" ]; then
-    MODULEPATH="$JBOSS_HOME/modules"
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
 # For Cygwin, switch paths to Windows format before running java
@@ -52,12 +52,12 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
     JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-    MODULEPATH=`cygpath --path --windows "$MODULEPATH"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
 fi
 
 eval \"$JAVA\" $JAVA_OPTS \
          -jar \"$JBOSS_HOME/jboss-modules.jar\" \
-         -mp \"${MODULEPATH}\" \
+         -mp \"${JBOSS_MODULEPATH}\" \
          -logmodule "org.jboss.logmanager" \
          org.jboss.as.jdr \
          -Djboss.home.dir=\"$JBOSS_HOME\" \

data/jboss/bin/util/vault.sh

@@ -63,8 +63,8 @@ if [ "x$JAVA" = "x" ]; then
     fi
 fi
 
-if [ "x$MODULEPATH" = "x" ]; then
-    MODULEPATH="$JBOSS_HOME/modules"
+if [ "x$JBOSS_MODULEPATH" = "x" ]; then
+    JBOSS_MODULEPATH="$JBOSS_HOME/modules"
 fi
 
 ###
@@ -72,10 +72,10 @@ fi
 ###
 
 # Shared libs
-JBOSS_VAULT_CLASSPATH="$MODULEPATH/org/picketbox/main/*"
-JBOSS_VAULT_CLASSPATH="$JBOSS_VAULT_CLASSPATH:$MODULEPATH/org/jboss/logging/main/*"
-JBOSS_VAULT_CLASSPATH="$JBOSS_VAULT_CLASSPATH:$MODULEPATH/org/jboss/common-core/main/*"
-JBOSS_VAULT_CLASSPATH="$JBOSS_VAULT_CLASSPATH:$MODULEPATH/org/jboss/as/security/main/*"
+JBOSS_VAULT_CLASSPATH="$JBOSS_MODULEPATH/org/picketbox/main/*"
+JBOSS_VAULT_CLASSPATH="$JBOSS_VAULT_CLASSPATH:$JBOSS_MODULEPATH/org/jboss/logging/main/*"
+JBOSS_VAULT_CLASSPATH="$JBOSS_VAULT_CLASSPATH:$JBOSS_MODULEPATH/org/jboss/common-core/main/*"
+JBOSS_VAULT_CLASSPATH="$JBOSS_VAULT_CLASSPATH:$JBOSS_MODULEPATH/org/jboss/as/security/main/*"
 
 export JBOSS_VAULT_CLASSPATH
 
@@ -85,7 +85,7 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
     JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-    MODULEPATH=`cygpath --path --windows "$MODULEPATH"`
+    JBOSS_MODULEPATH=`cygpath --path --windows "$JBOSS_MODULEPATH"`
     JBOSS_VAULT_CLASSPATH=`cygpath --path --windows "$JBOSS_VAULT_CLASSPATH"`
 fi
 

data/jboss/docs/examples/configs/domain-jts.xml

@@ -6,6 +6,7 @@
         <extension module="org.jboss.as.clustering.infinispan"/>
         <extension module="org.jboss.as.clustering.jgroups"/>
         <extension module="org.jboss.as.cmp"/>
+        <extension module="org.jboss.as.configadmin"/>
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.ee"/>
         <extension module="org.jboss.as.ejb3"/>
@@ -75,6 +76,7 @@
                 </root-logger>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:cmp:1.0"/>
+            <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
             <subsystem xmlns="urn:jboss:domain:datasources:1.0">
                 <datasources>
                     <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="ExampleDS">
@@ -132,14 +134,17 @@
             <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="hibernate">
                 <cache-container name="hibernate" default-cache="local-query">
                     <local-cache name="entity">
+                        <transaction mode="NON_XA"/>
                         <eviction strategy="LRU" max-entries="10000"/>
                         <expiration max-idle="100000"/>
                     </local-cache>
                     <local-cache name="local-query">
+                        <transaction mode="NON_XA"/>
                         <eviction strategy="LRU" max-entries="10000"/>
                         <expiration max-idle="100000"/>
                     </local-cache>
                     <local-cache name="timestamps">
+                        <transaction mode="NON_XA"/>
                         <eviction strategy="NONE"/>
                     </local-cache>
                 </cache-container>
@@ -265,10 +270,7 @@
                 </hornetq-server>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
-            <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
-                <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
-                    <property name="manager.root" value="jboss-osgi"/>
-                </configuration>
+            <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
                 <properties>
                     <!-- Specifies the beginning start level of the framework -->
                     <property name="org.osgi.framework.startlevel.beginning">1</property>
@@ -279,28 +281,13 @@
                     <capability name="javax.servlet.api"/>
                     <capability name="javax.transaction.api"/>
                     <!-- bundles installed on startup -->
-                    <capability name="org.apache.aries.util"/>
-                    <capability name="org.jboss.osgi.webconsole"/>
                     <capability name="org.osgi.compendium"/>
                     <!-- bundles started in startlevel 1 -->
-                    <capability name="org.apache.felix.log" startlevel="1"/>
-                    <capability name="org.jboss.osgi.logging" startlevel="1"/>
                     <capability name="org.apache.felix.configadmin" startlevel="1"/>
                     <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
                     <!-- bundles started in startlevel 2 -->
-                    <capability name="org.apache.aries.jmx" startlevel="2"/>
-                    <capability name="org.apache.felix.eventadmin" startlevel="2"/>
-                    <capability name="org.apache.felix.metatype" startlevel="2"/>
-                    <capability name="org.apache.felix.scr" startlevel="2"/>
-                    <capability name="org.apache.felix.webconsole" startlevel="2"/>
                     <capability name="org.jboss.netty" startlevel="2"/>
-                    <capability name="org.jboss.osgi.jmx" startlevel="2"/>
-                    <capability name="org.jboss.osgi.http" startlevel="2"/>
                     <capability name="org.projectodd.stilts" startlevel="2"/>
-                    <!-- bundles started in startlevel 3 -->
-                    <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
-                    <capability name="org.jboss.osgi.webapp" startlevel="3"/>
-                    <capability name="org.jboss.osgi.xerces" startlevel="3"/>
                 </capabilities>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:remoting:1.1">
@@ -400,6 +387,7 @@
                     </handlers>
                 </root-logger>
             </subsystem>
+            <subsystem xmlns="urn:jboss:domain:configadmin:1.0"/>
             <subsystem xmlns="urn:jboss:domain:datasources:1.0">
                 <datasources>
                     <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true" pool-name="java:jboss/datasources/ExampleDS">
@@ -459,12 +447,14 @@
             <subsystem xmlns="urn:jboss:domain:infinispan:1.1" default-cache-container="cluster">
                 <cache-container name="cluster" default-cache="default">
                     <alias>ha-partition</alias>
+                    <transport lock-timeout="60000"/>
                     <replicated-cache name="default" mode="SYNC" batching="true">
                         <locking isolation="REPEATABLE_READ"/>
                     </replicated-cache>
                 </cache-container>
                 <cache-container name="web" default-cache="repl">
                     <alias>standard-session-cache</alias>
+                    <transport lock-timeout="60000"/>
                     <replicated-cache name="repl" mode="ASYNC" batching="true">
                         <file-store/>
                     </replicated-cache>
@@ -474,13 +464,14 @@
                 </cache-container>
                 <cache-container name="sfsb" default-cache="repl">
                     <alias>sfsb-cache</alias>
-                    <alias>jboss.cache:service=EJB3SFSBClusteredCache</alias>
+                    <transport lock-timeout="60000"/>
                     <replicated-cache name="repl" mode="ASYNC" batching="true">
                         <eviction strategy="LRU" max-entries="10000"/>
                         <file-store/>
                     </replicated-cache>
                 </cache-container>
                 <cache-container name="hibernate" default-cache="local-query">
+                    <transport lock-timeout="60000"/>
                     <invalidation-cache name="entity" mode="SYNC">
                         <eviction strategy="LRU" max-entries="10000"/>
                         <expiration max-idle="100000"/>
@@ -652,10 +643,7 @@
                 <mod-cluster-config advertise-socket="modcluster"/>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:naming:1.1"/>
-            <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
-                <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
-                    <property name="manager.root" value="jboss-osgi"/>
-                </configuration>
+            <subsystem xmlns="urn:jboss:domain:osgi:1.2" activation="lazy">
                 <properties>
                     <!-- Specifies the beginning start level of the framework -->
                     <property name="org.osgi.framework.startlevel.beginning">1</property>
@@ -666,28 +654,13 @@
                     <capability name="javax.servlet.api"/>
                     <capability name="javax.transaction.api"/>
                     <!-- bundles installed on startup -->
-                    <capability name="org.apache.aries.util"/>
-                    <capability name="org.jboss.osgi.webconsole"/>
                     <capability name="org.osgi.compendium"/>
                     <!-- bundles started in startlevel 1 -->
-                    <capability name="org.apache.felix.log" startlevel="1"/>
-                    <capability name="org.jboss.osgi.logging" startlevel="1"/>
                     <capability name="org.apache.felix.configadmin" startlevel="1"/>
                     <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
                     <!-- bundles started in startlevel 2 -->
-                    <capability name="org.apache.aries.jmx" startlevel="2"/>
-                    <capability name="org.apache.felix.eventadmin" startlevel="2"/>
-                    <capability name="org.apache.felix.metatype" startlevel="2"/>
-                    <capability name="org.apache.felix.scr" startlevel="2"/>
-                    <capability name="org.apache.felix.webconsole" startlevel="2"/>
                     <capability name="org.jboss.netty" startlevel="2"/>
-                    <capability name="org.jboss.osgi.jmx" startlevel="2"/>
-                    <capability name="org.jboss.osgi.http" startlevel="2"/>
                     <capability name="org.projectodd.stilts" startlevel="2"/>
-                    <!-- bundles started in startlevel 3 -->
-                    <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
-                    <capability name="org.jboss.osgi.webapp" startlevel="3"/>
-                    <capability name="org.jboss.osgi.xerces" startlevel="3"/>
                 </capabilities>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:remoting:1.1">