[jboss-cvs] JBossAS SVN: r87190 - in projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc: server and 1 other directory.

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

Author: ALRubinger
Date: 2009-04-13 14:01:12 -0400 (Mon, 13 Apr 2009)
New Revision: 87190

Added:
   projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCBasedServerConfig.java
   projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java
Modified:
   projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCServerConfig.java
   projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCServer.java
Log:
[JBBOOT-35] Missing commits

Added: projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCBasedServerConfig.java
===================================================================
--- projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCBasedServerConfig.java	                        (rev 0)
+++ projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCBasedServerConfig.java	2009-04-13 18:01:12 UTC (rev 87190)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, 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.
+ */
+
+package org.jboss.bootstrap.spi.mc.config;
+
+import org.jboss.bootstrap.spi.config.ServerConfig;
+
+/**
+ * MCBasedServerConfig
+ * 
+ * Contract for MC-based Servers, may be extended for a direct
+ * MC ServerConfig
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface MCBasedServerConfig<T extends MCBasedServerConfig<T>> extends ServerConfig<T>
+{
+
+}

Modified: projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCServerConfig.java
===================================================================
--- projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCServerConfig.java	2009-04-13 17:43:38 UTC (rev 87189)
+++ projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/config/MCServerConfig.java	2009-04-13 18:01:12 UTC (rev 87190)
@@ -22,15 +22,15 @@
 
 package org.jboss.bootstrap.spi.mc.config;
 
-import org.jboss.bootstrap.spi.config.ServerConfig;
-
 /**
  * MCServerConfig
+ * 
+ * Contract of Microcontainer implementations of the ServerConfig
  *
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
-public interface MCServerConfig extends ServerConfig<MCServerConfig>
+public interface MCServerConfig extends MCBasedServerConfig<MCServerConfig>
 {
 
 }

Added: projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java
===================================================================
--- projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java	                        (rev 0)
+++ projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java	2009-04-13 18:01:12 UTC (rev 87190)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, 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.
+ */
+
+package org.jboss.bootstrap.spi.mc.server;
+
+import org.jboss.bootstrap.spi.mc.config.MCBasedServerConfig;
+import org.jboss.bootstrap.spi.server.Server;
+import org.jboss.kernel.Kernel;
+
+/**
+ * MCBasedServer
+ * 
+ * Contract for MC-based Servers, may be extended for a direct
+ * MC Server
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface MCBasedServer<K extends MCBasedServer<K, T>, T extends MCBasedServerConfig<T>> extends Server<K, T>
+{
+   //-------------------------------------------------------------------------------------||
+   // Contracts --------------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * Obtains the underlying Kernel
+    * 
+    * @return
+    */
+   Kernel getKernel();
+}

Modified: projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCServer.java
===================================================================
--- projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCServer.java	2009-04-13 17:43:38 UTC (rev 87189)
+++ projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCServer.java	2009-04-13 18:01:12 UTC (rev 87190)
@@ -23,8 +23,6 @@
 package org.jboss.bootstrap.spi.mc.server;
 
 import org.jboss.bootstrap.spi.mc.config.MCServerConfig;
-import org.jboss.bootstrap.spi.server.Server;
-import org.jboss.kernel.Kernel;
 
 /**
  * MCServer
@@ -34,16 +32,7 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
-public interface MCServer extends Server<MCServer, MCServerConfig>
+public interface MCServer extends MCBasedServer<MCServer, MCServerConfig>
 {
-   //-------------------------------------------------------------------------------------||
-   // Contracts --------------------------------------------------------------------------||
-   //-------------------------------------------------------------------------------------||
 
-   /**
-    * Obtains the underlying Kernel
-    * 
-    * @return
-    */
-   Kernel getKernel();
 }