[weld-commits] Weld SVN: r3887 - in ri/trunk/spi/src/test/java/org/jboss: weld and 3 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Thu Oct 8 00:53:34 EDT 2009


Author: shane.bryzak at jboss.com
Date: 2009-10-08 00:53:32 -0400 (Thu, 08 Oct 2009)
New Revision: 3887

Added:
   ri/trunk/spi/src/test/java/org/jboss/weld/
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java
Removed:
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java
   ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java
Log:
refactor package


Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test (from rev 3872, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test)

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,229 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environments;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry;
-import org.jboss.webbeans.bootstrap.api.test.MockDeployment.MockBeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.security.spi.SecurityServices;
-import org.jboss.webbeans.servlet.api.ServletServices;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.validation.spi.ValidationServices;
-import org.testng.annotations.Test;
-
-public class BootstrapTest
-{
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingEjbServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-   
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingEjbInjectionServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingJpaServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingSecurityServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingValidationServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test
-   public void testEEEnv()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingTxServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingResourceServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test(expectedExceptions = IllegalStateException.class)
-   public void testMissingServletServices()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
-      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
-      deploymentServices.add(ValidationServices.class, new MockValidationServices());
-      deploymentServices.add(EjbServices.class, new MockEjbServices());
-      
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
-      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
-      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
-      
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
-   }
-
-   @Test
-   public void testSEEnv()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.SE, deployment, null);
-   }
-
-   @Test
-   public void testServletEnv()
-   {
-      Bootstrap bootstrap = new MockBootstrap();
-      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
-      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
-      deploymentServices.add(ServletServices.class, new MockServletServices());
-      ServiceRegistry bdaServices = new SimpleServiceRegistry();
-      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
-      bootstrap.startContainer(Environments.SERVLET, deployment, null);
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,229 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environments;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
+import org.jboss.weld.bootstrap.api.test.MockDeployment.MockBeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.security.spi.SecurityServices;
+import org.jboss.weld.servlet.api.ServletServices;
+import org.jboss.weld.transaction.spi.TransactionServices;
+import org.jboss.weld.validation.spi.ValidationServices;
+import org.testng.annotations.Test;
+
+public class BootstrapTest
+{
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingEjbServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+   
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingEjbInjectionServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingJpaServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingSecurityServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingValidationServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test
+   public void testEEEnv()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingTxServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingResourceServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testMissingServletServices()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+      deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+      deploymentServices.add(ValidationServices.class, new MockValidationServices());
+      deploymentServices.add(EjbServices.class, new MockEjbServices());
+      
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+      bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+      bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+      
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+   }
+
+   @Test
+   public void testSEEnv()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.SE, deployment, null);
+   }
+
+   @Test
+   public void testServletEnv()
+   {
+      Bootstrap bootstrap = new MockBootstrap();
+      ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+      deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+      deploymentServices.add(ServletServices.class, new MockServletServices());
+      ServiceRegistry bdaServices = new SimpleServiceRegistry();
+      Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+      bootstrap.startContainer(Environments.SERVLET, deployment, null);
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,65 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.util.Set;
-
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environment;
-import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-
-public class MockBootstrap implements Bootstrap
-{
-   
-   public WebBeansManager getManager(BeanDeploymentArchive beanDeploymentArchive)
-   {
-      return null;
-   }
-   
-   public void shutdown()
-   {
-   }
-
-   public Bootstrap deployBeans()
-   {
-      return this;
-   }
-
-   public Bootstrap endInitialization()
-   {
-      return this;
-   }
-
-   public Bootstrap startInitialization()
-   {
-      return this;
-   }
-
-   public Bootstrap validateBeans()
-   {
-      return this;
-   }
-   
-   protected static void verifyServices(ServiceRegistry services, Set<Class<? extends Service>> requiredServices) 
-   {
-      for (Class<? extends Service> serviceType : requiredServices)
-      {
-         if (!services.contains(serviceType))
-         {
-            throw new IllegalStateException("Required service " + serviceType.getName() + " has not been specified");
-         }
-      }
-   }
-
-   public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore beanStore)
-   {
-      verifyServices(deployment.getServices(), environment.getRequiredDeploymentServices());
-      verifyServices(deployment.getBeanDeploymentArchives().iterator().next().getServices(), environment.getRequiredBeanDeploymentArchiveServices());
-      return this;
-   }
-
-   
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockBootstrap.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,65 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.util.Set;
+
+import org.jboss.weld.bootstrap.api.Bootstrap;
+import org.jboss.weld.bootstrap.api.Environment;
+import org.jboss.weld.bootstrap.api.Service;
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.manager.api.WebBeansManager;
+
+public class MockBootstrap implements Bootstrap
+{
+   
+   public WebBeansManager getManager(BeanDeploymentArchive beanDeploymentArchive)
+   {
+      return null;
+   }
+   
+   public void shutdown()
+   {
+   }
+
+   public Bootstrap deployBeans()
+   {
+      return this;
+   }
+
+   public Bootstrap endInitialization()
+   {
+      return this;
+   }
+
+   public Bootstrap startInitialization()
+   {
+      return this;
+   }
+
+   public Bootstrap validateBeans()
+   {
+      return this;
+   }
+   
+   protected static void verifyServices(ServiceRegistry services, Set<Class<? extends Service>> requiredServices) 
+   {
+      for (Class<? extends Service> serviceType : requiredServices)
+      {
+         if (!services.contains(serviceType))
+         {
+            throw new IllegalStateException("Required service " + serviceType.getName() + " has not been specified");
+         }
+      }
+   }
+
+   public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore beanStore)
+   {
+      verifyServices(deployment.getServices(), environment.getRequiredDeploymentServices());
+      verifyServices(deployment.getBeanDeploymentArchives().iterator().next().getServices(), environment.getRequiredBeanDeploymentArchiveServices());
+      return this;
+   }
+
+   
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-
-/**
- * @author pmuir
- *
- */
-public class MockDeployment implements Deployment
-{
-   
-   static class MockBeanDeploymentArchive implements BeanDeploymentArchive
-   {
-
-      private final ServiceRegistry services; 
-      
-      public MockBeanDeploymentArchive(ServiceRegistry services)
-      {
-         this.services = services;
-      }
-
-      public Collection<Class<?>> getBeanClasses()
-      {
-         return Collections.emptySet();
-      }
-
-      public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
-      {
-         return Collections.emptySet();
-      }
-
-      public Collection<URL> getBeansXml()
-      {
-         return Collections.emptySet();
-      }
-
-      public Collection<EjbDescriptor<?>> getEjbs()
-      {
-         return Collections.emptySet();
-      }
-
-      public ServiceRegistry getServices()
-      {
-         return services;
-      }
-      
-      public String getId()
-      {
-         return "test";
-      }
-      
-   }
-   
-   private final ServiceRegistry services;
-   private final BeanDeploymentArchive beanDeploymentArchive;
-
-   public MockDeployment(ServiceRegistry services, MockBeanDeploymentArchive beanDeploymentArchive)
-   {
-      this.services = services;
-      this.beanDeploymentArchive = beanDeploymentArchive;
-   }
-
-   public List<BeanDeploymentArchive> getBeanDeploymentArchives()
-   {
-      return Collections.singletonList(beanDeploymentArchive);
-   }
-
-   public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
-   {
-      return null;
-   }
-
-   public ServiceRegistry getServices()
-   {
-      return services;
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockDeployment.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockDeployment.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.weld.bootstrap.api.ServiceRegistry;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockDeployment implements Deployment
+{
+   
+   static class MockBeanDeploymentArchive implements BeanDeploymentArchive
+   {
+
+      private final ServiceRegistry services; 
+      
+      public MockBeanDeploymentArchive(ServiceRegistry services)
+      {
+         this.services = services;
+      }
+
+      public Collection<Class<?>> getBeanClasses()
+      {
+         return Collections.emptySet();
+      }
+
+      public Collection<BeanDeploymentArchive> getBeanDeploymentArchives()
+      {
+         return Collections.emptySet();
+      }
+
+      public Collection<URL> getBeansXml()
+      {
+         return Collections.emptySet();
+      }
+
+      public Collection<EjbDescriptor<?>> getEjbs()
+      {
+         return Collections.emptySet();
+      }
+
+      public ServiceRegistry getServices()
+      {
+         return services;
+      }
+      
+      public String getId()
+      {
+         return "test";
+      }
+      
+   }
+   
+   private final ServiceRegistry services;
+   private final BeanDeploymentArchive beanDeploymentArchive;
+
+   public MockDeployment(ServiceRegistry services, MockBeanDeploymentArchive beanDeploymentArchive)
+   {
+      this.services = services;
+      this.beanDeploymentArchive = beanDeploymentArchive;
+   }
+
+   public List<BeanDeploymentArchive> getBeanDeploymentArchives()
+   {
+      return Collections.singletonList(beanDeploymentArchive);
+   }
+
+   public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+   {
+      return null;
+   }
+
+   public ServiceRegistry getServices()
+   {
+      return services;
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.injection.spi.EjbInjectionServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockEjbInjectionServices extends MockService implements EjbInjectionServices
-{
-
-   public Object resolveEjb(InjectionPoint injectionPoint)
-   {
-      return null;
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbInjectionServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbInjectionServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.spi.EjbInjectionServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockEjbInjectionServices extends MockService implements EjbInjectionServices
+{
+
+   public Object resolveEjb(InjectionPoint injectionPoint)
+   {
+      return null;
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,38 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.ejb.api.SessionObjectReference;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.ejb.spi.InterceptorBindings;
-
-public class MockEjbServices extends MockService implements EjbServices
-{
-
-   public Iterable<EjbDescriptor<?>> discoverEjbs()
-   {
-      return null;
-   }
-
-   public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
-   {
-      return null;
-   }
-
-   public void registerInterceptors(EjbDescriptor<?> ejbDescriptor, InterceptorBindings interceptorBindings)
-   {
-      // do nothing
-   }
-
-   public Object resolveEjb(InjectionPoint injectionPoint)
-   {
-      return null;
-   }
-
-   public Object resolveRemoteEjb(String jndiName, String mappedName, String ejbLink)
-   {
-      return null;
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEjbServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockEjbServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,38 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.ejb.api.SessionObjectReference;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbServices;
+import org.jboss.weld.ejb.spi.InterceptorBindings;
+
+public class MockEjbServices extends MockService implements EjbServices
+{
+
+   public Iterable<EjbDescriptor<?>> discoverEjbs()
+   {
+      return null;
+   }
+
+   public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
+   {
+      return null;
+   }
+
+   public void registerInterceptors(EjbDescriptor<?> ejbDescriptor, InterceptorBindings interceptorBindings)
+   {
+      // do nothing
+   }
+
+   public Object resolveEjb(InjectionPoint injectionPoint)
+   {
+      return null;
+   }
+
+   public Object resolveRemoteEjb(String jndiName, String mappedName, String ejbLink)
+   {
+      return null;
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,29 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.util.Collection;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.jboss.webbeans.injection.spi.JpaInjectionServices;
-
-public class MockJpaServices extends MockService implements JpaInjectionServices
-{
-   
-   public Collection<Class<?>> discoverEntities()
-   {
-      return null;
-   }
-   
-   public EntityManager resolvePersistenceContext(InjectionPoint injectionPoint)
-   {
-      return null;
-   }
-   
-   public EntityManagerFactory resolvePersistenceUnit(InjectionPoint injectionPoint)
-   {
-      return null;
-   }
-   
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJpaServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockJpaServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,29 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.util.Collection;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.jboss.weld.injection.spi.JpaInjectionServices;
+
+public class MockJpaServices extends MockService implements JpaInjectionServices
+{
+   
+   public Collection<Class<?>> discoverEntities()
+   {
+      return null;
+   }
+   
+   public EntityManager resolvePersistenceContext(InjectionPoint injectionPoint)
+   {
+      return null;
+   }
+   
+   public EntityManagerFactory resolvePersistenceUnit(InjectionPoint injectionPoint)
+   {
+      return null;
+   }
+   
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.net.URL;
-import java.util.Collection;
-
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-
-public class MockResourceLoader extends MockService implements ResourceLoader
-{
-   
-   public Class<?> classForName(String name)
-   {
-      return null;
-   }
-   
-   public URL getResource(String name)
-   {
-      return null;
-   }
-   
-   public Collection<URL> getResources(String name)
-   {
-      return null;
-   }
-   
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceLoader.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceLoader.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,26 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.net.URL;
+import java.util.Collection;
+
+import org.jboss.weld.resources.spi.ResourceLoader;
+
+public class MockResourceLoader extends MockService implements ResourceLoader
+{
+   
+   public Class<?> classForName(String name)
+   {
+      return null;
+   }
+   
+   public URL getResource(String name)
+   {
+      return null;
+   }
+   
+   public Collection<URL> getResources(String name)
+   {
+      return null;
+   }
+   
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,20 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
-
-public class MockResourceServices extends MockService implements ResourceInjectionServices
-{
-   
-   public Object resolveResource(InjectionPoint injectionPoint)
-   {
-      return null;
-   }
-   
-   public Object resolveResource(String jndiName, String mappedName)
-   {
-      return null;
-   }
-   
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockResourceServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockResourceServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,20 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.jboss.weld.injection.spi.ResourceInjectionServices;
+
+public class MockResourceServices extends MockService implements ResourceInjectionServices
+{
+   
+   public Object resolveResource(InjectionPoint injectionPoint)
+   {
+      return null;
+   }
+   
+   public Object resolveResource(String jndiName, String mappedName)
+   {
+      return null;
+   }
+   
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.security.Principal;
-
-import org.jboss.webbeans.security.spi.SecurityServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockSecurityServices extends MockService implements SecurityServices
-{
-
-   /* (non-Javadoc)
-    * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal()
-    */
-   public Principal getPrincipal()
-   {
-      // TODO Auto-generated method stub
-      return null;
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockSecurityServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import java.security.Principal;
+
+import org.jboss.weld.security.spi.SecurityServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockSecurityServices extends MockService implements SecurityServices
+{
+
+   /* (non-Javadoc)
+    * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal()
+    */
+   public Principal getPrincipal()
+   {
+      // TODO Auto-generated method stub
+      return null;
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * @author pmuir
- *
- */
-public abstract class MockService implements Service
-{
-
-   public void cleanup()
-   {
-      // TODO Auto-generated method stub
-      
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockService.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockService.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import org.jboss.weld.bootstrap.api.Service;
+
+/**
+ * @author pmuir
+ *
+ */
+public abstract class MockService implements Service
+{
+
+   public void cleanup()
+   {
+      // TODO Auto-generated method stub
+      
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.servlet.ServletContext;
-
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.servlet.api.ServletServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockServletServices extends MockService implements ServletServices
-{
-
-   public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx)
-   {
-      return null;
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockServletServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockServletServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.servlet.api.ServletServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockServletServices extends MockService implements ServletServices
+{
+
+   public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx)
+   {
+      return null;
+   }
+
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,25 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.transaction.Synchronization;
-import javax.transaction.UserTransaction;
-
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-
-public class MockTransactionServices extends MockService implements TransactionServices
-{
-   
-   public boolean isTransactionActive()
-   {
-      return false;
-   }
-   
-   public void registerSynchronization(Synchronization synchronizedObserver)
-   {
-   }
-   
-   public UserTransaction getUserTransaction()
-   {
-      return null;
-   }
-   
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockTransactionServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockTransactionServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,25 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.transaction.Synchronization;
+import javax.transaction.UserTransaction;
+
+import org.jboss.weld.transaction.spi.TransactionServices;
+
+public class MockTransactionServices extends MockService implements TransactionServices
+{
+   
+   public boolean isTransactionActive()
+   {
+      return false;
+   }
+   
+   public void registerSynchronization(Synchronization synchronizedObserver)
+   {
+   }
+   
+   public UserTransaction getUserTransaction()
+   {
+      return null;
+   }
+   
+}

Deleted: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java	2009-10-07 21:43:49 UTC (rev 3872)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.validation.ValidatorFactory;
-
-import org.jboss.webbeans.validation.spi.ValidationServices;
-
-/**
- * @author pmuir
- *
- */
-public class MockValidationServices extends MockService implements ValidationServices
-{
-
-   public ValidatorFactory getDefaultValidatorFactory()
-   {
-      return null;
-   }
-
-}

Copied: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java (from rev 3886, ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockValidationServices.java)
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java	                        (rev 0)
+++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockValidationServices.java	2009-10-08 04:53:32 UTC (rev 3887)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.bootstrap.api.test;
+
+import javax.validation.ValidatorFactory;
+
+import org.jboss.weld.validation.spi.ValidationServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MockValidationServices extends MockService implements ValidationServices
+{
+
+   public ValidatorFactory getDefaultValidatorFactory()
+   {
+      return null;
+   }
+
+}



More information about the weld-commits mailing list