[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Norman Richards]

  User: nrichards
  Date: 07/08/02 16:05:41

  Modified:    src/main/org/jboss/seam/mock   BaseSeamTest.java
  Added:       src/main/org/jboss/seam/mock   EmbeddedBootstrap.java
  Log:
  JBSEAM-1538
  
  Revision  Changes    Path
  1.25      +16 -24    jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BaseSeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- BaseSeamTest.java	25 Jul 2007 14:40:31 -0000	1.24
  +++ BaseSeamTest.java	2 Aug 2007 20:05:41 -0000	1.25
  @@ -32,8 +32,6 @@
   
   import org.hibernate.validator.ClassValidator;
   import org.hibernate.validator.InvalidValue;
  -import org.jboss.deployers.spi.DeploymentException;
  -import org.jboss.embedded.Bootstrap;
   import org.jboss.seam.Component;
   import org.jboss.seam.Seam;
   import org.jboss.seam.contexts.Contexts;
  @@ -951,32 +949,26 @@
      
      private static boolean started;
      
  -   protected void startJbossEmbeddedIfNecessary() throws DeploymentException, IOException
  +   protected void startJbossEmbeddedIfNecessary()
  +       throws Exception
      {
  -      if ( !started )
  -      {
  -         Bootstrap bootstrap = Bootstrap.getInstance();
  -         bootstrap.bootstrap();
  -         started = true;
  -         if ( resourceExists("seam.properties") ) 
  -         {
  -            bootstrap.deployResourceBase("seam.properties");
  +      if (!started && embeddedJBossAvailable()) {         
  +          (new EmbeddedBootstrap()).startAndDeployResources();         
            }
  -         if ( resourceExists("META-INF/components.xml") ) 
  -         {
  -            bootstrap.deployResourceBase("META-INF/components.xml");
  +      
  +      started = true;
            }
  -         if ( resourceExists("META-INF/seam.properties") ) 
  +
  +   private boolean embeddedJBossAvailable()
            {
  -            bootstrap.deployResourceBase("META-INF/seam.properties");
  -         }
  +      try {
  +         Class.forName("org.jboss.embedded.Bootstrap");
  +         return true;
  +      } catch (ClassNotFoundException e) {
  +         return false;
         }
      }
   
      
  -   private boolean resourceExists(String name)
  -   {
  -      return Thread.currentThread().getContextClassLoader().getResource(name)!=null;
  -   }
   
   }
  
  
  
  1.1      date: 2007/08/02 20:05:41;  author: nrichards;  state: Exp;jboss-seam/src/main/org/jboss/seam/mock/EmbeddedBootstrap.java
  
  Index: EmbeddedBootstrap.java
  ===================================================================
  package org.jboss.seam.mock;
  
  import org.jboss.embedded.Bootstrap;
  
  public class EmbeddedBootstrap
  {
      public void startAndDeployResources() 
          throws Exception
      {
         Bootstrap bootstrap = Bootstrap.getInstance();
         bootstrap.bootstrap();
  
         if (resourceExists("seam.properties")) {
             bootstrap.deployResourceBase("seam.properties");
         }
         if (resourceExists("META-INF/components.xml")) {
             bootstrap.deployResourceBase("META-INF/components.xml");
         }
         if (resourceExists("META-INF/seam.properties")) {
             bootstrap.deployResourceBase("META-INF/seam.properties");
         }
     }
  
     private boolean resourceExists(String name)
     {
        return Thread.currentThread().getContextClassLoader().getResource(name)!=null;
     }
  }