[Jboss-cvs] JBossAS SVN: r55474 - branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server

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

Author: scott.stark at jboss.org
Date: 2006-08-09 23:22:14 -0400 (Wed, 09 Aug 2006)
New Revision: 55474

Modified:
   branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
   branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerImpl.java
Log:
Add a base ServerConfig accessor

Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java	2006-08-10 03:19:13 UTC (rev 55473)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerConfigImpl.java	2006-08-10 03:22:14 UTC (rev 55474)
@@ -48,6 +48,11 @@
       this.config = config;
    }
 
+   public ServerConfig getConfig()
+   {
+      return config;
+   }
+
    public boolean equals(Object obj)
    {
       return config.equals(obj);

Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerImpl.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerImpl.java	2006-08-10 03:19:13 UTC (rev 55473)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/server/ServerImpl.java	2006-08-10 03:22:14 UTC (rev 55474)
@@ -156,7 +156,8 @@
    private void doInit(final Properties props) throws Exception
    {
       // Create a new config object from the give properties
-      this.config = new ServerConfigImpl(props);
+      BaseServerConfig baseConfig = new BaseServerConfig(props);
+      this.config = new ServerConfigImpl(baseConfig);
 
       /* Initialize the logging layer using the Server.class. The server log
       directory is initialized prior to this to ensure the jboss.server.log.dir
@@ -310,7 +311,7 @@
       if (config == null)
          throw new IllegalStateException("not initialized");
 
-      return config;
+      return config.getConfig();
    }
 
    /**