[jboss-cvs] JBossAS SVN: r73492 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/beans/metadata/plugins/builder and 14 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon May 19 09:39:22 EDT 2008


Author: alesj
Date: 2008-05-19 09:39:22 -0400 (Mon, 19 May 2008)
New Revision: 73492

Modified:
   projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/GuiceListener.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/Kernel.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/KernelConstants.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallAction.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventManager.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistry.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/XMLUtil.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/event/test/EventManagerTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/BusTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryFactoryTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryTestCase.java
Log:
Extend KernelRegistry to full class name.
Add BeanMetaDataBuilder helper methods for new enums.

Modified: projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/GuiceListener.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/GuiceListener.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/GuiceListener.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -28,7 +28,6 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.event.KernelEvent;
 import org.jboss.kernel.spi.event.KernelEventListener;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 
 /**
@@ -45,7 +44,7 @@
       SourceProviders.skip(GuiceListener.class);
    }
 
-   private KernelRegistry registry;
+   private org.jboss.kernel.spi.registry.KernelRegistry registry;
    private ControllerContextBindFilter filter;
 
    public GuiceListener(Kernel kernel, Binder binder)
@@ -68,18 +67,18 @@
    {
       Object name = event.getContext();
       String type = event.getType();
-      if (KernelRegistry.KERNEL_REGISTRY_REGISTERED.equals(type))
+      if (org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_REGISTERED.equals(type))
       {
          Object source = event.getSource();
-         if (source instanceof KernelRegistry)
+         if (source instanceof org.jboss.kernel.spi.registry.KernelRegistry)
          {
-            KernelRegistry registry = (KernelRegistry)source;
+            org.jboss.kernel.spi.registry.KernelRegistry registry = (org.jboss.kernel.spi.registry.KernelRegistry)source;
             KernelRegistryEntry entry = registry.getEntry(name);
             if (filter == null || filter.bind(entry))
                bindContext(getBinder(), getController(), entry);
          }
       }
-      else if (KernelRegistry.KERNEL_REGISTRY_UNREGISTERED.equals(type))
+      else if (org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_UNREGISTERED.equals(type))
       {
          // todo - can we unbind from binder?
       }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -58,9 +58,11 @@
 import org.jboss.beans.metadata.spi.AnnotationMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.beans.metadata.spi.builder.ParameterMetaDataBuilder;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.dependency.spi.Cardinality;
 import org.jboss.dependency.spi.ControllerMode;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.ErrorHandlingMode;
 
 /**
  * Helper class.
@@ -380,6 +382,24 @@
       return this;
    }
 
+   public BeanMetaDataBuilder setErrorHandlingMode(ErrorHandlingMode mode)
+   {
+      beanMetaData.setErrorHandlingMode(mode);
+      return this;
+   }
+
+   public BeanMetaDataBuilder setAutowireType(AutowireType type)
+   {
+      beanMetaData.setAutowireType(type);
+      return this;
+   }
+
+   public BeanMetaDataBuilder setAutowireCandidate(boolean candidate)
+   {
+      beanMetaData.setAutowireCandidate(candidate);
+      return null;
+   }
+
    /**
     * Create class loader metadata.
     *

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/builder/BeanMetaDataBuilder.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -31,10 +31,12 @@
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.info.spi.BeanAccessMode;
 import org.jboss.dependency.spi.ControllerMode;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.dependency.spi.Cardinality;
+import org.jboss.dependency.spi.ErrorHandlingMode;
 
 /**
  * BeanMetaDataBuilder contract.
@@ -175,6 +177,30 @@
    public abstract BeanMetaDataBuilder setAccessMode(BeanAccessMode mode);
 
    /**
+    * Set the error handling mode
+    *
+    * @param mode the error handling mode
+    * @return the builder
+    */
+   public abstract BeanMetaDataBuilder setErrorHandlingMode(ErrorHandlingMode mode);
+
+   /**
+    * Set the autowire type
+    *
+    * @param type the autowire type
+    * @return the builder
+    */
+   public abstract BeanMetaDataBuilder setAutowireType(AutowireType type);
+
+   /**
+    * Is bean autowire candidate.
+    *
+    * @param candidate the candidate flag
+    * @return the builder
+    */
+   public abstract BeanMetaDataBuilder setAutowireCandidate(boolean candidate);
+
+   /**
     * Set that we don't want to use the deployment classloader
     * 
     * @return the builder

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/Kernel.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/Kernel.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/Kernel.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -27,7 +27,6 @@
 import org.jboss.kernel.spi.event.KernelEventManager;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 
 /**
  * The kernel.<p>
@@ -69,7 +68,7 @@
    protected KernelMetaDataRepository metaDataRepository;
    
    /** The kernel registry */
-   protected KernelRegistry registry;
+   protected org.jboss.kernel.spi.registry.KernelRegistry registry;
 
    static
    {
@@ -241,7 +240,7 @@
     * @return the kernel registry
     * @throws SecurityException if the you don't have KernelPermission('access')
     */
-   public KernelRegistry getRegistry()
+   public org.jboss.kernel.spi.registry.KernelRegistry getRegistry()
    {
       checkAccess();
       return registry;
@@ -253,7 +252,7 @@
     * @param registry the kernel registry 
     * @throws SecurityException if the you don't have KernelPermission('configure')
     */
-   public void setRegistry(KernelRegistry registry)
+   public void setRegistry(org.jboss.kernel.spi.registry.KernelRegistry registry)
    {
       checkConfigure();
       this.registry = registry;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -31,7 +31,6 @@
 import org.jboss.kernel.spi.event.KernelEventManager;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 
 /**
@@ -59,7 +58,7 @@
          log.trace("Using MetaDataRepository: " + metaDataRepository);
       kernel.setMetaDataRepository(metaDataRepository);
 
-      KernelRegistry registry = createKernelRegistry(kernel);
+      org.jboss.kernel.spi.registry.KernelRegistry registry = createKernelRegistry(kernel);
       if (trace)
          log.trace("Using Registry: " + registry);
       registry.setKernel(kernel);
@@ -156,7 +155,7 @@
     * @return the kernel registry
     * @throws Throwable for any error
     */
-   protected KernelRegistry createKernelRegistry(Kernel kernel) throws Throwable
+   protected org.jboss.kernel.spi.registry.KernelRegistry createKernelRegistry(Kernel kernel) throws Throwable
    {
       return kernel.getConfig().createKernelRegistry();
    }
@@ -197,7 +196,7 @@
    protected void register(Kernel kernel, Object name, Object object) throws Throwable
    {
       KernelRegistryEntry entry = createKernelRegistryEntry(kernel, object);
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       registry.registerEntry(name, entry);
    }
    

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/KernelConstants.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/KernelConstants.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/KernelConstants.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -28,7 +28,6 @@
 import org.jboss.kernel.spi.event.KernelEventManager;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 
 /**
  * Constants.<p>
@@ -95,7 +94,7 @@
    static final String KERNEL_REGISTRY_NAME = "jboss.kernel:service=KernelRegistry"; 
    
    /** The kernel registry property */
-   static final String KERNEL_REGISTRY_PROPERTY = KernelRegistry.class.getName(); 
+   static final String KERNEL_REGISTRY_PROPERTY = org.jboss.kernel.spi.registry.KernelRegistry.class.getName(); 
    
    /** The default kernel registry implementation */
    static final String KERNEL_REGISTRY_CLASS = "org.jboss.kernel.plugins.registry.basic.BasicKernelRegistry"; 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -39,7 +39,6 @@
 import org.jboss.kernel.spi.event.KernelEventManager;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 
 /**
  * Kernel configuration using properties.
@@ -124,9 +123,9 @@
       );
    }
    
-   public KernelRegistry createKernelRegistry() throws Throwable
+   public org.jboss.kernel.spi.registry.KernelRegistry createKernelRegistry() throws Throwable
    {
-      return (KernelRegistry) getImplementation(
+      return (org.jboss.kernel.spi.registry.KernelRegistry) getImplementation(
          KernelConstants.KERNEL_REGISTRY_PROPERTY,
          KernelConstants.KERNEL_REGISTRY_CLASS
       );

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -42,7 +42,6 @@
 import org.jboss.kernel.spi.event.KernelEvent;
 import org.jboss.kernel.spi.event.KernelEventFilter;
 import org.jboss.kernel.spi.event.KernelEventListener;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.kernel.spi.registry.KernelRegistryPlugin;
 
@@ -149,7 +148,7 @@
          return context;
       if (state == null || ControllerState.INSTALLED.equals(state))
       {
-         KernelRegistry registry = kernel.getRegistry();
+         org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
          try
          {
             return registry.getEntry(name);

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallAction.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallAction.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -28,7 +28,6 @@
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 
 /**
  * InstallAction.
@@ -43,7 +42,7 @@
    {
       KernelController controller = (KernelController) context.getController();
       Kernel kernel = controller.getKernel();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
 
       BeanMetaData metaData = context.getBeanMetaData();
       Object name = metaData.getName();
@@ -75,7 +74,7 @@
    {
       KernelController controller = (KernelController) context.getController();
       Kernel kernel = controller.getKernel();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       Object name = context.getName();
 
       try

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ScopedKernelController.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -229,7 +229,7 @@
       }
    }
 
-   // KernelRegistry plugin method
+   // org.jboss.kernel.spi.registry.KernelRegistry plugin method
 
    public KernelRegistryEntry getEntry(Object name)
    {

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventManager.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventManager.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/event/AbstractEventManager.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -27,7 +27,6 @@
 import org.jboss.kernel.spi.event.KernelEventFilter;
 import org.jboss.kernel.spi.event.KernelEventListener;
 import org.jboss.kernel.spi.event.KernelEventManager;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 
 /**
@@ -40,7 +39,7 @@
 public class AbstractEventManager extends AbstractKernelObject implements KernelEventManager
 {
    /** The registry */
-   protected KernelRegistry registry;
+   protected org.jboss.kernel.spi.registry.KernelRegistry registry;
 
    /**
     * Create a new abstract kernel manager

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -27,7 +27,6 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.jboss.kernel.plugins.AbstractKernelObject;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntryNotFoundException;
 import org.jboss.kernel.spi.registry.KernelRegistryPlugin;
@@ -40,7 +39,7 @@
  * @version $Revision$
  */
 @SuppressWarnings("deprecation")
-public abstract class AbstractKernelRegistry extends AbstractKernelObject implements KernelRegistry
+public abstract class AbstractKernelRegistry extends AbstractKernelObject implements org.jboss.kernel.spi.registry.KernelRegistry
 {
    /** The registry factories */
    protected List<KernelRegistryPlugin> factories = new CopyOnWriteArrayList<KernelRegistryPlugin>();

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistry.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistry.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -33,6 +33,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision$
  */
+ at SuppressWarnings("deprecation")
 public class BasicKernelRegistry extends AbstractKernelRegistry
 {
    /** The default registry factory */
@@ -63,7 +64,7 @@
       
       if (hasListeners())
       {
-         KernelEvent event = createEvent(KERNEL_REGISTRY_REGISTERED, name);
+         KernelEvent event = createEvent(org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_REGISTERED, name);
          fireKernelEvent(event);
       }
    }
@@ -83,7 +84,7 @@
 
       if (hasListeners())
       {
-         KernelEvent event = createEvent(KERNEL_REGISTRY_UNREGISTERED, name);
+         KernelEvent event = createEvent(org.jboss.kernel.spi.registry.KernelRegistry.KERNEL_REGISTRY_UNREGISTERED, name);
          fireKernelEvent(event);
       }
       

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/config/KernelConfig.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -30,7 +30,6 @@
 import org.jboss.kernel.spi.event.KernelEventManager;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.reflect.spi.ClassInfo;
 import org.jboss.reflect.spi.TypeInfo;
 
@@ -189,7 +188,7 @@
     * @return the kernel registry
     * @throws Throwable for any error
     */
-   KernelRegistry createKernelRegistry() throws Throwable;
+   org.jboss.kernel.spi.registry.KernelRegistry createKernelRegistry() throws Throwable;
 
    /**
     * Create a meta data repository

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -33,7 +33,6 @@
 import org.jboss.kernel.spi.event.KernelEventManager;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.test.AbstractTestCaseWithSetup;
 import org.jboss.test.AbstractTestDelegate;
@@ -79,7 +78,7 @@
       getLog().debug("Got kernel: " + kernel);
       assertNotNull(kernel);
       
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       assertNotNull(registry);
 
       check("Kernel", registry, kernel, KernelConstants.KERNEL_NAME, Kernel.class.getName());
@@ -105,7 +104,7 @@
       check("KernelMetaDataRepository", registry, metaDataRepository, KernelConstants.KERNEL_METADATA_REPOSITORY_NAME, KernelConstants.KERNEL_METADATA_REPOSITORY_CLASS);
    }
 
-   protected void check(String context, KernelRegistry registry, Object object, Object name, String className) throws Exception
+   protected void check(String context, org.jboss.kernel.spi.registry.KernelRegistry registry, Object object, Object name, String className) throws Exception
    {
       getLog().debug("Checking " + context + ": " + object);
 

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/XMLUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/XMLUtil.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/XMLUtil.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -26,7 +26,6 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.test.kernel.AbstractKernelTest;
 import org.jboss.util.Classes;
@@ -118,7 +117,7 @@
     */
    public Object getBean(String name) throws Throwable
    {
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelRegistryEntry entry = registry.getEntry(name);
       return entry.getTarget();
    }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -37,9 +37,11 @@
 import org.jboss.beans.metadata.spi.CallbackMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.dependency.spi.Cardinality;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.ErrorHandlingMode;
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.deployment.AbstractKernelDeployer;
 import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
@@ -800,4 +802,17 @@
          controller.shutdown();
       }
    }
+
+   public void testNewEnums() throws Throwable
+   {
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(Object.class.getName());
+      builder.setErrorHandlingMode(ErrorHandlingMode.MANUAL);
+      builder.setAutowireType(AutowireType.CONSTRUCTOR);
+      builder.setAutowireCandidate(false);
+
+      BeanMetaData bmd = builder.getBeanMetaData();
+      assertEquals(ErrorHandlingMode.MANUAL, bmd.getErrorHandlingMode());
+      assertEquals(AutowireType.CONSTRUCTOR, bmd.getAutowireType());
+      assertFalse(bmd.isAutowireCandidate());
+   }
 }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/event/test/EventManagerTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/event/test/EventManagerTestCase.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/event/test/EventManagerTestCase.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -28,7 +28,6 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.event.KernelEvent;
 import org.jboss.kernel.spi.event.KernelEventManager;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntryNotFoundException;
 import org.jboss.test.kernel.AbstractKernelTest;
@@ -59,7 +58,7 @@
    public void testSimpleFireEvent() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelEventManager eventManager = kernel.getEventManager();
       TestEmitter emitter = new TestEmitter();
       KernelRegistryEntry entry = makeEntry(emitter);
@@ -75,7 +74,7 @@
    public void testDoubleFireEvent() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelEventManager eventManager = kernel.getEventManager();
       TestEmitter emitter = new TestEmitter();
       KernelRegistryEntry entry = makeEntry(emitter);
@@ -93,7 +92,7 @@
    public void testFilter() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelEventManager eventManager = kernel.getEventManager();
       TestEmitter emitter = new TestEmitter();
       KernelRegistryEntry entry = makeEntry(emitter);
@@ -114,7 +113,7 @@
    public void testHandback() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelEventManager eventManager = kernel.getEventManager();
       TestEmitter emitter = new TestEmitter();
       KernelRegistryEntry entry = makeEntry(emitter);
@@ -148,7 +147,7 @@
    public void testNotAnEmitter() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelEventManager eventManager = kernel.getEventManager();
       Object notAnEmitter = new Object();
       KernelRegistryEntry entry = makeEntry(notAnEmitter);

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/BusTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/BusTestCase.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/BusTestCase.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -26,7 +26,6 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
 import org.jboss.kernel.spi.registry.KernelBus;
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.kernel.spi.config.KernelConfigurator;
 import org.jboss.test.kernel.AbstractKernelTest;
@@ -54,7 +53,7 @@
    public void testSetAndGet() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelConfigurator configurator = kernel.getConfigurator();
       registry.registerEntry("Bus", makeContext(configurator, "Name1", new BusBean()));
       KernelBus bus = kernel.getBus();
@@ -68,7 +67,7 @@
    public void testInvoke() throws Throwable
    {
       Kernel kernel = bootstrap();
-      KernelRegistry registry = kernel.getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
       KernelConfigurator configurator = kernel.getConfigurator();
       registry.registerEntry("Name1", makeContext(configurator, "Name1", "A string"));
       registry.registerEntry("Name2", makeContext(configurator, "Name2", "B string"));

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryFactoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryFactoryTestCase.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryFactoryTestCase.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -23,7 +23,6 @@
 
 import junit.framework.Test;
 
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntryNotFoundException;
 import org.jboss.test.kernel.AbstractKernelTest;
@@ -35,6 +34,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision$
  */
+ at SuppressWarnings("deprecation")
 public class RegistryFactoryTestCase extends AbstractKernelTest
 {
    public static Test suite()
@@ -50,7 +50,7 @@
    @SuppressWarnings("deprecation")
    public void testAddRegistryFactory() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
 
       SimpleRegistryFactory factory = new SimpleRegistryFactory();
       Object testObject = new Object();
@@ -67,7 +67,7 @@
 
    public void testRemoveRegistryFactory() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
 
       SimpleRegistryFactory factory = new SimpleRegistryFactory();
       Object testObject = new Object();
@@ -89,7 +89,7 @@
 
    public void testAddRemoveAddRegistryFactory() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
 
       SimpleRegistryFactory factory = new SimpleRegistryFactory();
       Object testObject = new Object();
@@ -108,7 +108,7 @@
 
    public void testDuplicateRegistryFactory() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
 
       SimpleRegistryFactory factory1 = new SimpleRegistryFactory();
       Object testObject1 = new Object();

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryTestCase.java	2008-05-19 12:30:18 UTC (rev 73491)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/registry/test/RegistryTestCase.java	2008-05-19 13:39:22 UTC (rev 73492)
@@ -23,7 +23,6 @@
 
 import junit.framework.Test;
 
-import org.jboss.kernel.spi.registry.KernelRegistry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.kernel.spi.registry.KernelRegistryEntryAlreadyRegisteredException;
 import org.jboss.kernel.spi.registry.KernelRegistryEntryNotFoundException;
@@ -50,13 +49,13 @@
 
    public void testGotRegistry() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
       assertNotNull(registry);
    }
 
    public void testRegister() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
       KernelRegistryEntry test1 = makeEntry(new Object());
       registry.registerEntry("Name1", test1);
       assertEqualsRegistryTarget(test1, registry.getEntry("Name1"));
@@ -64,7 +63,7 @@
 
    public void testDuplicateRegisterError() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
       KernelRegistryEntry test1 = makeEntry(new Object());
       registry.registerEntry("Name1", test1);
       KernelRegistryEntry test2 = makeEntry(new Object());
@@ -82,7 +81,7 @@
 
    public void testRegisterTwice() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
       Object object = new Object();
       KernelRegistryEntry test1 = makeEntry(object);
       registry.registerEntry("Name1", test1);
@@ -93,7 +92,7 @@
 
    public void testUnregister() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
       try
       {
          registry.getEntry("Name1");
@@ -139,7 +138,7 @@
 
    public void testNull() throws Throwable
    {
-      KernelRegistry registry = bootstrap().getRegistry();
+      org.jboss.kernel.spi.registry.KernelRegistry registry = bootstrap().getRegistry();
       try
       {
          registry.getEntry(null);




More information about the jboss-cvs-commits mailing list