[jboss-cvs] JBossAS SVN: r86806 - in projects/server-manager/trunk: src/main/java/org/jboss/jbossas/servermanager and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2009-04-04 22:04:42 -0400 (Sat, 04 Apr 2009)
New Revision: 86806

Modified:
   projects/server-manager/trunk/pom.xml
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
Log:
JBASM-25

Modified: projects/server-manager/trunk/pom.xml
===================================================================
--- projects/server-manager/trunk/pom.xml	2009-04-04 23:49:21 UTC (rev 86805)
+++ projects/server-manager/trunk/pom.xml	2009-04-05 02:04:42 UTC (rev 86806)
@@ -33,8 +33,8 @@
       Versioning
       
     -->
-    <version.org.jboss.security>2.0.2.SP3</version.org.jboss.security>
-    <version.jbossas>5.0.0.GA</version.jbossas>
+    <version.org.jboss.security>2.0.3.SP1</version.org.jboss.security>
+    <version.jbossas>5.0.1.GA</version.jbossas>
     <version.org.jboss.logging>2.0.5.GA</version.org.jboss.logging>
 
     <!-- External -->
@@ -66,7 +66,7 @@
              <name>org.jboss.logging.Logger.pluginClass</name>
              <value>logging.JDK14LoggerPlugin</value>
            </property>
-         </systemProperties>
+	 </systemProperties>
       </configuration>
       <executions>
         <execution>

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java	2009-04-04 23:49:21 UTC (rev 86805)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java	2009-04-05 02:04:42 UTC (rev 86806)
@@ -133,6 +133,9 @@
    /** the InitialContext factory class name to use */
    private String initialContextFactoryClassName = null;
 
+  /** the log threshold for the server */
+   private String logThreshold = null;
+
    /**
     * Get the name.
     *
@@ -322,6 +325,17 @@
    }
 
    /**
+    * Get the logging property to pass to the server
+    * JBAS-6630 - default to DEBUG 
+    *
+    * @return the log threshold property 
+    */
+   public String getLoggingProperty()
+   {
+      return "-Djboss.server.log.threshold=" + getLogThreshold(); 
+   }
+
+   /**
     * The running process of this server.
     * @param process
     */
@@ -772,6 +786,31 @@
       this.initialContextFactoryClassName = initialContextFactoryClassName;
    }
 
+  /**
+    * Get the Log Level
+    *
+    * @return the logThreshold
+    */
+
+   public String getLogThreshold()
+   {
+      if (null == this.logThreshold)
+        return "DEBUG";
+
+      return logThreshold;
+   }
+
+   /**
+    * Set the Log Level
+    *
+    * @param logThreshold log level
+    */
+   public void setLogThreshold (String logThreshold)
+   {
+      this.logThreshold = logThreshold;
+   }
+
+
    /*
     * Code below this marker has been ported from jboss-test to supply 
     * the Server with invokable operations support

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2009-04-04 23:49:21 UTC (rev 86805)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2009-04-05 02:04:42 UTC (rev 86806)
@@ -159,7 +159,7 @@
    private static String getStartCommandLine(Server server, ServerManager manager) throws IOException
    {
       String execCmd = manager.getJavaExecutable() + " -cp " + manager.getStartClasspath() + " ";
-      execCmd = execCmd + server.getJvmArgs() + server.getSysProperties();
+      execCmd = execCmd + server.getJvmArgs() + server.getSysProperties() + server.getLoggingProperty();
       execCmd = execCmd + " " + MAIN + " -c " + server.getConfig() + " -b " + server.getHost() + " -g " + server.getPartition();
       
       if (manager.getUdpGroup() != null && ! manager.getUdpGroup().equals(""))