[jboss-cvs] JBossAS SVN: r64366 - projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations.

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

Author: adrian at jboss.org
Date: 2007-07-31 07:48:52 -0400 (Tue, 31 Jul 2007)
New Revision: 64366

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueUtil.java
Log:
Make this compile

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java	2007-07-31 11:38:25 UTC (rev 64365)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BasicBeanAnnotationAdapter.java	2007-07-31 11:48:52 UTC (rev 64366)
@@ -68,7 +68,7 @@
          ValueFactoryAnnotationPlugin.INSTANCE,
          ThisValueAnnotationPlugin.INSTANCE,
          NullValueAnnotationPlugin.INSTANCE,
-         JavaBeanValueAnnotationPlugin.INSTANCE,
+         // FIXME JavaBeanValueAnnotationPlugin.INSTANCE,
          CollectionValueAnnotationPlugin.INSTANCE,
          ListValueAnnotationPlugin.INSTANCE,
          SetValueAnnotationPlugin.INSTANCE,
@@ -100,7 +100,7 @@
       addAnnotationPlugin(ValueFactoryAnnotationPlugin.INSTANCE);
       addAnnotationPlugin(ThisValueAnnotationPlugin.INSTANCE);
       addAnnotationPlugin(NullValueAnnotationPlugin.INSTANCE);
-      addAnnotationPlugin(JavaBeanValueAnnotationPlugin.INSTANCE);
+      // FIXME addAnnotationPlugin(JavaBeanValueAnnotationPlugin.INSTANCE);
       addAnnotationPlugin(CollectionValueAnnotationPlugin.INSTANCE);
       addAnnotationPlugin(ListValueAnnotationPlugin.INSTANCE);
       addAnnotationPlugin(SetValueAnnotationPlugin.INSTANCE);

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	2007-07-31 11:38:25 UTC (rev 64365)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/ValueUtil.java	2007-07-31 11:48:52 UTC (rev 64366)
@@ -85,12 +85,14 @@
          vmd = NullValueAnnotationPlugin.INSTANCE.createValueMetaData(nullValue);
       }
 
+      /* FIXME
       JavaBeanValue javabean = value.javabean();
       if (isAttributePresent(javabean.clazz()))
       {
          checkValueMetaData(vmd);
          vmd = JavaBeanValueAnnotationPlugin.INSTANCE.createValueMetaData(javabean);
       }
+      */
 
       if (vmd == null)
          throw new IllegalArgumentException("No value set on @Value annotation!");
@@ -129,12 +131,14 @@
          vmd = NullValueAnnotationPlugin.INSTANCE.createValueMetaData(nullValue);
       }
 
+      /* FIXME
       JavaBeanValue javabean = parameter.javabean();
       if (isAttributePresent(javabean.clazz()))
       {
          checkValueMetaData(vmd);
          vmd = JavaBeanValueAnnotationPlugin.INSTANCE.createValueMetaData(javabean);
       }
+      */
 
       if (vmd == null)
          throw new IllegalArgumentException("No value set on @Value annotation!");