RubyGems - torquebox-server - Versions diffs - 2.1.2-java → 2.2.0-java - Mend

@@ -127,4 +127,4 @@ eval \"$JAVA\" $JAVA_OPTS \
  -Djboss.server.base.dir=\"$JBOSS_HOME/appclient\" \
  "$@"
 JBOSS_STATUS=$?
-exit $JBOSS_STATUS
+exit $JBOSS_STATUS

@@ -83,12 +83,17 @@ if [ "x$SERVER_SET" = "x" ]; then
     fi
     # Check for OpenJDK JVM w/server support
-    if [ "x$HAS_OPENJDK_" = "x" ]; then
+    if [ "x$HAS_OPENJDK" = "x" ]; then
         HAS_OPENJDK=`"$JAVA" $JVM_OPTVERSION 2>&1 | $GREP -i OpenJDK`
     fi
+    # Check for IBM JVM w/server support
+    if [ "x$HAS_IBM" = "x" ]; then
+        HAS_IBM=`"$JAVA" $JVM_OPTVERSION 2>&1 | $GREP -i "IBM J9"`
+    fi
     # Enable -server if we have Hotspot or OpenJDK, unless we can't
-    if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" ]; then
+    if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" -o "x$HAS_IBM" != "x" ]; then
         # MacOS does not support -server flag
         if [ "$darwin" != "true" ]; then
             PROCESS_CONTROLLER_JAVA_OPTS="-server $PROCESS_CONTROLLER_JAVA_OPTS"

@@ -98,7 +98,7 @@ start() {
   until [ $count -gt $STARTUP_WAIT ]
   do
-    grep 'JBoss AS.*started in' $JBOSS_CONSOLE_LOG > /dev/null
+    grep 'JBAS015874:' $JBOSS_CONSOLE_LOG > /dev/null
     if [ $? -eq 0 ] ; then
       launched=true
       break

@@ -0,0 +1,46 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2010, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+# Additional logger names to configure (root logger is always configured)
+loggers=org,org.jboss.as.cli
+logger.org.level=OFF
+# assign a lower level to enable CLI logging
+logger.org.jboss.as.cli.level=OFF
+# Root logger level
+logger.level=${jboss.cli.log.level:INFO}
+# Root logger handlers
+# uncomment to enable logging to the file
+#logger.handlers=FILE
+# File handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.level=DEBUG
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${jboss.cli.log.file:jboss-cli.log}
+handler.FILE.formatter=PATTERN
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n

@@ -70,4 +70,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\" -mp \"$JBOSS_HOME/modules\" org.jboss.as.cli '"$@"'
+eval \"$JAVA\" $JAVA_OPTS \"-Dlogging.configuration=file:$JBOSS_HOME/bin/jboss-cli-logging.properties\" -jar \"$JBOSS_HOME/jboss-modules.jar\" -mp \"$JBOSS_HOME/modules\" org.jboss.as.cli '"$@"'

@@ -53,7 +53,8 @@ if [ "x$JAVA" = "x" ]; then
     if [ "x$JAVA_HOME" != "x" ]; then
         JAVA="$JAVA_HOME/bin/java"
     else
-        JAVA="java"
+        echo "JAVA_HOME is not set. Unable to locate the jars needed to run jconsole."
+        exit 2
     fi
 fi

@@ -7,4 +7,4 @@ echo
 echo To start JBoss Application Server please see $DIR/../README.txt
 echo
 echo ========================================================================================
-echo
+echo

@@ -392,7 +392,7 @@
             <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
             <coordinator-environment default-timeout="300"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:web:1.1" default-virtual-server="default-host" native="false">
+        <subsystem xmlns="urn:jboss:domain:web:1.2" default-virtual-server="default-host" native="false">
             <connector name="http" protocol="HTTP/1.1" scheme="http" socket-binding="http"/>
             <virtual-server name="default-host" enable-welcome-root="true">
                 <alias name="localhost"/>

@@ -24,7 +24,10 @@
 </head>
 <body>
 <!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to content</a> | <a href="#navigation">Skip to navigation</a> | <a href="#searcher">Skip to search</a>| </span><a href="#translations">Translations of this page</a> | <a href="/accessibility/">Accessibility</a></div>
+<div id="toplinks"><a href="#content">Skip to content</a> |
+<span class="netscape4">
+<a href="#navigation">Skip to navigation</a> |</span>
+<a href="/accessibility/">Accessibility</a></div>
 <!-- end of server/body-include-1.html -->

torquebox-server 2.1.2-java → 2.2.0-java