[jboss-cvs] JBossAS SVN: r70562 - in projects/microcontainer/trunk: guice-int/src/main/org/jboss/guice/plugins and 17 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Mar 7 17:23:04 EST 2008


Author: alesj
Date: 2008-03-07 17:23:03 -0500 (Fri, 07 Mar 2008)
New Revision: 70562

Added:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/
Removed:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/
Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java
   projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Parameter.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Value.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireTypeValueAdapter.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContext.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextValueAdapter.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/InjectOption.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/InjectionOptionValueAdapter.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/MicrocontainerConstants.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ArrayValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CollectionValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InjectAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/JavaBeanValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ListValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MapValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SetValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StringValueAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SupplysAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueFactoryAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueUtil.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanHandler.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/InjectionHandler.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedLDAPFactory.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedPropHolder.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanInstallsAware.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/ExternalInstallWithStateSimpleBeanImpl.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/IntervalSupplier.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallDependencyTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallSelfDependencyTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/AliasesAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanInfoAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanNameAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ContextAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/MetaDataAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/OtherAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ScopeAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/StateAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java
   projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java
   projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/annotations/SpringBeanAnnotationPlugin.java
   projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java
Log:
Renaming enums package to model.
Changing IoC annotations to use Class instead of String for type.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -30,15 +30,15 @@
 })
 package org.jboss.aop.microcontainer.beans.metadata;
 
-import org.jboss.beans.metadata.api.enums.AutowireTypeValueAdapter;
+import org.jboss.beans.metadata.api.model.AutowireTypeValueAdapter;
 import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
 import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
 import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
-import org.jboss.beans.metadata.api.enums.FromContext;
-import org.jboss.beans.metadata.api.enums.FromContextValueAdapter;
-import org.jboss.beans.metadata.api.enums.InjectOption;
-import org.jboss.beans.metadata.api.enums.InjectionOptionValueAdapter;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.FromContextValueAdapter;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.InjectionOptionValueAdapter;
+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;

Modified: projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -52,27 +52,27 @@
    @MapValue(
          value = {
                   @EntryValue(
-                        key = @Value(type = "java.lang.Class", string = @StringValue(value="org.jboss.dependency.spi.Controller", type = "java.lang.Class")),
+                        key = @Value(type = Class.class, string = @StringValue(value="org.jboss.dependency.spi.Controller", type = Class.class)),
                         value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME))
                   ),
                   @EntryValue(
-                        key = @Value(type = "java.lang.Class", string = @StringValue(value="org.jboss.kernel.Kernel", type = "java.lang.Class")),
+                        key = @Value(type = Class.class, string = @StringValue(value="org.jboss.kernel.Kernel", type = Class.class)),
                         value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_NAME))
                   ),
                   @EntryValue(
-                        key = @Value(type = "java.lang.Class", string = @StringValue(value="org.jboss.kernel.spi.dependency.KernelController", type = "java.lang.Class")),
+                        key = @Value(type = Class.class, string = @StringValue(value="org.jboss.kernel.spi.dependency.KernelController", type = Class.class)),
                         value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME))
                   ),
                   @EntryValue(
-                        key = @Value(type = "java.lang.Class", string = @StringValue(value="org.jboss.kernel.spi.registry.KernelBus", type = "java.lang.Class")),
+                        key = @Value(type = Class.class, string = @StringValue(value="org.jboss.kernel.spi.registry.KernelBus", type = Class.class)),
                         value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_BUS_NAME))
                   ),
                   @EntryValue(
-                        key = @Value(type = "java.lang.Class", string = @StringValue(value="org.jboss.kernel.spi.registry.KernelRegistry", type = "java.lang.Class")),
+                        key = @Value(type = Class.class, string = @StringValue(value="org.jboss.kernel.spi.registry.KernelRegistry", type = Class.class)),
                         value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_REGISTRY_NAME))
                   ),
                   @EntryValue(
-                        key = @Value(type = "java.lang.Class", string = @StringValue(value="org.jboss.kernel.spi.config.KernelConfigurator", type = "java.lang.Class")),
+                        key = @Value(type = Class.class, string = @StringValue(value="org.jboss.kernel.spi.config.KernelConfigurator", type = Class.class)),
                         value = @Value(inject = @Inject(bean = KernelConstants.KERNEL_CONFIGURATOR_NAME))
                   )
                }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ArrayValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -38,16 +38,16 @@
    /**
     * Set the array class.
     *
-    * @return array class name
+    * @return array class
     */
-   String clazz() default "";
+   Class<?> clazz() default void.class;
 
    /**
     * Array's element class.
     *
-    * @return element class name
+    * @return element class
     */
-   String elementClass() default "";
+   Class<?> elementClass() default void.class;
 
    /**
     * Get the values.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/CollectionValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -40,14 +40,14 @@
     *
     * @return the collection class
     */
-   String clazz() default "";
+   Class<?> clazz() default void.class;
 
    /**
     * Get element class.
     *
     * @return the element class
     */
-   String elementClass() default "";
+   Class<?> elementClass() default void.class;
 
    /**
     * Get values.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Factory.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -47,7 +47,7 @@
     *
     * @return the factory class
     */
-   String factoryClass() default "";
+   Class<?> factoryClass() default void.class;
 
    /**
     * Get the factory method.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Inject.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -26,9 +26,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.jboss.beans.metadata.api.enums.FromContext;
-import org.jboss.beans.metadata.api.enums.InjectOption;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.AutowireType;
 
 /**
  * Beans when injected by class type are by default changed to configured

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/JavaBeanValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -36,10 +36,10 @@
 public @interface JavaBeanValue
 {
    /**
-    * Get java bean class name.
+    * Get java bean class.
     * Must have default constructor.
     *
-    * @return the class name
+    * @return the class
     */
-   String value() default "";
+   Class<?> value() default void.class;
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/ListValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -36,18 +36,18 @@
 public @interface ListValue
 {
    /**
-    * Get list class name.
+    * Get list class.
     *
-    * @return the list class name
+    * @return the list class
     */
-   String clazz() default "";
+   Class<?> clazz() default void.class;
 
    /**
-    * Get the element class name.
+    * Get the element class.
     *
-    * @return the element class name
+    * @return the element class
     */
-   String elementClass() default "";
+   Class<?> elementClass() default void.class;
 
    /**
     * Get the values.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/MapValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -36,25 +36,25 @@
 public @interface MapValue
 {
    /**
-    * Get the map class name.
+    * Get the map class.
     *
-    * @return the map class name
+    * @return the map class
     */
-   String clazz() default "";
+   Class<?> clazz() default void.class;
 
    /**
-    * Get the key class name.
+    * Get the key class.
     *
-    * @return the key class name
+    * @return the key class
     */
-   String keyClass() default "";
+   Class<?> keyClass() default void.class;
 
    /**
     * Get the value class name.
     *
     * @return the value class name
     */
-   String valueClass() default "";
+   Class<?> valueClass() default void.class;
 
    /**
     * Get the entries.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Parameter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Parameter.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Parameter.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,7 +43,7 @@
     *
     * @return the type
     */
-   String type() default "";
+   Class<?> type() default void.class;
 
    /**
     * Get the string value.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/SetValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -36,18 +36,18 @@
 public @interface SetValue
 {
    /**
-    * Get the set class name.
+    * Get the set class.
     *
-    * @return the set class name
+    * @return the set class
     */
-   String clazz() default "";
+   Class<?> clazz() default void.class;
 
    /**
-    * Get the element class name.
+    * Get the element class.
     *
-    * @return the element class name
+    * @return the element class
     */
-   String elementClass() default "";
+   Class<?> elementClass() default void.class;
 
    /**
     * Get the values.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/StringValue.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -47,7 +47,7 @@
     *
     * @return the type
     */
-   String type() default "";
+   Class<?> type() default void.class;
 
    /**
     * Do replace with system properties.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Supply.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -47,5 +47,5 @@
     *
     * @return the class type
     */
-   String type() default "";
+   Class<?> type() default void.class;
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Value.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Value.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/annotations/Value.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,7 +41,7 @@
     *
     * @return the type
     */
-   String type() default "";
+   Class<?> type() default void.class;
 
    /**
     * Get the string value.

Copied: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model (from rev 70560, projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums)

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/AutowireType.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 import org.jboss.util.JBossStringBuilder;
 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireTypeValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/AutowireTypeValueAdapter.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireTypeValueAdapter.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/FromContext.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContext.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 import org.jboss.dependency.spi.ControllerContext;
 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/FromContextDelegate.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextDelegate.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 import java.io.Serializable;
 import java.io.ObjectStreamException;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/FromContextValueAdapter.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/FromContextValueAdapter.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/InjectOption.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/InjectOption.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/InjectOption.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 /**
  * Injection option - strict or optional / callback.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/InjectionOptionValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/InjectionOptionValueAdapter.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/InjectionOptionValueAdapter.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
 

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/MicrocontainerConstants.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/enums/MicrocontainerConstants.java	2008-03-07 17:44:00 UTC (rev 70560)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/MicrocontainerConstants.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
-package org.jboss.beans.metadata.api.enums;
+package org.jboss.beans.metadata.api.model;
 
 /**
  * Microcontainer constants.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -33,7 +33,7 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
 import org.jboss.beans.metadata.spi.CallbackMetaData;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -26,11 +26,11 @@
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.metadata.spi.MetaDataVisitor;
 import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
-import org.jboss.beans.metadata.api.enums.InjectOption;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.dependency.plugins.AttributeCallbackItem;
 import org.jboss.dependency.spi.Controller;
 import org.jboss.dependency.spi.ControllerContext;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import org.jboss.dependency.spi.ControllerMode;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.AutowireType;
 
 /**
  * Metadata about a bean.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -92,6 +92,18 @@
    }
 
    /**
+    * Does attribute have value.
+    * Helper method.
+    *
+    * @param value the value
+    * @return true if atribute not void.class
+    */
+   protected static boolean isAttributePresent(Class<?> value)
+   {
+      return ValueUtil.isAttributePresent(value);
+   }
+
+   /**
     * Is type supported by plugin.
     *
     * @param type the annotation element type

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ArrayValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ArrayValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ArrayValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,9 +44,9 @@
    {
       AbstractArrayMetaData array = new AbstractArrayMetaData();
       if (isAttributePresent(annotation.clazz()))
-         array.setType(annotation.clazz());
+         array.setType(annotation.clazz().getName());
       if (isAttributePresent(annotation.elementClass()))
-         array.setElementType(annotation.elementClass());
+         array.setElementType(annotation.elementClass().getName());
       for(Value value : annotation.value())
          array.add(createValueMetaData(value));
       return array;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ClassFactoryAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -66,7 +66,7 @@
       AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
       if (isAttributePresent(annotation.factoryClass()))
       {
-         constructor.setFactoryClass(annotation.factoryClass());
+         constructor.setFactoryClass(annotation.factoryClass().getName());
       }
       else
       {
@@ -80,7 +80,7 @@
          {
             AbstractParameterMetaData apmd = new AbstractParameterMetaData(ValueUtil.createValueMetaData(parameter));
             if (isAttributePresent(parameter.type()))
-               apmd.setType(parameter.type());
+               apmd.setType(parameter.type().getName());
             parameters.add(apmd);
          }
          constructor.setParameters(parameters);

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CollectionValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CollectionValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CollectionValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,9 +44,9 @@
    {
       AbstractCollectionMetaData collection = new AbstractCollectionMetaData();
       if (isAttributePresent(annotation.clazz()))
-         collection.setType(annotation.clazz());
+         collection.setType(annotation.clazz().getName());
       if (isAttributePresent(annotation.elementClass()))
-         collection.setElementType(annotation.elementClass());
+         collection.setElementType(annotation.elementClass().getName());
       for(Value value : annotation.value())
          collection.add(createValueMetaData(value));
       return collection;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ExternalInstallationAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -108,7 +108,7 @@
          }
          AbstractParameterMetaData parameter = new AbstractParameterMetaData(ValueUtil.createValueMetaData(value));
          if (isAttributePresent(value.type()))
-            parameter.setType(value.type());
+            parameter.setType(value.type().getName());
          parameters.add(parameter);
       }
       return installMetaData;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InjectAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InjectAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InjectAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -22,7 +22,7 @@
 package org.jboss.kernel.plugins.annotations;
 
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.dependency.spi.ControllerState;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/JavaBeanValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/JavaBeanValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/JavaBeanValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -62,13 +62,13 @@
 
    public ValueMetaData createValueMetaData(JavaBeanValue annotation)
    {
-      String className = annotation.value();
+      Class<?> className = annotation.value();
       if (isAttributePresent(className) == false)
          throw new IllegalArgumentException("Javabean class must be set: " + annotation);
 
       try
       {
-         BeanInfo beanInfo = configuration.getBeanInfo(className, null);
+         BeanInfo beanInfo = configuration.getBeanInfo(className.getName(), null);
          return new AbstractValueMetaData(beanInfo.newInstance());
       }
       catch (Throwable t)

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ListValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ListValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ListValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,9 +44,9 @@
    {
       AbstractListMetaData list = new AbstractListMetaData();
       if (isAttributePresent(annotation.clazz()))
-         list.setType(annotation.clazz());
+         list.setType(annotation.clazz().getName());
       if (isAttributePresent(annotation.elementClass()))
-         list.setElementType(annotation.elementClass());
+         list.setElementType(annotation.elementClass().getName());
       for(Value value : annotation.value())
          list.add(createValueMetaData(value));
       return list;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MapValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MapValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MapValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,11 +44,11 @@
    {
       AbstractMapMetaData map = new AbstractMapMetaData();
       if (isAttributePresent(annotation.clazz()))
-         map.setType(annotation.clazz());
+         map.setType(annotation.clazz().getName());
       if (isAttributePresent(annotation.keyClass()))
-         map.setKeyType(annotation.keyClass());
+         map.setKeyType(annotation.keyClass().getName());
       if (isAttributePresent(annotation.valueClass()))
-         map.setValueType(annotation.valueClass());
+         map.setValueType(annotation.valueClass().getName());
       for(EntryValue entry : annotation.value())
       {
          map.put(createValueMetaData(entry.key()), createValueMetaData(entry.value()));

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SetValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SetValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SetValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,9 +44,9 @@
    {
       AbstractSetMetaData set = new AbstractSetMetaData();
       if (isAttributePresent(annotation.clazz()))
-         set.setType(annotation.clazz());
+         set.setType(annotation.clazz().getName());
       if (isAttributePresent(annotation.elementClass()))
-         set.setElementType(annotation.elementClass());
+         set.setElementType(annotation.elementClass().getName());
       for(Value value : annotation.value())
          set.add(createValueMetaData(value));
       return set;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StringValueAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StringValueAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/StringValueAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,7 +43,7 @@
    {
       StringValueMetaData value = new StringValueMetaData(annotation.value());
       if (isAttributePresent(annotation.type()))
-         value.setType(annotation.type());
+         value.setType(annotation.type().getName());
       value.setReplace(annotation.replace());
       value.setTrim(annotation.trim());
       return value;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SupplysAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SupplysAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/SupplysAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -60,7 +60,7 @@
       {
          AbstractSupplyMetaData asmd = new AbstractSupplyMetaData(supply.value());
          if (isAttributePresent(supply.type()))
-            asmd.setType(supply.type());
+            asmd.setType(supply.type().getName());
          
          if (supplies.add(asmd))
             nodes.add(asmd);

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueFactoryAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueFactoryAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueFactoryAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -62,7 +62,7 @@
          {
             AbstractParameterMetaData apmd = new AbstractParameterMetaData(ValueUtil.createValueMetaData(parameter));
             if (isAttributePresent(parameter.type()))
-               apmd.setType(parameter.type());
+               apmd.setType(parameter.type().getName());
             parameters.add(apmd);
          }
       }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueUtil.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueUtil.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -61,6 +61,17 @@
    }
 
    /**
+    * Is attribute present.
+    *
+    * @param value the attribute value
+    * @return true if not void.class
+    */
+   static boolean isAttributePresent(Class<?> value)
+   {
+      return value != null && (void.class.equals(value) == false);
+   }
+
+   /**
     * Create value meta data from @Value annotation.
     *
     * @param value the @Value annotation

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -30,15 +30,15 @@
 })
 package org.jboss.kernel.plugins.deployment;
 
-import org.jboss.beans.metadata.api.enums.AutowireTypeValueAdapter;
+import org.jboss.beans.metadata.api.model.AutowireTypeValueAdapter;
 import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
 import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
 import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
-import org.jboss.beans.metadata.api.enums.FromContext;
-import org.jboss.beans.metadata.api.enums.FromContextValueAdapter;
-import org.jboss.beans.metadata.api.enums.InjectOption;
-import org.jboss.beans.metadata.api.enums.InjectionOptionValueAdapter;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.FromContextValueAdapter;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.InjectionOptionValueAdapter;
+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;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanHandler.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanHandler.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -25,7 +25,7 @@
 import javax.xml.namespace.QName;
 
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.metadata.spi.ConstructorMetaData;
 import org.jboss.dependency.spi.ControllerMode;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementHandler;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -45,9 +45,9 @@
 import org.jboss.beans.metadata.plugins.AbstractSetMetaData;
 import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
 import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.api.enums.InjectOption;
-import org.jboss.beans.metadata.api.enums.FromContext;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.metadata.plugins.StringValueMetaData;
 import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/InjectionHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/InjectionHandler.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/InjectionHandler.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -9,9 +9,9 @@
 
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.api.enums.InjectOption;
-import org.jboss.beans.metadata.api.enums.FromContext;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementHandler;
 import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/FactoryAnnotationTester.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -26,7 +26,7 @@
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
- at Factory(factoryClass = "org.jboss.test.kernel.annotations.support.FactoryTesterCreator", factoryMethod = "fromAnnotations")
+ at Factory(factoryClass = org.jboss.test.kernel.annotations.support.FactoryTesterCreator.class, factoryMethod = "fromAnnotations")
 public class FactoryAnnotationTester implements AnnotationTester
 {
    private Object value;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedLDAPFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedLDAPFactory.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedLDAPFactory.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -37,8 +37,8 @@
    @Constructor
    public AnnotatedLDAPFactory(
          @MapValue(
-               keyClass = "java.lang.String",
-               valueClass = "java.lang.String",
+               keyClass = String.class,
+               valueClass = String.class,
                value = {
                   @EntryValue(
                      key = @Value(string = @StringValue("foo.bar.key")),

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedPropHolder.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedPropHolder.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/AnnotatedPropHolder.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -51,7 +51,7 @@
    }
 
    @ListValue(
-         elementClass = "java.lang.String",
+         elementClass = String.class,
          value = {
             @Value(valueFactory = @ValueFactory(bean = "ldap", method = "getValue", parameter = "foo.bar.key")),
             @Value(valueFactory = @ValueFactory(bean = "ldap", method = "getValue", parameters = {@Parameter(string = @StringValue("foo.bar.key")), @Parameter(string = @StringValue("qaz"))})),

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -42,8 +42,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "[Ljava.lang.String;"
+         elementClass = java.lang.String.class,
+         clazz = String[].class
    )
    public void setArray(Object[] collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomCollection"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomCollection.class
    )
    public void setCollection(Collection<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomList"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomList.class
    )
    public void setList(List<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -49,8 +49,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String", valueClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomMap"
+         keyClass = String.class, valueClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomMap.class
    )
    public void setMap(Map<?,?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomSet"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomSet.class
    )
    public void setSet(Set<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -42,7 +42,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setCustomArray(String[] array)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -42,7 +42,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setCustomCollection(CustomCollection collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -42,7 +42,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setCustomList(CustomList collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -47,8 +47,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String",
-         valueClass = "java.lang.String"
+         keyClass = String.class,
+         valueClass = String.class
    )
    public void setCustomMap(CustomMap collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromCustomSignatureSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -42,7 +42,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setCustomSet(CustomSet collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactorySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -37,7 +37,7 @@
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
 @Factory(
-      factory = @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.SimpleBeanFactory")),
+      factory = @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.SimpleBeanFactory.class)),
       factoryMethod = "createSimpleBean"
 )
 public class FromFactorySimpleBean extends SimpleBean

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithIntParamSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -38,9 +38,9 @@
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
 @Factory(
-      factory = @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.SimpleBeanFactory")),
+      factory = @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.SimpleBeanFactory.class)),
       factoryMethod = "createSimpleBean",
-      parameters = {@Value(type = "java.lang.Integer", string = @StringValue("4"))}
+      parameters = {@Value(type = Integer.class, string = @StringValue("4"))}
 )
 public class FromFactoryWithIntParamSimpleBean extends SimpleBean
 {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromFactoryWithParamSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -38,9 +38,9 @@
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
 @Factory(
-      factory = @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.SimpleBeanFactory")),
+      factory = @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.SimpleBeanFactory.class)),
       factoryMethod = "createSimpleBean",
-      parameters = {@Value(string = @StringValue("Factory Value"), type = "java.lang.String")}
+      parameters = {@Value(string = @StringValue("Factory Value"), type = String.class)}
 )
 public class FromFactoryWithParamSimpleBean extends SimpleBean
 {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -37,12 +37,12 @@
 
    @ArrayValue(
          value = {
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1"))
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class))
          },
-         elementClass = "java.lang.Object"
+         elementClass = Object.class
    )
    public void setArray(Object[] array)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -39,12 +39,12 @@
 
    @CollectionValue(
          value = {
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1"))
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class))
          },
-         elementClass = "java.lang.Object"
+         elementClass = Object.class
    )
    public void setCollection(Collection<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -39,12 +39,12 @@
 
    @ListValue(
          value = {
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1"))
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class))
          },
-         elementClass = "java.lang.Object"
+         elementClass = Object.class
    )
    public void setList(List<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,16 +41,16 @@
    @MapValue(
          value = {
             @EntryValue(
-                  key=@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
-                  value=@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2"))
+                  key=@Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class)),
+                  value=@Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class))
             ),
             @EntryValue(
-                  key=@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-                  value=@Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1"))
+                  key=@Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+                  value=@Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class))
             )
          },
-         keyClass = "java.lang.Object",
-         valueClass = "java.lang.Object"
+         keyClass = Object.class,
+         valueClass = Object.class
    )
    public void setMap(Map<?,?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromObjectsSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,8 +23,8 @@
 
 import java.util.Set;
 
+import org.jboss.beans.metadata.api.annotations.JavaBeanValue;
 import org.jboss.beans.metadata.api.annotations.SetValue;
-import org.jboss.beans.metadata.api.annotations.JavaBeanValue;
 import org.jboss.beans.metadata.api.annotations.Value;
 
 /**
@@ -39,12 +39,12 @@
 
    @SetValue(
          value = {
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject2")),
-            @Value(javabean = @JavaBeanValue("org.jboss.test.kernel.config.support.MyObject1"))
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject2.class)),
+            @Value(javabean = @JavaBeanValue(org.jboss.test.kernel.config.support.MyObject1.class))
          },
-         elementClass = "java.lang.Object"
+         elementClass = Object.class
    )
    public void setSet(Set<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,7 +43,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setPreInstantiatedArray(Object[] preInstantiatedArray)
    {
@@ -54,7 +54,7 @@
          value = {
             @Value(string = @StringValue("element"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setSetterArray(Object[] setterArray)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,7 +44,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = java.lang.String.class
    )
    public void setPreInstantiatedCollection(CustomCollection preInstantiatedCollection)
    {
@@ -55,7 +55,7 @@
          value = {
             @Value(string = @StringValue("element"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setSetterCollection(Collection<?> setterCollection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,7 +44,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setPreInstantiatedList(CustomList preInstantiatedList)
    {
@@ -55,7 +55,7 @@
          value = {
             @Value(string = @StringValue("element"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setSetterList(List<?> setterList)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -49,8 +49,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String",
-         valueClass = "java.lang.String"
+         keyClass = String.class,
+         valueClass = String.class
    )
    public void setPreInstantiatedMap(CustomMap preInstantiatedMap)
    {
@@ -64,8 +64,8 @@
                   value=@Value(string = @StringValue("justValue"))
             )
          },
-         keyClass = "java.lang.String",
-         valueClass = "java.lang.String"
+         keyClass = String.class,
+         valueClass = String.class
    )
    public void setSetterMap(Map<?,?> setterMap)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromPreinstSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,7 +44,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setPreInstantiatedSet(CustomSet preInstantiatedSet)
    {
@@ -55,7 +55,7 @@
          value = {
             @Value(string = @StringValue("element"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setSetterSet(Set<?> setterSet)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactorySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -35,7 +35,7 @@
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
 @Factory(
-      factoryClass = "org.jboss.test.kernel.config.support.SimpleBeanFactory",
+      factoryClass = org.jboss.test.kernel.config.support.SimpleBeanFactory.class,
       factoryMethod = "staticCreateSimpleBean"
 )
 public class FromStaticFactorySimpleBean extends SimpleBean

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithIntParamSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -37,9 +37,9 @@
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
 @Factory(
-      factoryClass = "org.jboss.test.kernel.config.support.SimpleBeanFactory",
+      factoryClass = org.jboss.test.kernel.config.support.SimpleBeanFactory.class,
       factoryMethod = "staticCreateSimpleBean",
-      parameters = {@Value(type="java.lang.Integer", string = @StringValue("7"))}
+      parameters = {@Value(type=Integer.class, string = @StringValue("7"))}
 )
 public class FromStaticFactoryWithIntParamSimpleBean extends SimpleBean
 {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStaticFactoryWithParamSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -37,9 +37,9 @@
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */
 @Factory(
-      factoryClass = "org.jboss.test.kernel.config.support.SimpleBeanFactory",
+      factoryClass = org.jboss.test.kernel.config.support.SimpleBeanFactory.class,
       factoryMethod = "staticCreateSimpleBean",
-      parameters = {@Value(type="java.lang.String", string = @StringValue("Static Factory Value"))}
+      parameters = {@Value(type=String.class, string = @StringValue("Static Factory Value"))}
 )
 public class FromStaticFactoryWithParamSimpleBean extends SimpleBean
 {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -152,7 +152,7 @@
       super.setAbyte(abyte);
    }
 
-   @StringValue(value="12345", type="java.lang.Long")
+   @StringValue(value="12345", type=Long.class)
    public void setANumber(Number number)
    {
       super.setANumber(number);

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,7 +43,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setArray(Object[] array)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsArrayUnmodifiableObject.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.ArrayList"
+         elementClass = String.class,
+         clazz = java.util.ArrayList.class
    )
    public void setList(List<?> list)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,7 +44,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setCollection(Collection<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsCollectionUnmodifiableObject.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.ArrayList"
+         elementClass = String.class,
+         clazz = java.util.ArrayList.class
    )
    public void setCollection(Collection<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,7 +44,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setList(List<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsListUnmodifiableObject.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.ArrayList"
+         elementClass = String.class,
+         clazz = java.util.ArrayList.class
    )
    public void setList(List<?> list)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -49,8 +49,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String",
-         valueClass = "java.lang.String"
+         keyClass = String.class,
+         valueClass = String.class
    )
    public void setMap(Map<?,?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsMapUnmodifiableObject.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -49,9 +49,9 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String",
-         valueClass = "java.lang.String",
-         clazz = "java.util.HashMap"
+         keyClass = String.class,
+         valueClass = String.class,
+         clazz = java.util.HashMap.class
    )
    public void setMap(Map<?,?> map)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,7 +44,7 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setSet(Set<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/FromStringsSetUnmodifiableObject.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,9 +23,9 @@
 
 import java.util.Set;
 
+import org.jboss.beans.metadata.api.annotations.SetValue;
 import org.jboss.beans.metadata.api.annotations.StringValue;
 import org.jboss.beans.metadata.api.annotations.Value;
-import org.jboss.beans.metadata.api.annotations.SetValue;
 
 /**
  * A simple bean
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.HashSet"
+         elementClass = String.class,
+         clazz = java.util.HashSet.class
    )
    public void setSet(Set<?> set)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,8 +43,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "[Ljava.lang.Comparable;"
+         elementClass = String.class,
+         clazz = Comparable[].class
    )
    public void setArray(Object[] array)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.Collection"
+         elementClass = String.class,
+         clazz = java.util.Collection.class
    )
    public void setCollection(Collection<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.List"
+         elementClass = String.class,
+         clazz = java.util.List.class
    )
    public void setList(List<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -49,8 +49,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String", valueClass = "java.lang.String",
-         clazz = "java.util.Map"
+         keyClass = String.class, valueClass = String.class,
+         clazz = java.util.Map.class
    )
    public void setMap(Map<?,?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/InterfaceSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -44,8 +44,8 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1"))
          },
-         elementClass = "java.lang.String",
-         clazz = "java.util.Set"
+         elementClass = String.class,
+         clazz = java.util.Set.class
    )
    public void setSet(Set<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/KeyTypeOverrideMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -49,12 +49,12 @@
                   value=@Value(string = @StringValue("string1"))
             ),
             @EntryValue(
-                  key=@Value(string = @StringValue(value = "1", type="java.lang.Integer")),
+                  key=@Value(string = @StringValue(value = "1", type=Integer.class)),
                   value=@Value(string = @StringValue("integer"))
             )
          },
-         keyClass = "java.lang.String", valueClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomMap"
+         keyClass = String.class, valueClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomMap.class
    )
    public void setMap(Map<?,?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,9 +41,9 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setAString(String string)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotACollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,9 +41,9 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setAString(String string)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,9 +41,9 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setAString(String string)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotAMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -47,8 +47,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String",
-         valueClass = "java.lang.String"
+         keyClass = String.class,
+         valueClass = String.class
    )
    public void setAString(String string)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/NotASetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,9 +41,9 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setAString(String string)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,9 +41,9 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setAnObject(Object object)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,10 +41,10 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomCollection"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomCollection.class
    )
    public void setAnObject(Object object)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,10 +41,10 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomList"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomList.class
    )
    public void setAnObject(Object object)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -47,8 +47,8 @@
                   value=@Value(string = @StringValue("string1"))
             )
          },
-         keyClass = "java.lang.String", valueClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomMap"
+         keyClass = String.class, valueClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomMap.class
    )
    public void setAnObject(Object object)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/OnObjectSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,10 +41,10 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomSet"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomSet.class
    )
    public void setAnObject(Object object)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamArrayConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,7 +43,7 @@
    @Constructor
    public ParamArrayConstructorAnnBean(
          @ArrayValue(
-               elementClass = "java.lang.String",
+               elementClass = String.class,
                value={
                   @Value(string = @StringValue("1")),
                   @Value(string = @StringValue("2"))

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCollectionConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -45,7 +45,7 @@
    @Constructor
    public ParamCollectionConstructorAnnBean(
          @CollectionValue(
-               elementClass = "java.lang.String",
+               elementClass = String.class,
                value={
                   @Value(string = @StringValue("1")),
                   @Value(string = @StringValue("2"))

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamCompConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -39,7 +39,7 @@
    }
 
    @Constructor
-   public ParamCompConstructorAnnBean(@StringValue(value = "12", type="java.lang.Integer") Comparable<?> comparable)
+   public ParamCompConstructorAnnBean(@StringValue(value = "12", type=Integer.class) Comparable<?> comparable)
    {
       super(comparable);
    }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamListConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -45,7 +45,7 @@
    @Constructor
    public ParamListConstructorAnnBean(
          @ListValue(
-               elementClass = "java.lang.String",
+               elementClass = String.class,
                value={
                   @Value(string = @StringValue("1")),
                   @Value(string = @StringValue("2"))

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamMapConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -46,8 +46,8 @@
    @Constructor
    public ParamMapConstructorAnnBean(
          @MapValue(
-               keyClass = "java.lang.String",
-               valueClass = "java.lang.String",
+               keyClass = String.class,
+               valueClass = String.class,
                value = {
                @EntryValue(
                      key = @Value(string = @StringValue("1")),

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamPropertiesConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -46,9 +46,9 @@
    @Constructor
    public ParamPropertiesConstructorAnnBean(
          @MapValue(
-               clazz="java.util.Properties",
-               keyClass = "java.lang.String",
-               valueClass = "java.lang.String",
+               clazz=java.util.Properties.class,
+               keyClass = String.class,
+               valueClass = String.class,
                value = {
                @EntryValue(
                      key = @Value(string = @StringValue("1")),

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ParamSetConstructorAnnBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -45,7 +45,7 @@
    @Constructor
    public ParamSetConstructorAnnBean(
          @SetValue(
-               elementClass = "java.lang.String",
+               elementClass = String.class,
                value={
                   @Value(string = @StringValue("1"))
                      }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ProgressionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -33,7 +33,7 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 1L;
 
-   @StringValue(value = "123.456", type="java.lang.Double")
+   @StringValue(value = "123.456", type=Double.class)
    public void setAnint(int anint)
    {
       super.setAnint(anint);
@@ -45,7 +45,7 @@
       super.setAFloat(float1);
    }
 
-   @StringValue(value = "987.6543", type="java.lang.Float")
+   @StringValue(value = "987.6543", type=Float.class)
    public void setAShort(Short short1)
    {
       super.setAShort(short1);

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideArraySimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -41,9 +41,9 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String"
+         elementClass = String.class
    )
    public void setArray(Object[] array)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideCollectionSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,10 +43,10 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomCollection"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomCollection.class
    )
    public void setCollection(Collection<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideListSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,10 +43,10 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomList"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomList.class
    )
    public void setList(List<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/TypeOverrideSetSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -43,10 +43,10 @@
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string2")),
             @Value(string = @StringValue("string1")),
-            @Value(string = @StringValue(value = "1", type = "java.lang.Integer"))
+            @Value(string = @StringValue(value = "1", type = Integer.class))
          },
-         elementClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomSet"
+         elementClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomSet.class
    )
    public void setSet(Set<?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/ValueTypeOverrideMapSimpleBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -50,11 +50,11 @@
             ),
             @EntryValue(
                   key=@Value(string = @StringValue("integer")),
-                  value=@Value(string = @StringValue(value = "1", type="java.lang.Integer"))
+                  value=@Value(string = @StringValue(value = "1", type=Integer.class))
             )
          },
-         keyClass = "java.lang.String", valueClass = "java.lang.String",
-         clazz = "org.jboss.test.kernel.config.support.CustomMap"
+         keyClass = String.class, valueClass = String.class,
+         clazz = org.jboss.test.kernel.config.support.CustomMap.class
    )
    public void setMap(Map<?,?> collection)
    {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanInstallsAware.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanInstallsAware.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanInstallsAware.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -21,7 +21,7 @@
 */
 package org.jboss.test.kernel.dependency.support;
 
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.beans.metadata.api.annotations.InstallMethod;
 import org.jboss.beans.metadata.api.annotations.UninstallMethod;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/AnnotatedSimpleBeanWithKernelControllerContextAware.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,7 +23,7 @@
 
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean that is kernel controllercontext aware

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/ExternalInstallWithStateSimpleBeanImpl.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/ExternalInstallWithStateSimpleBeanImpl.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/ExternalInstallWithStateSimpleBeanImpl.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -26,7 +26,7 @@
 import org.jboss.beans.metadata.api.annotations.ExternalInstall;
 import org.jboss.beans.metadata.api.annotations.ExternalInstalls;
 import org.jboss.beans.metadata.api.annotations.ExternalUninstalls;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.beans.metadata.api.annotations.Value;
 

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/IntervalSupplier.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/IntervalSupplier.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/IntervalSupplier.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -27,7 +27,7 @@
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
- at Supplys({@Supply(value = "5", type = "java.lang.Integer")})
+ at Supplys({@Supply(value = "5", type = Integer.class)})
 public class IntervalSupplier
 {
 }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -26,7 +26,7 @@
 import junit.framework.Test;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -27,7 +27,7 @@
 
 import junit.framework.Test;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
 import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallDependencyTestCase.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallDependencyTestCase.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -33,7 +33,7 @@
 import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
 import org.jboss.beans.metadata.plugins.ThisValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.InstallMetaData;
 import org.jboss.beans.metadata.spi.ParameterMetaData;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallSelfDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallSelfDependencyTestCase.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/InstallSelfDependencyTestCase.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -32,7 +32,7 @@
 import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
 import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.InstallMetaData;
 import org.jboss.beans.metadata.spi.ParameterMetaData;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/AliasesAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/AliasesAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/AliasesAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.api.annotations.Aliases;
 
 /**

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanInfoAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanInfoAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanInfoAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,7 +23,7 @@
 
 import org.jboss.beans.info.spi.BeanInfo;
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean with awareness

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanNameAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanNameAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/BeanNameAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -22,7 +22,7 @@
 package org.jboss.test.kernel.deployment.support;
 
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean with awareness

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ContextAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ContextAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ContextAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,7 +23,7 @@
 
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean with awareness

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/MetaDataAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/MetaDataAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/MetaDataAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,7 +23,7 @@
 
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean with awareness

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/OtherAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/OtherAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/OtherAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -22,7 +22,7 @@
 package org.jboss.test.kernel.deployment.support;
 
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean with awareness

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ScopeAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ScopeAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/ScopeAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -23,7 +23,7 @@
 
 import org.jboss.metadata.spi.scope.ScopeKey;
 import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 
 /**
  * A simple bean with awareness

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/StateAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/StateAwareBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/StateAwareBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -21,7 +21,7 @@
 */
 package org.jboss.test.kernel.deployment.support;
 
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.dependency.spi.ControllerState;
 

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -26,7 +26,7 @@
 
 import junit.framework.Test;
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.dependency.spi.ControllerMode;
 
 /**

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -27,7 +27,7 @@
 
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.spi.PropertyMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;

Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -31,7 +31,7 @@
 import org.drools.StatelessSession;
 import org.drools.rule.Package;
 import org.jboss.beans.metadata.api.annotations.Constructor;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.beans.metadata.api.annotations.Install;
 import org.jboss.beans.metadata.api.annotations.Uninstall;

Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/annotations/SpringBeanAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/annotations/SpringBeanAnnotationPlugin.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/annotations/SpringBeanAnnotationPlugin.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -29,7 +29,7 @@
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.api.enums.FromContext;
+import org.jboss.beans.metadata.api.model.FromContext;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
 import org.jboss.beans.metadata.spi.PropertyMetaData;

Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java	2008-03-07 18:43:57 UTC (rev 70561)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java	2008-03-07 22:23:03 UTC (rev 70562)
@@ -36,7 +36,7 @@
 import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
 import org.jboss.beans.metadata.spi.AnnotationMetaData;
-import org.jboss.beans.metadata.api.enums.AutowireType;
+import org.jboss.beans.metadata.api.model.AutowireType;
 import org.jboss.beans.metadata.spi.ConstructorMetaData;
 import org.jboss.beans.metadata.spi.DemandMetaData;
 import org.jboss.beans.metadata.spi.ParameterMetaData;




More information about the jboss-cvs-commits mailing list