[jboss-cvs] JBossAS SVN: r91242 - in projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core: server and 1 other directory.

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

Author: ALRubinger
Date: 2009-07-14 16:12:35 -0400 (Tue, 14 Jul 2009)
New Revision: 91242

Modified:
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/incubation/virtual/tempdev/VirtualDeploymentFactory.java
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServer.java
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
Log:
[EMB-33] Apply covarient return types for Embedded servers/configs

Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/incubation/virtual/tempdev/VirtualDeploymentFactory.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/incubation/virtual/tempdev/VirtualDeploymentFactory.java	2009-07-14 20:12:15 UTC (rev 91241)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/incubation/virtual/tempdev/VirtualDeploymentFactory.java	2009-07-14 20:12:35 UTC (rev 91242)
@@ -24,8 +24,7 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
-import org.jboss.bootstrap.spi.as.server.JBossASServerFactory;
+import org.jboss.embedded.core.server.JBossASEmbeddedServer;
 import org.jboss.embedded.core.server.JBossASEmbeddedServerImpl;
 import org.jboss.logging.Logger;
 import org.jboss.virtual.MemoryFileFactory;
@@ -44,7 +43,7 @@
    //-------------------------------------------------------------------------------------||
    // Class Members ----------------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
-   
+
    private static final Logger log = Logger.getLogger(VirtualDeploymentFactory.class);
 
    //-------------------------------------------------------------------------------------||
@@ -79,14 +78,13 @@
          URL url = new URL("vfsmemory", name, "");
          MemoryFileFactory.createRoot(url);
          // create some dummy contents so we can have a virtual war file
-//         byte contents[] =
-//         {};
-//         MemoryFileFactory.putFile(new URL(url, name), contents);
+         //         byte contents[] =
+         //         {};
+         //         MemoryFileFactory.putFile(new URL(url, name), contents);
          VirtualFile root = VFS.getRoot(url);
-         
+
          MemoryFileFactory.createDirectory(url);
-         
-         
+
          log.info(root);
 
       }
@@ -101,15 +99,15 @@
    //-------------------------------------------------------------------------------------||
    // Internal Helper Methods ------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
-   
+
    public static void main(final String... args) throws Exception
    {
-      JBossASServer server = new JBossASEmbeddedServerImpl("/home/alrubinger/business/jboss/wc/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta");
+      JBossASEmbeddedServer server = new JBossASEmbeddedServerImpl(
+            "/home/alrubinger/business/jboss/wc/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta");
       server.start();
-      
-      
+
       createVirtualDeployment("something");
-      
+
       server.shutdown();
    }
 }

Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServer.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServer.java	2009-07-14 20:12:15 UTC (rev 91241)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServer.java	2009-07-14 20:12:35 UTC (rev 91242)
@@ -21,7 +21,8 @@
  */
 package org.jboss.embedded.core.server;
 
-import org.jboss.bootstrap.spi.as.server.JBossASServer;
+import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
+import org.jboss.bootstrap.spi.as.server.JBossASBasedServer;
 import org.jboss.deployers.client.spi.Deployment;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.embedded.core.incubation.virtual.spi.vfs.VirtualVfsArchive;
@@ -35,7 +36,7 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
-public interface JBossASEmbeddedServer extends JBossASServer
+public interface JBossASEmbeddedServer extends JBossASBasedServer<JBossASEmbeddedServer, JBossASServerConfig>
 {
    //-------------------------------------------------------------------------------||
    // Contracts --------------------------------------------------------------------||

Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2009-07-14 20:12:15 UTC (rev 91241)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2009-07-14 20:12:35 UTC (rev 91242)
@@ -21,7 +21,9 @@
  */
 package org.jboss.embedded.core.server;
 
-import org.jboss.bootstrap.impl.as.server.JBossASServerImpl;
+import org.jboss.bootstrap.impl.as.config.BasicJBossASServerConfig;
+import org.jboss.bootstrap.impl.as.server.AbstractJBossASServerBase;
+import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
 import org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler;
 import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
 import org.jboss.dependency.spi.ControllerContext;
@@ -48,7 +50,9 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
-public class JBossASEmbeddedServerImpl extends JBossASServerImpl implements JBossASEmbeddedServer
+public class JBossASEmbeddedServerImpl extends AbstractJBossASServerBase<JBossASEmbeddedServer, JBossASServerConfig>
+      implements
+         JBossASEmbeddedServer
 {
 
    //-------------------------------------------------------------------------------------||
@@ -94,7 +98,7 @@
    public JBossASEmbeddedServerImpl() throws IllegalStateException
    {
       // Call Super
-      super();
+      super(JBossASEmbeddedServer.class);
 
       // Get JBOSS_HOME
       String jbossHome = SecurityActions.getSystemProperty(SYS_PROP_JBOSS_HOME);
@@ -125,8 +129,8 @@
     */
    public JBossASEmbeddedServerImpl(final String jbossHome) throws IllegalArgumentException
    {
-      // Call the super implementation
-      super();
+      // Call the other ctor
+      this();
 
       // Init
       this.initialize(jbossHome);
@@ -184,6 +188,16 @@
       this.deploy(d);
    }
 
+   /*
+    * (non-Javadoc)
+    * @see org.jboss.bootstrap.impl.base.server.AbstractServer#getDefaultServerConfigClass()
+    */
+   @Override
+   protected Class<? extends JBossASServerConfig> getDefaultServerConfigClass()
+   {
+      return BasicJBossASServerConfig.class;
+   }
+
    //-------------------------------------------------------------------------------------||
    // Internal Helper Methods ------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||