[jboss-cvs] JBossAS SVN: r89260 - in projects/bootstrap/trunk: impl-as/src/main/java/org/jboss/bootstrap/impl/as/server and 2 other directories.

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

Author: ALRubinger
Date: 2009-05-21 16:43:31 -0400 (Thu, 21 May 2009)
New Revision: 89260

Modified:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerImpl.java
   projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
   projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
Log:
[JBBOOT-77] Add @ManagementObject/@ManagementProperty annotations to fulfill legacy

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java	2009-05-21 20:10:11 UTC (rev 89259)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java	2009-05-21 20:43:31 UTC (rev 89260)
@@ -31,6 +31,9 @@
 import org.jboss.bootstrap.impl.base.config.AbstractBasicServerConfig;
 import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
 import org.jboss.logging.Logger;
+import org.jboss.managed.api.annotation.ManagementComponent;
+import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementProperties;
 
 /**
  * BasicJBossASServerConfig
@@ -42,6 +45,11 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
+ at ManagementObject(name = "jboss.system:type=ServerConfig", 
+      isRuntime = true, 
+      properties = ManagementProperties.EXPLICIT, 
+      description = "provides a view of server config information", 
+      componentType = @ManagementComponent(type = "MCBean", subtype = "*"))
 public class BasicJBossASServerConfig extends AbstractBasicServerConfig<JBossASServerConfig>
       implements
          JBossASServerConfig

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerImpl.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerImpl.java	2009-05-21 20:10:11 UTC (rev 89259)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/JBossASServerImpl.java	2009-05-21 20:43:31 UTC (rev 89260)
@@ -40,6 +40,9 @@
 import org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler;
 import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
 import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.managed.api.annotation.ManagementComponent;
+import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementProperties;
 import org.jboss.managed.api.annotation.ManagementProperty;
 
 /**
@@ -50,6 +53,13 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
+ at ManagementObject(
+      name="jboss.system:type=MCServer",
+      isRuntime=true,
+      properties=ManagementProperties.EXPLICIT,
+      description="the MCServer bootstrap view",
+      componentType=@ManagementComponent(type="MCBean", subtype="*")
+   )
 public class JBossASServerImpl extends AbstractMCServerBase<JBossASServer, JBossASServerConfig>
       implements
          JBossASServer

Modified: projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java
===================================================================
--- projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java	2009-05-21 20:10:11 UTC (rev 89259)
+++ projects/bootstrap/trunk/impl-base/src/main/java/org/jboss/bootstrap/impl/base/server/AbstractServer.java	2009-05-21 20:43:31 UTC (rev 89260)
@@ -203,7 +203,7 @@
    /* (non-Javadoc)
     * @see org.jboss.bootstrap.spi.server.Server#getConfiguration()
     */
-   public final T getConfiguration()
+   public T getConfiguration()
    {
       return this.configuration;
    }

Modified: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java	2009-05-21 20:10:11 UTC (rev 89259)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java	2009-05-21 20:43:31 UTC (rev 89260)
@@ -116,6 +116,21 @@
    }
 
    //-------------------------------------------------------------------------------------||
+   // Overridden Implementations ---------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /* (non-Javadoc)
+    * @see org.jboss.bootstrap.impl.base.server.AbstractServer#getConfiguration()
+    */
+   // Overridden just so that we can define the @ManagementProperty annotation
+   @ManagementProperty(name = "config")
+   @Override
+   public final T getConfiguration()
+   {
+      return super.getConfiguration();
+   }
+
+   //-------------------------------------------------------------------------------------||
    // Required Implementations -----------------------------------------------------------||
    //-------------------------------------------------------------------------------------||