[jboss-cvs] JBossAS SVN: r90556 - projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 24 10:32:23 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-06-24 10:32:23 -0400 (Wed, 24 Jun 2009)
New Revision: 90556
Modified:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MicrocontainerAnnotationLoaderStrategy.java
Log:
[JBKERNEL-42] Don't override @XmlAttribute(name=class) properties, it does not work on IBMs JDK
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java 2009-06-24 13:47:35 UTC (rev 90555)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java 2009-06-24 14:32:23 UTC (rev 90556)
@@ -50,8 +50,6 @@
String expr;
- String clazz;
-
public String getExpr()
{
return expr;
@@ -63,17 +61,6 @@
this.expr = expr;
}
- public String getClazz()
- {
- return clazz;
- }
-
- @XmlAttribute(name="class")
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-
@Override
public List<BeanMetaData> getBeans()
{
@@ -86,7 +73,7 @@
BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, ArrayReplacement.class.getName());
builder.addPropertyMetaData("name", name);
- builder.addPropertyMetaData("classes", clazz);
+ builder.addPropertyMetaData("classes", bean);
builder.addPropertyMetaData("expr", expr);
setAspectManagerProperty(builder);
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java 2009-06-24 13:47:35 UTC (rev 90555)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java 2009-06-24 14:32:23 UTC (rev 90556)
@@ -26,7 +26,6 @@
import java.util.List;
import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -49,21 +48,8 @@
{
private static final long serialVersionUID = 1L;
- private String clazz;
-
private List<Element> elements;
- public String getClazz()
- {
- return clazz;
- }
-
- @XmlAttribute(name="class")
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-
public List<Element> getElements()
{
return elements;
@@ -82,10 +68,10 @@
BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, DynamicCFlowDef.class.getName());
builder.addPropertyMetaData("name", name);
- builder.addPropertyMetaData("className", clazz);
+ builder.addPropertyMetaData("className", bean);
HashMap<String, String> attributes = new HashMap<String, String>();
attributes.put("name", name);
- attributes.put("class", clazz);
+ attributes.put("class", bean);
if (elements != null && elements.size() > 0)
{
builder.addPropertyMetaData("element", XmlLoadableRootElementUtil.getRootElementString(elements, "dynamic-cflow", attributes));
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2009-06-24 13:47:35 UTC (rev 90555)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2009-06-24 14:32:23 UTC (rev 90556)
@@ -55,7 +55,6 @@
{
private static final long serialVersionUID = 1L;
- private String clazz;
private String expr;
private String interfaces;
private List<MixinData> mixins = new ArrayList<MixinData>();
@@ -64,17 +63,6 @@
{
}
- public String getClazz()
- {
- return clazz;
- }
-
- @XmlAttribute(name="class")
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-
public String getExpr()
{
return expr;
@@ -123,9 +111,9 @@
BeanMetaDataBuilder introductionBuilder = AOPBeanMetaDataBuilder.createBuilder(name, IntroductionBinding.class.getName());
introductionBuilder.addPropertyMetaData("name", name);
setAspectManagerProperty(introductionBuilder);
- if (clazz != null)
+ if (bean != null)
{
- introductionBuilder.addPropertyMetaData("classes", clazz);
+ introductionBuilder.addPropertyMetaData("classes", bean);
}
if (expr != null)
{
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java 2009-06-24 13:47:35 UTC (rev 90555)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java 2009-06-24 14:32:23 UTC (rev 90556)
@@ -54,8 +54,6 @@
String tag;
- String clazz;
-
//It would have been nice to handle the normal metadata elements handled by the SimpleMetaDataElements in a typed
//way, but what if we have a custom metadata loader that expects elements with the same names?
List<Element> elements;
@@ -71,17 +69,6 @@
this.tag = tag;
}
- public String getClazz()
- {
- return clazz;
- }
-
- @XmlAttribute(name="class")
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-
public List<Element> getElements()
{
return elements;
@@ -103,10 +90,10 @@
}
BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, ClassMetaData.class.getName());
builder.addPropertyMetaData("tag", tag);
- builder.addPropertyMetaData("className", clazz);
+ builder.addPropertyMetaData("className", bean);
HashMap<String, String> attributes = new HashMap<String, String>();
attributes.put("tag", tag);
- attributes.put("class", clazz);
+ attributes.put("class", bean);
builder.addPropertyMetaData("element", XmlLoadableRootElementUtil.getRootElementString(elements, "metadata", attributes));
setAspectManagerProperty(builder);
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java 2009-06-24 13:47:35 UTC (rev 90555)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java 2009-06-24 14:32:23 UTC (rev 90556)
@@ -52,8 +52,6 @@
private String tag;
- private String clazz;
-
private List<Element> elements;
public String getTag()
@@ -67,17 +65,6 @@
this.tag = tag;
}
- public String getClazz()
- {
- return clazz;
- }
-
- @XmlAttribute(name="class")
- public void setClazz(String clazz)
- {
- this.clazz = clazz;
- }
-
public List<Element> getElements()
{
return elements;
@@ -99,7 +86,7 @@
}
BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, ClassMetaDataLoader.class.getName());
builder.addPropertyMetaData("tag", tag);
- builder.addPropertyMetaData("className", clazz);
+ builder.addPropertyMetaData("className", bean);
HashMap<String, String> attributes = new HashMap<String, String>();
attributes.put("tag", tag);
attributes.put("name", name);
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MicrocontainerAnnotationLoaderStrategy.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MicrocontainerAnnotationLoaderStrategy.java 2009-06-24 13:47:35 UTC (rev 90555)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MicrocontainerAnnotationLoaderStrategy.java 2009-06-24 14:32:23 UTC (rev 90556)
@@ -222,7 +222,7 @@
{
DynamicCflowBeanMetaDataFactory dcflow = new DynamicCflowBeanMetaDataFactory();
dcflow.setName(name);
- dcflow.setClazz(clazz);
+ dcflow.setBean(clazz);
factories.add(dcflow);
}
@@ -238,7 +238,7 @@
IntroductionBeanMetaDataFactory intro = new IntroductionBeanMetaDataFactory();
intro.setName(introduction.getName());
intro.setExpr(introduction.getExpr());
- intro.setClazz(introduction.getTarget());
+ intro.setBean(introduction.getTarget());
if (introduction.getInterfaces() != null)
{
intro.setInterfaces(createCommaSeparatedInterfaceString(introduction.getInterfaces()));
More information about the jboss-cvs-commits
mailing list