[jboss-cvs] JBossAS SVN: r89242 - in projects/microcontainer/trunk/aop-mc-int/src: main/java/org/jboss/aop/microcontainer/integration and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 21 06:11:41 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-05-21 06:11:40 -0400 (Thu, 21 May 2009)
New Revision: 89242
Added:
projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml
projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml
projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml
Removed:
projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.xml
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/AnnotationsTestCase.java
Log:
[JBKERNEL-31] Make @DisableAop more fine-grained
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java 2009-05-21 07:21:30 UTC (rev 89241)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java 2009-05-21 10:11:40 UTC (rev 89242)
@@ -21,6 +21,9 @@
*/
package org.jboss.aop.microcontainer.annotations;
+import java.util.Arrays;
+import java.util.EnumSet;
+
/**
* Fine grained disable type.
* e.g. LIFECYCLE only disable aop lifecycle callbacks
@@ -29,17 +32,11 @@
*/
public enum DisabledType
{
- ALL(~0),
- LIFECYCLE(1),
- POINTCUTS(1 << 1);
+ ALL,
+ LIFECYCLE,
+ POINTCUTS;
- private int bits;
- DisabledType(int bits)
- {
- this.bits = bits;
- }
-
/**
* Is the type disabled for this constraint.
*
@@ -48,11 +45,25 @@
*/
public boolean isDisabled(DisabledType constraint)
{
- int and = bits & constraint.bits;
- return and == constraint.bits;
+ if (this == ALL)
+ {
+ return true;
+ }
+ return this == constraint;
}
/**
+ * Is the type enabled for this constraint.
+ *
+ * @param constraint the constraint
+ * @return true if enabled for this constraint
+ */
+ public boolean isEnabled(DisabledType constraint)
+ {
+ return isDisabled(constraint) == false;
+ }
+
+ /**
* Do values mark disabled usage.
*
* @param values the disabled values
@@ -63,13 +74,12 @@
{
if (values == null || values.length == 0)
return false;
-
- for (DisabledType value : values)
- {
- if (value.isDisabled(constraint))
- return true;
- }
-
- return false;
+ EnumSet<DisabledType> set = EnumSet.copyOf(Arrays.asList(values));
+ return set.contains(ALL) || set.contains(constraint);
}
+
+ public static boolean isEnabled(DisabledType[] values, DisabledType constraint)
+ {
+ return !isDisabled(values, constraint);
+ }
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 2009-05-21 07:21:30 UTC (rev 89241)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 2009-05-21 10:11:40 UTC (rev 89242)
@@ -30,6 +30,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.ConstructorInvocation;
+import org.jboss.aop.microcontainer.annotations.DisabledType;
import org.jboss.aop.microcontainer.beans.AspectManagerFactory;
import org.jboss.aop.microcontainer.annotations.DisabledType;
import org.jboss.aop.proxy.container.AOPProxyFactory;
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2009-05-21 07:21:30 UTC (rev 89241)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2009-05-21 10:11:40 UTC (rev 89242)
@@ -82,18 +82,19 @@
*
* @param beanInfo the bean info
* @param metaData the metadata instance
+ * @param disabledType The type we want to check if is disabled
* @return true if we should bypass aop, false otherwise
*/
- protected boolean bypassAOP(BeanInfo beanInfo, MetaData metaData)
+ protected boolean bypassAOP(BeanInfo beanInfo, MetaData metaData, DisabledType disabledType)
{
- return DisableAOPHelper.isAOPDisabled(metaData, DisabledType.ALL);
+ return DisableAOPHelper.isAOPDisabled(metaData, disabledType);
}
@SuppressWarnings({"unchecked", "deprecation"})
@Override
public List<DependencyBuilderListItem> getDependencies(BeanInfo beanInfo, MetaData metaData)
{
- if (bypassAOP(beanInfo, metaData))
+ if (bypassAOP(beanInfo, metaData, DisabledType.ALL))
{
return super.getDependencies(beanInfo, metaData);
}
@@ -119,41 +120,46 @@
advisor = cache.getAdvisor();
}
ReflectiveAspectBinder binder = new ReflectiveAspectBinder(clazz, advisor);
- Set aspects = binder.getAspects();
+ ArrayList<DependencyBuilderListItem> depends = new ArrayList<DependencyBuilderListItem>();
- ArrayList<DependencyBuilderListItem> depends = new ArrayList<DependencyBuilderListItem>();
- if (aspects != null && aspects.size() > 0)
+ if (bypassAOP(beanInfo, metaData, DisabledType.POINTCUTS) == false)
{
- Iterator it = aspects.iterator();
- while (it.hasNext())
+ Set aspects = binder.getAspects();
+
+ if (aspects != null && aspects.size() > 0)
{
- AspectDefinition def = (AspectDefinition) it.next();
- if (def instanceof ManagedAspectDefinition)
+ Iterator it = aspects.iterator();
+ while (it.hasNext())
{
- String name = ((ManagedAspectDefinition)def).getDependentAspectName();
- if (name != null)
+ AspectDefinition def = (AspectDefinition) it.next();
+ if (def instanceof ManagedAspectDefinition)
{
- depends.add(new AspectDependencyBuilderListItem(name));
+ String name = ((ManagedAspectDefinition)def).getDependentAspectName();
+ if (name != null)
+ {
+ depends.add(new AspectDependencyBuilderListItem(name));
+ }
}
}
}
}
- // TODO - add lifecycle + disable aop
-
- Map<Object, Set<LifecycleCallbackDefinition>> lifecycleCallbacks = binder.getLifecycleCallbacks();
- if (lifecycleCallbacks != null && lifecycleCallbacks.size() > 0)
+ if (bypassAOP(beanInfo, metaData, DisabledType.LIFECYCLE) == false)
{
- for (Entry<Object, Set<LifecycleCallbackDefinition>> states : lifecycleCallbacks.entrySet())
+ Map<Object, Set<LifecycleCallbackDefinition>> lifecycleCallbacks = binder.getLifecycleCallbacks();
+ if (lifecycleCallbacks != null && lifecycleCallbacks.size() > 0)
{
- for (LifecycleCallbackDefinition callback : states.getValue())
+ for (Entry<Object, Set<LifecycleCallbackDefinition>> states : lifecycleCallbacks.entrySet())
{
- depends.add(new LifecycleAspectDependencyBuilderListItem(
- callback.getBean(), (ControllerState)states.getKey(), callback.getInstallMethod(), callback.getUninstallMethod()));
+ for (LifecycleCallbackDefinition callback : states.getValue())
+ {
+ depends.add(new LifecycleAspectDependencyBuilderListItem(
+ callback.getBean(), (ControllerState)states.getKey(), callback.getInstallMethod(), callback.getUninstallMethod()));
+ }
}
}
}
-
+
HashSet<String> annotationDependencies = getAnnotationDependencies(classInfo, metaData);
for (String dependency : annotationDependencies)
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.java 2009-05-21 07:21:30 UTC (rev 89241)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.java 2009-05-21 10:11:40 UTC (rev 89242)
@@ -27,6 +27,7 @@
import junit.framework.Test;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
@@ -57,26 +58,66 @@
// do nothing, so we ignore validate
}
- public void testBeanWithDependency() throws Exception
+ public void testAllAopTurnedOff() throws Exception
{
+ assertMoreDependencies("Intercepted", "NotIntercepted");
+
+ POJO pojoNotIntercepted = (POJO)getBean("NotIntercepted");
+ assertFalse(pojoNotIntercepted instanceof AspectManaged);
+
+ assertMoreDependencies("WithLifecycle", "WithLifecycleDisabled");
+ }
+
+ public void testPointcutsTurnedOff() throws Exception
+ {
+ assertMoreDependencies("Intercepted", "NotIntercepted");
+
+ POJO pojoNotIntercepted = (POJO)getBean("NotIntercepted");
+ assertFalse(pojoNotIntercepted instanceof AspectManaged);
+
+ assertNotInstalledContext("WithLifecycle");
+ assertNotInstalledContext("WithLifecycleDisabled");
+ }
+
+ public void testLifecycleTurnedOff() throws Exception
+ {
+ assertNotInstalledContext("Intercepted");
+ assertNotInstalledContext("NotIntercepted");
+
+ assertMoreDependencies("WithLifecycle", "WithLifecycleDisabled");
+ }
+
+ private void assertMoreDependencies(String aspectCtxName, String disabledCtxName)
+ {
+ ControllerContext aspectCtx = assertNotInstalledContext(aspectCtxName);
+ ControllerContext disabledCtx = assertInstalledContext(disabledCtxName);
+
+ Set<DependencyItem> interceptedDependencies = new HashSet<DependencyItem>(aspectCtx.getDependencyInfo().getIDependOn(null));
+ Set<DependencyItem> notInterceptedDependencies = new HashSet<DependencyItem>(disabledCtx.getDependencyInfo().getIDependOn(null));
+ assertTrue(interceptedDependencies.size() > notInterceptedDependencies.size());
+ }
+
+ private ControllerContext assertNotInstalledContext(String bean)
+ {
try
{
- getControllerContext("Intercepted");
- fail("'Intercepted' should not have been installed");
+ getControllerContext(bean);
+ fail("'" + bean + "' should not have been installed");
}
catch (Exception expected)
{
}
- ControllerContext ctxIntercepted = getControllerContext("Intercepted", null);
- ControllerContext ctxNotIntercepted = getControllerContext("NotIntercepted");
- assertNotNull(ctxIntercepted);
- assertNotNull(ctxNotIntercepted);
-
- Set<DependencyItem> interceptedDependencies = new HashSet<DependencyItem>(ctxIntercepted.getDependencyInfo().getIDependOn(null));
- Set<DependencyItem> notInterceptedDependencies = new HashSet<DependencyItem>(ctxNotIntercepted.getDependencyInfo().getIDependOn(null));
- assertTrue(interceptedDependencies.size() > notInterceptedDependencies.size());
-
- POJO pojoNotIntercepted = (POJO)getBean("NotIntercepted");
- assertFalse(pojoNotIntercepted instanceof AspectManaged);
+ ControllerContext ctx = getControllerContext(bean, null);
+ assertNotNull(ctx);
+ assertNotSame(ControllerState.INSTALLED, ctx.getState());
+ return ctx;
}
+
+ private ControllerContext assertInstalledContext(String bean)
+ {
+ ControllerContext ctx = getControllerContext(bean);
+ assertNotNull(ctx);
+ assertSame(ControllerState.INSTALLED, ctx.getState());
+ return ctx;
+ }
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/AnnotationsTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/AnnotationsTestCase.java 2009-05-21 07:21:30 UTC (rev 89241)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/AnnotationsTestCase.java 2009-05-21 10:11:40 UTC (rev 89242)
@@ -48,33 +48,54 @@
assertTrue(all.isDisabled(DisabledType.ALL));
assertTrue(all.isDisabled(DisabledType.LIFECYCLE));
assertTrue(all.isDisabled(DisabledType.POINTCUTS));
+ assertFalse(all.isEnabled(DisabledType.ALL));
+ assertFalse(all.isEnabled(DisabledType.LIFECYCLE));
+ assertFalse(all.isEnabled(DisabledType.POINTCUTS));
DisabledType lifecycle = DisabledType.LIFECYCLE;
assertFalse(lifecycle.isDisabled(DisabledType.ALL));
assertTrue(lifecycle.isDisabled(DisabledType.LIFECYCLE));
assertFalse(lifecycle.isDisabled(DisabledType.POINTCUTS));
+ assertTrue(lifecycle.isEnabled(DisabledType.ALL));
+ assertFalse(lifecycle.isEnabled(DisabledType.LIFECYCLE));
+ assertTrue(lifecycle.isEnabled(DisabledType.POINTCUTS));
DisabledType pointcut = DisabledType.POINTCUTS;
assertFalse(pointcut.isDisabled(DisabledType.ALL));
assertFalse(pointcut.isDisabled(DisabledType.LIFECYCLE));
assertTrue(pointcut.isDisabled(DisabledType.POINTCUTS));
+ assertTrue(pointcut.isEnabled(DisabledType.ALL));
+ assertTrue(pointcut.isEnabled(DisabledType.LIFECYCLE));
+ assertFalse(pointcut.isEnabled(DisabledType.POINTCUTS));
DisabledType[] three = {all, lifecycle, pointcut};
assertTrue(DisabledType.isDisabled(three, DisabledType.ALL));
assertTrue(DisabledType.isDisabled(three, DisabledType.LIFECYCLE));
assertTrue(DisabledType.isDisabled(three, DisabledType.POINTCUTS));
+ assertFalse(DisabledType.isEnabled(three, DisabledType.ALL));
+ assertFalse(DisabledType.isEnabled(three, DisabledType.LIFECYCLE));
+ assertFalse(DisabledType.isEnabled(three, DisabledType.POINTCUTS));
DisabledType[] two = {all, lifecycle};
assertTrue(DisabledType.isDisabled(two, DisabledType.ALL));
assertTrue(DisabledType.isDisabled(two, DisabledType.LIFECYCLE));
assertTrue(DisabledType.isDisabled(two, DisabledType.POINTCUTS));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.ALL));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.LIFECYCLE));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.POINTCUTS));
two = new DisabledType[]{all, pointcut};
assertTrue(DisabledType.isDisabled(two, DisabledType.ALL));
assertTrue(DisabledType.isDisabled(two, DisabledType.LIFECYCLE));
assertTrue(DisabledType.isDisabled(two, DisabledType.POINTCUTS));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.ALL));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.LIFECYCLE));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.POINTCUTS));
two = new DisabledType[]{lifecycle, pointcut};
assertFalse(DisabledType.isDisabled(two, DisabledType.ALL));
assertTrue(DisabledType.isDisabled(two, DisabledType.LIFECYCLE));
assertTrue(DisabledType.isDisabled(two, DisabledType.POINTCUTS));
+ assertTrue(DisabledType.isEnabled(two, DisabledType.ALL));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.LIFECYCLE));
+ assertFalse(DisabledType.isEnabled(two, DisabledType.POINTCUTS));
}
}
\ No newline at end of file
Copied: projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml (from rev 89174, projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.xml)
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml 2009-05-21 10:11:40 UTC (rev 89242)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </aspect>
+
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </bind>
+
+ <lifecycle-configure
+ name="LifecycleCallback"
+ class="org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency"
+ expr="class(org.jboss.test.microcontainer.beans.POJO2)"
+ manager-bean="AspectManager">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </lifecycle-configure>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+ <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>
+ </bean>
+
+ <bean name="WithLifecycle" class="org.jboss.test.microcontainer.beans.POJO2"/>
+
+ <bean name="WithLifecycleDisabled" class="org.jboss.test.microcontainer.beans.POJO2">
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>
+ </bean>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml 2009-05-21 10:11:40 UTC (rev 89242)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </aspect>
+
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </bind>
+
+ <lifecycle-configure
+ name="LifecycleCallback"
+ class="org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency"
+ expr="class(org.jboss.test.microcontainer.beans.POJO2)"
+ manager-bean="AspectManager">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </lifecycle-configure>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+ <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP({org.jboss.aop.microcontainer.annotations.DisabledType.LIFECYCLE})</annotation>
+ </bean>
+
+ <bean name="WithLifecycle" class="org.jboss.test.microcontainer.beans.POJO2"/>
+
+ <bean name="WithLifecycleDisabled" class="org.jboss.test.microcontainer.beans.POJO2">
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP({org.jboss.aop.microcontainer.annotations.DisabledType.LIFECYCLE})</annotation>
+ </bean>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml 2009-05-21 10:11:40 UTC (rev 89242)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </aspect>
+
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </bind>
+
+ <lifecycle-configure
+ name="LifecycleCallback"
+ class="org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency"
+ expr="class(org.jboss.test.microcontainer.beans.POJO2)"
+ manager-bean="AspectManager">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </lifecycle-configure>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+ <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP({org.jboss.aop.microcontainer.annotations.DisabledType.POINTCUTS})</annotation>
+ </bean>
+
+ <bean name="WithLifecycle" class="org.jboss.test.microcontainer.beans.POJO2"/>
+
+ <bean name="WithLifecycleDisabled" class="org.jboss.test.microcontainer.beans.POJO2">
+ <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP({org.jboss.aop.microcontainer.annotations.DisabledType.POINTCUTS})</annotation>
+ </bean>
+</aop>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.xml 2009-05-21 07:21:30 UTC (rev 89241)
+++ projects/microcontainer/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase.xml 2009-05-21 10:11:40 UTC (rev 89242)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<aop xmlns="urn:jboss:aop-beans:1.0">
-
- <bean name="AspectManager" class="org.jboss.aop.AspectManager">
- <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
- </bean>
-
- <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
- <property name="dependency"><inject bean="Dependency"/></property>
- </aspect>
-
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
- <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
- </bind>
-
- <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-
- <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO">
- <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>
- </bean>
-
-</aop>
More information about the jboss-cvs-commits
mailing list