[jboss-cvs] JBossAS SVN: r89040 - projects/microcontainer/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
Tue May 19 07:48:57 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-05-19 07:48:57 -0400 (Tue, 19 May 2009)
New Revision: 89040
Added:
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AOPBeanMetaDataBuilder.java
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractDeclareBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LoaderRepositoryBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java
Log:
[JBMICROCONT-428] Add @DisableAOP annotation to beans created from -aop.xml
Added: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AOPBeanMetaDataBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AOPBeanMetaDataBuilder.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AOPBeanMetaDataBuilder.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -0,0 +1,92 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* 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.aop.microcontainer.beans.metadata;
+
+import org.jboss.aop.microcontainer.annotations.DisableAOP;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+
+/**
+ * Wrapper factory class to obtain a {@link BeanMetaDataBuilder} which adds the @{@link DisableAOP} annotation
+ * to the underlying bean being built
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AOPBeanMetaDataBuilder
+{
+ /**
+ * Create builder from bean name and add the @{@link DisableAOP} annotation
+ * to the underlying bean being built.
+ *
+ * @param bean bean class name
+ * @return new Builder
+ */
+ public static BeanMetaDataBuilder createBuilder(String bean)
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(bean);
+ addDisableAopAnnotation(builder);
+ return builder;
+ }
+
+ /**
+ * Create builder from name and bean and add the @{@link DisableAOP} annotation
+ * to the underlying bean being built.
+ * @param name bean name
+ * @param bean bean class name
+ * @return new Builder
+ */
+ public static BeanMetaDataBuilder createBuilder(String name, String bean)
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, bean);
+ addDisableAopAnnotation(builder);
+ return builder;
+ }
+
+ /**
+ * Create builder from BeanMetaData and add the @{@link DisableAOP} annotation
+ * to the underlying bean being built.
+ *
+ * @param beanMetaData the bean metadata
+ * @return new Builder()
+ */
+ public static BeanMetaDataBuilder createBuilder(BeanMetaData beanMetaData)
+ {
+ if (beanMetaData instanceof AbstractBeanMetaData)
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder((AbstractBeanMetaData)beanMetaData);
+ addDisableAopAnnotation(builder);
+ return builder;
+ }
+ else
+ {
+ throw new IllegalArgumentException("Invalid type of bean metadata: " + beanMetaData);
+ }
+ }
+
+ private static void addDisableAopAnnotation(BeanMetaDataBuilder builder)
+ {
+ builder.addAnnotation("@" + DisableAOP.class.getName());
+ }
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -87,7 +87,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, getBeanClassName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, getBeanClassName());
builder.addPropertyMetaData("invisible", invisible);
builder.addPropertyMetaData("expr", expr);
builder.addPropertyMetaData("annotation", annotation);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractDeclareBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractDeclareBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractDeclareBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -74,7 +74,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, DeclareDefinition.class.getName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, DeclareDefinition.class.getName());
builder.addPropertyMetaData("expr", expr);
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("message", message);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -62,7 +62,7 @@
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, getBeanClass());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, getBeanClass());
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("expr", expr);
setAspectManagerProperty(builder);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -76,7 +76,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder bindingBuilder = BeanMetaDataBuilder.createBuilder(name, ArrayBinding.class.getName());
+ BeanMetaDataBuilder bindingBuilder = AOPBeanMetaDataBuilder.createBuilder(name, ArrayBinding.class.getName());
bindingBuilder.addPropertyMetaData("name", name);
bindingBuilder.addPropertyMetaData("type", type);
setAspectManagerProperty(bindingBuilder);
@@ -90,7 +90,7 @@
for (BaseInterceptorData interceptor : interceptors)
{
String intName = name + "$" + i++;
- BeanMetaDataBuilder interceptorBuilder = BeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
+ BeanMetaDataBuilder interceptorBuilder = AOPBeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
setAspectManagerProperty(interceptorBuilder);
ValueMetaData injectBinding = interceptorBuilder.createInject(name, null, null, ControllerState.INSTANTIATED);
interceptorBuilder.addPropertyMetaData("binding", injectBinding);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -84,7 +84,7 @@
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, ArrayReplacement.class.getName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, ArrayReplacement.class.getName());
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("classes", clazz);
builder.addPropertyMetaData("expr", expr);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -140,12 +140,12 @@
throw new RuntimeException("Wrong number of beans" + beans);
}
BeanMetaData factory = beans.get(0);
- BeanMetaDataBuilder factoryBuilder = BeanMetaDataBuilder.createBuilder(factory);
+ BeanMetaDataBuilder factoryBuilder = AOPBeanMetaDataBuilder.createBuilder(factory);
factoryBuilder.setBean(ClassLoaderAwareGenericBeanFactory.class.getName());
result.add(factory);
//Add the Aspect
- BeanMetaDataBuilder aspectBuilder = BeanMetaDataBuilder.createBuilder(aspectName, Aspect.class.getName());
+ BeanMetaDataBuilder aspectBuilder = AOPBeanMetaDataBuilder.createBuilder(aspectName, Aspect.class.getName());
aspectBuilder.addPropertyMetaData("scope", scope);
aspectBuilder.addPropertyMetaData("name", aspectName);
HashMap<String, String> attributes = new HashMap<String, String>();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -80,7 +80,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder bindingBuilder = BeanMetaDataBuilder.createBuilder(name, AspectBinding.class.getName());
+ BeanMetaDataBuilder bindingBuilder = AOPBeanMetaDataBuilder.createBuilder(name, AspectBinding.class.getName());
bindingBuilder.addPropertyMetaData("name", name);
if (cflow != null)
{
@@ -97,7 +97,7 @@
for (BaseInterceptorData interceptor : interceptors)
{
String intName = name + "$" + i++;
- BeanMetaDataBuilder interceptorBuilder = BeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
+ BeanMetaDataBuilder interceptorBuilder = AOPBeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
setAspectManagerProperty(interceptorBuilder);
ValueMetaData injectBinding = interceptorBuilder.createInject(name, null, null, ControllerState.INSTANTIATED);
interceptorBuilder.addPropertyMetaData("binding", injectBinding);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -64,7 +64,7 @@
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
//Add the Aspect
- BeanMetaDataBuilder cflowStackBuilder = BeanMetaDataBuilder.createBuilder(getName(), CFlowStack.class.getName());
+ BeanMetaDataBuilder cflowStackBuilder = AOPBeanMetaDataBuilder.createBuilder(getName(), CFlowStack.class.getName());
cflowStackBuilder.addPropertyMetaData("name", getName());
setAspectManagerProperty(cflowStackBuilder);
result.add(cflowStackBuilder.getBeanMetaData());
@@ -77,7 +77,7 @@
for (CFlowEntry entry : calledEntries)
{
String entryName = getName() + "$" + i++;
- BeanMetaDataBuilder entryBuilder = BeanMetaDataBuilder.createBuilder(entryName, CFlowStackEntry.class.getName());
+ BeanMetaDataBuilder entryBuilder = AOPBeanMetaDataBuilder.createBuilder(entryName, CFlowStackEntry.class.getName());
entryBuilder.addPropertyMetaData("called", entry.getCalled());
entryBuilder.addPropertyMetaData("expr", entry.getExpr());
ValueMetaData injectEntry = entryBuilder.createInject(entryName);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -155,7 +155,7 @@
{
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
- BeanMetaDataBuilder domainBuilder = BeanMetaDataBuilder.createBuilder(getName(), AOPDomain.class.getName());
+ BeanMetaDataBuilder domainBuilder = AOPBeanMetaDataBuilder.createBuilder(getName(), AOPDomain.class.getName());
domainBuilder.addPropertyMetaData("name", getName());
if (parentFirst != null)
@@ -189,7 +189,7 @@
AspectManagerAwareBeanMetaDataFactory amChild = (AspectManagerAwareBeanMetaDataFactory)child;
amChild.setManagerBean(name);
amChild.setManagerProperty("domain");
- amChild.setAspectManagerProperty(BeanMetaDataBuilder.createBuilder(bean));
+ amChild.setAspectManagerProperty(AOPBeanMetaDataBuilder.createBuilder(bean));
}
List<BeanMetaData> childResult = child.getBeans();
if (childResult != null && childBeans.size() > 0)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -80,7 +80,7 @@
{
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, DynamicCFlowDef.class.getName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, DynamicCFlowDef.class.getName());
builder.addPropertyMetaData("name", name);
builder.addPropertyMetaData("className", clazz);
HashMap<String, String> attributes = new HashMap<String, String>();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -120,7 +120,7 @@
name = GUID.asString();
}
- BeanMetaDataBuilder introductionBuilder = BeanMetaDataBuilder.createBuilder(name, IntroductionBinding.class.getName());
+ BeanMetaDataBuilder introductionBuilder = AOPBeanMetaDataBuilder.createBuilder(name, IntroductionBinding.class.getName());
introductionBuilder.addPropertyMetaData("name", name);
setAspectManagerProperty(introductionBuilder);
if (clazz != null)
@@ -169,7 +169,7 @@
for (MixinData mixin : mixins)
{
String name = introductionBuilder.getBeanMetaData().getName() + "$" + i++;
- BeanMetaDataBuilder mixinBuilder = BeanMetaDataBuilder.createBuilder(name, MixinEntry.class.getName());
+ BeanMetaDataBuilder mixinBuilder = AOPBeanMetaDataBuilder.createBuilder(name, MixinEntry.class.getName());
mixinBuilder.addPropertyMetaData("mixin", mixin.getMixin());
addInterfaces(mixinBuilder, "interfaces", mixin.getInterfaces());
mixinBuilder.addPropertyMetaData("transient", mixin.getTransient());
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -81,7 +81,7 @@
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
//Do not include the bean factory here, just install the bean directly and the binding
- BeanMetaDataBuilder lifecycleBuilder = BeanMetaDataBuilder.createBuilder(name, getBean());
+ BeanMetaDataBuilder lifecycleBuilder = AOPBeanMetaDataBuilder.createBuilder(name, getBean());
if (properties != null && properties.size() > 0)
{
for (PropertyMetaData pmd : properties)
@@ -102,7 +102,7 @@
String aspectBindingName = name + "$AspectBinding";
- BeanMetaDataBuilder bindingBuilder = BeanMetaDataBuilder.createBuilder(aspectBindingName, LifecycleBinding.class.getName());
+ BeanMetaDataBuilder bindingBuilder = AOPBeanMetaDataBuilder.createBuilder(aspectBindingName, LifecycleBinding.class.getName());
bindingBuilder.addPropertyMetaData("callbackBean", name);
setAspectManagerProperty(bindingBuilder);
if (expr != null)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LoaderRepositoryBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LoaderRepositoryBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/LoaderRepositoryBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -62,7 +62,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, LifecycleRepository.class.getName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, LifecycleRepository.class.getName());
builder.addPropertyMetaData("repositoryName", contents);
builder.addPropertyMetaData("name", name);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -101,7 +101,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, ClassMetaData.class.getName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, ClassMetaData.class.getName());
builder.addPropertyMetaData("tag", tag);
builder.addPropertyMetaData("className", clazz);
HashMap<String, String> attributes = new HashMap<String, String>();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/MetaDataLoaderBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -97,7 +97,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, ClassMetaDataLoader.class.getName());
+ BeanMetaDataBuilder builder = AOPBeanMetaDataBuilder.createBuilder(name, ClassMetaDataLoader.class.getName());
builder.addPropertyMetaData("tag", tag);
builder.addPropertyMetaData("className", clazz);
HashMap<String, String> attributes = new HashMap<String, String>();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -66,7 +66,7 @@
{
name = GUID.asString();
}
- BeanMetaDataBuilder precedenceBuilder = BeanMetaDataBuilder.createBuilder(name, PrecedenceDef.class.getName());
+ BeanMetaDataBuilder precedenceBuilder = AOPBeanMetaDataBuilder.createBuilder(name, PrecedenceDef.class.getName());
precedenceBuilder.addPropertyMetaData("name", getName());
setAspectManagerProperty(precedenceBuilder);
result.add(precedenceBuilder.getBeanMetaData());
@@ -77,7 +77,7 @@
for (BaseInterceptorData entry : entries)
{
String entryName = name + "$" + i++;
- BeanMetaDataBuilder entryBuilder = BeanMetaDataBuilder.createBuilder(entryName, PrecedenceDefEntry.class.getName());
+ BeanMetaDataBuilder entryBuilder = AOPBeanMetaDataBuilder.createBuilder(entryName, PrecedenceDefEntry.class.getName());
entryBuilder.addPropertyMetaData("aspectName", entry.getRefName());
if (entry instanceof AdviceOrInterceptorData)
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -59,7 +59,7 @@
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
//Create Stack
- BeanMetaDataBuilder stackBuilder = BeanMetaDataBuilder.createBuilder(name, Stack.class.getName());
+ BeanMetaDataBuilder stackBuilder = AOPBeanMetaDataBuilder.createBuilder(name, Stack.class.getName());
stackBuilder.addPropertyMetaData("name", name);
setAspectManagerProperty(stackBuilder);
result.add(stackBuilder.getBeanMetaData());
@@ -71,7 +71,7 @@
for (BaseInterceptorData interceptor : interceptors)
{
String intName = name + "$" + i++;
- BeanMetaDataBuilder interceptorBuilder = BeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
+ BeanMetaDataBuilder interceptorBuilder = AOPBeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
setAspectManagerProperty(interceptorBuilder);
interceptorBuilder.addPropertyMetaData("forStack", Boolean.TRUE);
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java 2009-05-19 11:44:55 UTC (rev 89039)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java 2009-05-19 11:48:57 UTC (rev 89040)
@@ -67,7 +67,7 @@
{
ArrayList<BeanMetaData> beans = new ArrayList<BeanMetaData>();
- BeanMetaDataBuilder typedefBuilder = BeanMetaDataBuilder.createBuilder(getName(), TypeDef.class.getName());
+ BeanMetaDataBuilder typedefBuilder = AOPBeanMetaDataBuilder.createBuilder(getName(), TypeDef.class.getName());
typedefBuilder.addPropertyMetaData("name", getName());
typedefBuilder.addPropertyMetaData("expr", expr);
More information about the jboss-cvs-commits
mailing list