[jboss-cvs] JBossAS SVN: r60048 - in projects/microcontainer/trunk/kernel/src: resources/schema and 1 other directory.

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

Author: alesj
Date: 2007-01-27 13:53:11 -0500 (Sat, 27 Jan 2007)
New Revision: 60048

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
   projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd
Log:
adding StringPropertyReplacer to annotation value

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java	2007-01-27 14:55:28 UTC (rev 60047)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java	2007-01-27 18:53:11 UTC (rev 60048)
@@ -32,6 +32,7 @@
 import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
 import org.jboss.util.JBossObject;
 import org.jboss.util.JBossStringBuilder;
+import org.jboss.util.StringPropertyReplacer;
 
 /**
  * Metadata for an annotation.
@@ -47,7 +48,9 @@
    public String annotation;
 
    protected Annotation ann;
-   
+
+   protected boolean replace = true;
+
    /**
     * Create a new annotation meta data
     */
@@ -66,12 +69,27 @@
       this.annotation = annotation;
    }
 
+   public boolean isReplace()
+   {
+      return replace;
+   }
+
+   public void setReplace(boolean replace)
+   {
+      this.replace = replace;
+   }
+
    public Annotation getAnnotationInstance()
    {
       try
       {
+         String annString = annotation;
+         if (replace)
+         {
+            annString = StringPropertyReplacer.replaceProperties(annString);
+         }
          //FIXME [JBMICROCONT-99] [JBAOP-278] Use the loader for the bean?
-         ann = (Annotation)AnnotationCreator.createAnnotation(annotation, Thread.currentThread().getContextClassLoader());
+         ann = (Annotation)AnnotationCreator.createAnnotation(annString, Thread.currentThread().getContextClassLoader());
       }
       catch (Exception e)
       {
@@ -81,10 +99,10 @@
       {
          throw new RuntimeException("Error creating annotation for " + annotation, e);
       }
-      
+
       return ann;
    }
-   
+
    public void initialVisit(MetaDataVisitor visitor)
    {
       visitor.initialVisit(this);
@@ -99,12 +117,12 @@
    {
       return null;
    }
-   
+
    public void toString(JBossStringBuilder buffer)
    {
       buffer.append("expr=").append(ann);
    }
-   
+
    public void toShortString(JBossStringBuilder buffer)
    {
       buffer.append(ann);

Modified: projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd	2007-01-27 14:55:28 UTC (rev 60047)
+++ projects/microcontainer/trunk/kernel/src/resources/schema/bean-deployer_2_0.xsd	2007-01-27 18:53:11 UTC (rev 60048)
@@ -459,7 +459,6 @@
            ]]>
          </xsd:documentation>
       </xsd:annotation>
-<!--      <xsd:attribute name="value" type="xsd:string" use="required"/>-->
       <xsd:restriction base="xsd:string">
          <xsd:whiteSpace value="collapse"/>
       </xsd:restriction>