[jboss-cvs] JBossAS SVN: r98981 - in projects/kernel/branches/disableaop/aop-mc-int: src/main/java/org/jboss/aop/microcontainer/annotations and 6 other directories.

Mon Jan 4 07:10:35 EST 2010

Author: kabir.khan at jboss.com
Date: 2010-01-04 07:10:31 -0500 (Mon, 04 Jan 2010)
New Revision: 98981

Added:
   projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAopLifecycle.java
   projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java
Modified:
   projects/kernel/branches/disableaop/aop-mc-int/pom.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAOP.java
   projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
   projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
   projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java
   projects/kernel/branches/disableaop/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/InterceptedExistingTargetTestCase.java
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/AspectTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/CFlowTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DeclareTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DefaultBean.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DynamicCFlowTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/InterceptorTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/IntroductionTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/NamedPointcutTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/PrecedenceTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/TypedefTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyAopTestCaseNotAutomatic0.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyBeansTestCaseNotAutomatic0.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyDeploymentTestCaseNotAutomatic0.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleIfaceDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassJoinpointAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerInstanceAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerJoinpointAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerVmAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableDeploymentTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/AnnotationsInProxyTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCaseNotAutomatic.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/FieldAccessTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptedTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecorated-flawed.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MetaDataTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MixinTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/SimpleAspectTestCase.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml
   projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml
Log:
Commit @EnableAopProxy and fixes to tests

Modified: projects/kernel/branches/disableaop/aop-mc-int/pom.xml
===================================================================

--- projects/kernel/branches/disableaop/aop-mc-int/pom.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/pom.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -200,9 +200,9 @@
                 <property name="report.dir" value="${project.build.directory}/surefire-reports"/>
                 <property name="testOutputDirectory" value="${project.build.testOutputDirectory}"/>
 
-                <ant antfile="${project.build.testOutputDirectory}/build.xml"  inheritrefs="true">
+                <!--ant antfile="${project.build.testOutputDirectory}/build.xml"  inheritrefs="true">
                   <target name="asynchronous-tests"/>
-                </ant>                
+                </ant-->                
               </tasks>
             </configuration>
           </execution>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAOP.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAOP.java	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAOP.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -32,9 +32,13 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision: 1.1 $
+ * @deprecated By default aop proxies are disabled, and aop lifecycle callbacks enabled. To enable aop proxies use @EnableAopProxy 
+ * and to disable aop lifecycle callbacks use @DisableAopLifecycle. If for some reason this annotation is used in conjunction with 
+ * @EnableAopProxy or @DisableAopLifecycle, @EnableAopProxy and @DisableAopLifecycle will take precedence. 
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+ at Deprecated
 public @interface DisableAOP 
 {
    /**

Added: projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAopLifecycle.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAopLifecycle.java	                        (rev 0)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisableAopLifecycle.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -0,0 +1,32 @@
+/*
+* 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.annotations;
+
+/**
+ * Use to disable aop lifecycle callbacks for a bean. By default they are enabled
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public @interface DisableAopLifecycle {
+
+}

Added: projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java	                        (rev 0)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -0,0 +1,32 @@
+/*
+* 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.annotations;
+
+/**
+ * Use to enable aop proxies for a bean. By default they are disabled
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public @interface EnableAopProxy {
+
+}

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -30,7 +30,10 @@
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.ConstructorInvocation;
+import org.jboss.aop.microcontainer.annotations.DisableAOP;
+import org.jboss.aop.microcontainer.annotations.DisableAopLifecycle;
 import org.jboss.aop.microcontainer.annotations.DisabledType;
+import org.jboss.aop.microcontainer.annotations.EnableAopProxy;
 import org.jboss.aop.microcontainer.beans.AspectManagerFactory;
 import org.jboss.aop.proxy.container.AOPProxyFactory;
 import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
@@ -231,7 +234,13 @@
          }
          else if (annotationsSize > 0)
          {
-            return true;
+            //Don't include the annotations for controlling whether to use AOP
+            for (Annotation ann : annotations)
+            {
+               if (ann.annotationType() == EnableAopProxy.class || ann.annotationType() == DisableAOP.class || ann.annotationType() == DisableAopLifecycle.class)
+                  annotationsSize--;
+            }
+            return annotationsSize > 0;
          }
       }
       return false;

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -32,6 +32,7 @@
 import java.util.Set;
 import java.util.Map.Entry;
 
+import org.jboss.aop.Advised;
 import org.jboss.aop.Advisor;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.ReflectiveAspectBinder;
@@ -94,25 +95,21 @@
    @Override
    public List<DependencyBuilderListItem> getDependencies(BeanInfo beanInfo, MetaData metaData)
    {
-      if (bypassAOP(beanInfo, metaData, DisabledType.ALL))
-      {
-         return super.getDependencies(beanInfo, metaData);
-      }
-      
-      AspectManager manager = AspectManagerFactory.getAspectManager(metaData);
       try
       {
-         ClassInfo classInfo = beanInfo.getClassInfo();
-         String className = classInfo.getName();
-         if (className != null)
+         Class<?> clazz = getClass(beanInfo);
+
+         boolean classIsWoven = Advised.class.isAssignableFrom(clazz);
+         
+         if (!classIsWoven && bypassAOP(beanInfo, metaData, DisabledType.ALL))
          {
-            ClassLoader loader = classInfo.getType().getClassLoader();
-            if (loader == null)
-            {
-               loader = Thread.currentThread().getContextClassLoader();
-            }
-            Class<?> clazz = loader.loadClass(className);
+            return super.getDependencies(beanInfo, metaData);
+         }
+         
 
+         AspectManager manager = AspectManagerFactory.getAspectManager(metaData);
+         if (clazz != null)
+         {
             Advisor advisor;
             synchronized (ContainerCache.mapLock)
             {
@@ -122,7 +119,7 @@
             ReflectiveAspectBinder binder = new ReflectiveAspectBinder(clazz, advisor);
             ArrayList<DependencyBuilderListItem> depends = new ArrayList<DependencyBuilderListItem>();
 
-            if (bypassAOP(beanInfo, metaData, DisabledType.POINTCUTS) == false)
+            if (!classIsWoven && bypassAOP(beanInfo, metaData, DisabledType.POINTCUTS) == false)
             {
                Set aspects = binder.getAspects();
    
@@ -160,7 +157,7 @@
                }
             }
             
-            HashSet<String> annotationDependencies = getAnnotationDependencies(classInfo, metaData);
+            HashSet<String> annotationDependencies = getAnnotationDependencies(beanInfo.getClassInfo(), metaData);
             for (String dependency : annotationDependencies)
             {
                depends.add(new AnnotationDependencyBuilderListItem(dependency));
@@ -176,6 +173,22 @@
       }
    }
 
+   private Class<?> getClass(BeanInfo beanInfo) throws ClassNotFoundException
+   {
+      ClassInfo classInfo = beanInfo.getClassInfo();
+      String className = classInfo.getName();
+      if (className != null)
+      {
+         ClassLoader loader = classInfo.getType().getClassLoader();
+         if (loader == null)
+         {
+            loader = Thread.currentThread().getContextClassLoader();
+         }
+         return loader.loadClass(className);
+      }
+      return null;
+   }
+   
    private HashSet<String> getAnnotationDependencies(ClassInfo classInfo, MetaData metaData)
    {
       try

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,7 +22,9 @@
 package org.jboss.aop.microcontainer.integration;
 
 import org.jboss.aop.microcontainer.annotations.DisableAOP;
+import org.jboss.aop.microcontainer.annotations.DisableAopLifecycle;
 import org.jboss.aop.microcontainer.annotations.DisabledType;
+import org.jboss.aop.microcontainer.annotations.EnableAopProxy;
 import org.jboss.metadata.spi.MetaData;
 
 /**
@@ -33,22 +35,10 @@
 public final class DisableAOPHelper
 {
    /**
-    * Is AOP disabled for this metadata instance.
+    * Is AOP disabled for this metadata instance. First it checks the @EnableAopProxy and @DisableAopProxy annotations
+    * before checking the deprecated @DisableAOP annotation
     *
     * @param metaData the metadata instance
-    * @return true if AOP is disabled, false otherwise
-    * @deprecated use the method with a constraint
-    */
-   @Deprecated
-   public static boolean isAOPDisabled(MetaData metaData)
-   {
-      return isAOPDisabled(metaData, DisabledType.ALL);
-   }
-
-   /**
-    * Is AOP disabled for this metadata instance.
-    *
-    * @param metaData the metadata instance
     * @param constraint the constraint
     * @return true if AOP is disabled, false otherwise
     */
@@ -56,10 +46,38 @@
    {
       if (metaData != null)
       {
+         Boolean legacyDisabled = null;
          DisableAOP aop = metaData.getAnnotation(DisableAOP.class);
          if (aop != null)
-            return DisabledType.isDisabled(aop.value(), constraint);
+            legacyDisabled = DisabledType.isDisabled(aop.value(), constraint);
+         
+         if (constraint == DisabledType.LIFECYCLE)
+         {
+            DisableAopLifecycle proxy = metaData.getAnnotation(DisableAopLifecycle.class);
+            if (proxy != null)
+               return true;
+
+            if (legacyDisabled != null)
+               return legacyDisabled;
+            return false; 
+         }
+         else if (constraint == DisabledType.POINTCUTS)
+         {
+            EnableAopProxy proxy = metaData.getAnnotation(EnableAopProxy.class);
+            if (proxy != null)
+               return false;
+            return true;
+         }
+         else if (constraint == DisabledType.ALL)
+         {
+            DisableAopLifecycle proxy = metaData.getAnnotation(DisableAopLifecycle.class);
+            if (proxy != null)
+               return true;
+            if (legacyDisabled != null)
+               return legacyDisabled;
+            return false;
+         }
       }
-      return false;
+      return true;
    }
 }

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/InterceptedExistingTargetTestCase.java
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/InterceptedExistingTargetTestCase.java	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/InterceptedExistingTargetTestCase.java	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,6 +22,8 @@
 package org.jboss.test.microcontainer.test;
 
 import junit.framework.Test;
+
+import org.jboss.aop.microcontainer.annotations.EnableAopProxy;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.test.aop.junit.AOPMicrocontainerTest;
 import org.jboss.test.microcontainer.support.CalledInterceptor;
@@ -48,6 +50,7 @@
       SimpleBean existing = new SimpleBeanImpl();
 
       BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Intercepted", "org.jboss.test.microcontainer.support.SimpleBeanWrapper");
+      builder.addAnnotation("@" + EnableAopProxy.class.getName());
       builder.addConstructorParameter(SimpleBean.class.getName(), existing);
       deploy(builder.getBeanMetaData());
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,13 +2,18 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-	<bean name="One" class="org.jboss.test.microcontainer.advisor.test.some.Pojo"/>
-
-	<bean name="Two" class="org.jboss.test.microcontainer.advisor.test.some.Pojo"/>
-
-	<bean name="Three" class="org.jboss.test.microcontainer.advisor.test.another.Pojo"/>
-
-	<bean name="Four" class="org.jboss.test.microcontainer.advisor.test.another.Pojo"/>
+	<bean name="One" class="org.jboss.test.microcontainer.advisor.test.some.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+	<bean name="Two" class="org.jboss.test.microcontainer.advisor.test.some.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+	<bean name="Three" class="org.jboss.test.microcontainer.advisor.test.another.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+	<bean name="Four" class="org.jboss.test.microcontainer.advisor.test.another.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>
 
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -3,6 +3,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
 	<bean name="One" class="org.jboss.test.microcontainer.advisor.test.some.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
 	   <constructor>
 	      <parameter>1</parameter>
 	      <parameter>One</parameter>
@@ -10,6 +11,7 @@
 	</bean>
 
 	<bean name="Two" class="org.jboss.test.microcontainer.advisor.test.some.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
 	   <constructor>
 	      <parameter>9999</parameter>
 	      <parameter>Should be ignored since singleton aspect stops creation of new instance</parameter>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -3,6 +3,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
 	<bean name="One" class="org.jboss.test.microcontainer.advisor.test.some.Pojo">
+	   <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.advisor.test.Singleton</annotation>
 	   <constructor>
 	      <parameter>1</parameter>
@@ -11,6 +12,7 @@
 	</bean>
 
 	<bean name="Two" class="org.jboss.test.microcontainer.advisor.test.some.Pojo">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.advisor.test.Singleton</annotation>
 	   <constructor>
 	      <parameter>9999</parameter>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/AspectTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/AspectTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/AspectTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,8 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="BeanA" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
-   <bean name="BeanB" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="BeanA" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="BeanB" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/CFlowTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/CFlowTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/CFlowTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DeclareTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DeclareTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DeclareTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DefaultBean.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DefaultBean.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DefaultBean.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DynamicCFlowTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DynamicCFlowTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/DynamicCFlowTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/InterceptorTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/InterceptorTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/InterceptorTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,8 +2,10 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="BeanA" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
-   <bean name="BeanB" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="BeanA" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="BeanB" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/IntroductionTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/IntroductionTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/IntroductionTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/NamedPointcutTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/NamedPointcutTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/NamedPointcutTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/PrecedenceTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/PrecedenceTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/PrecedenceTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/TypedefTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/TypedefTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/annotatedaop/test/TypedefTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -2,6 +2,7 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.annotatedaop.SimplePOJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -20,6 +20,8 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -43,6 +43,8 @@
    	</property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -20,6 +20,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,6 +16,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.AnnotationWithValueAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -36,6 +36,7 @@
    	</property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AnnotationOverridePropertyReplacementDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,6 +16,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.AnnotationWithValueAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -32,6 +32,7 @@
    </bean>
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyAopTestCaseNotAutomatic0.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyAopTestCaseNotAutomatic0.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,6 +15,8 @@
    </bind>
 
    <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyBeansTestCaseNotAutomatic0.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyBeansTestCaseNotAutomatic0.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyBeansTestCaseNotAutomatic0.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -39,6 +39,7 @@
 
 
    <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyDeploymentTestCaseNotAutomatic0.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectFactoryWithDependencyDeploymentTestCaseNotAutomatic0.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,6 +15,7 @@
    </bind>
    
    <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
    

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
 	
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -31,6 +31,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
 	
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
    </bind>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -36,6 +36,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
 		<aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
    </aop:bind>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testAllAopTurnedOff.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,7 +22,9 @@
       <property name="dependency"><inject bean="Dependency"/></property>
    </lifecycle-configure>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
    <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO">
       <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP</annotation>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testLifecycleTurnedOff.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,9 +22,12 @@
       <property name="dependency"><inject bean="Dependency"/></property>
    </lifecycle-configure>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+      
    <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.annotations.DisableAOP({org.jboss.aop.microcontainer.annotations.DisabledType.LIFECYCLE})</annotation>
    </bean>
    

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTurnedOffAopTestCase#testPointcutsTurnedOff.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,11 +22,11 @@
       <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 name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    </bean>
+   <!--  Pointcuts turned odd by default  -->
+   <bean name="NotIntercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
    
    <bean name="WithLifecycle" class="org.jboss.test.microcontainer.beans.POJO2"/>
    

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -17,6 +17,8 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
 	   
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -50,6 +50,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -17,6 +17,7 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
 	   
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -31,6 +31,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestClassMetaDataAspect" name="advice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -57,6 +57,7 @@
    	</property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -31,6 +31,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestClassMetaDataAspect" name="advice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -18,6 +18,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestClassMetaDataAspect" name="advice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -48,6 +48,7 @@
    	</property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -18,6 +18,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestClassMetaDataAspect" name="advice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -39,6 +39,7 @@
    </bean>
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
 	</bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -31,6 +31,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
 	</bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
 		<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -30,6 +30,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
 		<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleIfaceDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleIfaceDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorSimpleIfaceDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
    </bind>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -36,6 +36,7 @@
       <property name="binding"><inject bean="TestInterceptorBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
    </bind>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,6 +16,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -41,6 +41,7 @@
    </bean>
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,6 +16,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,7 +16,8 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -41,6 +41,7 @@
    </bean>
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,7 +16,8 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -19,6 +19,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -49,6 +49,7 @@
    </bean>
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -19,6 +19,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,6 +22,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -50,6 +50,7 @@
    </bean>
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,6 +22,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,6 +15,7 @@
 		<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -44,6 +44,7 @@
 
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,6 +15,7 @@
 		<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -23,14 +23,17 @@
    </bind>
    
    <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
    
    <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>
    
    <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyBeansTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -67,14 +67,17 @@
    </bean>
 
    <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
 
    <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>
 
    <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -23,14 +23,17 @@
    </bind>
    
    <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
    
    <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>
    
    <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -17,6 +17,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
    </bind>
    
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -51,6 +51,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -17,6 +17,7 @@
       <aop:interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
    </aop:bind>
    
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -29,6 +29,7 @@
 		<stack-ref name="TestStackB"/>
 	</bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -105,6 +105,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -29,6 +29,7 @@
 		<stack-ref name="TestStackB"/>
 	</bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -36,6 +36,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,7 @@
       <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,6 +22,7 @@
       <advice aspect="AspectB" name="advice"/>
    </bind>
 
-	<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+	<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -56,8 +56,9 @@
    	</property>
    </bean>
 
-	<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+	<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>
 
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,8 +22,9 @@
       <advice aspect="AspectB" name="advice"/>
    </bind>
 
-	<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+	<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>
 
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -20,6 +20,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
    </bind>
 	
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -61,6 +61,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -20,6 +20,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
    </bind>
 	
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -20,10 +20,13 @@
       <advice aspect="org.jboss.test.microcontainer.beans.PerClassJoinPointAspect" name="advice"/>
 	</bind>
    
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
-   
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -90,10 +90,13 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
-
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,10 +12,13 @@
       <advice aspect="org.jboss.test.microcontainer.beans.ScopedAspectFactory" name="advice"/>
    </bind>
    
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
-   
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassJoinpointAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassJoinpointAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerClassJoinpointAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,10 +12,16 @@
       <advice aspect="org.jboss.test.microcontainer.beans.ScopedAspectFactory" name="advice"/>
 	</bind>
    
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerInstanceAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerInstanceAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerInstanceAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,10 +12,13 @@
       <advice aspect="org.jboss.test.microcontainer.beans.ScopedAspectFactory" name="advice"/>
    </bind>
    
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
-   
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerJoinpointAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerJoinpointAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerJoinpointAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,10 +12,13 @@
       <advice aspect="org.jboss.test.microcontainer.beans.ScopedAspectFactory" name="advice"/>
    </bind>
    
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
-   
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerVmAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerVmAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/ScopedAspectFactoryPerVmAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,10 +12,13 @@
       <advice aspect="org.jboss.test.microcontainer.beans.ScopedAspectFactory" name="advice"/>
    </bind>
    
-   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
-   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2"/>
-   
+   <bean name="POJO1A" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   <bean name="POJO1B" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
+   <bean name="POJO2" class="org.jboss.test.microcontainer.beans.POJO2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -18,6 +18,7 @@
 		<stack-ref name="TestStack"/>
 	</bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -63,6 +63,7 @@
 
 
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -18,6 +18,7 @@
 		<stack-ref name="TestStack"/>
 	</bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -37,14 +37,17 @@
    </bind>
    
    <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
    
    <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>
    
    <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyBeansTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -128,14 +128,17 @@
    </bean>
 
    <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
 
    <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>
 
    <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -37,14 +37,17 @@
    </bind>
    
    <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    </bean>
    
    <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>
    
    <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
    	<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -21,6 +21,7 @@
       <stack-ref name="TestStack"/>
    </bind>
    
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyBeansTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -68,6 +68,7 @@
 
 
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -21,6 +21,7 @@
       <stack-ref name="TestStack"/>
    </bind>
    
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,5 +13,7 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefBeansTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -36,6 +36,7 @@
       <property name="binding"><inject bean="TestAspectBinding" state="Instantiated"/></property>
    </bean>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,5 +13,7 @@
 		<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
 	</bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -42,6 +42,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.XmlLoadableInterceptorFactory"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableDeploymentTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableDeploymentTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/beans/test/XmlLoadableDeploymentTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -42,6 +42,7 @@
       <interceptor-ref name="org.jboss.test.microcontainer.beans.XmlLoadableInterceptorFactory"/>
    </bind>
    
-   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
+   <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/AnnotationsInProxyTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/AnnotationsInProxyTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/AnnotationsInProxyTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -10,6 +10,7 @@
    </bind>
 
    <bean name="Bean" class="org.jboss.test.microcontainer.support.AnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Marker</annotation>
    </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,5 +12,7 @@
       <interceptor-ref name="InterceptedAdvice"/>
    </bind>
 
-   <bean name="Bean" class="org.jboss.test.microcontainer.support.BeanCallingMethodInCtor"/>
+   <bean name="Bean" class="org.jboss.test.microcontainer.support.BeanCallingMethodInCtor">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,7 @@
    </bind>
 
    <bean name="Bean" class="org.jboss.test.microcontainer.support.BeanNoDefaultCtorUsingParam">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <constructor>
          <parameter>Kabir was here</parameter>
       </constructor>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -20,6 +20,7 @@
    </bind>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCaseNotAutomatic.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCaseNotAutomatic.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCaseNotAutomatic.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -14,6 +14,8 @@
       <property name="state">Configured</property>
    </bean>
             
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,6 +16,7 @@
       <property name="state">Configured</property>
    </bean>
             
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -34,12 +34,15 @@
    </bind>
 
    <bean name="MainDeployer" class="org.jboss.test.microcontainer.support.deployers.SampleMainDeployer">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="deployers">
          <list>
             <bean name="SampleDeployer1" class="org.jboss.test.microcontainer.support.deployers.SampleDeployer">
+               <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
                <property name="type">aop</property>
             </bean>
             <bean name="SampleDeployer2" class="org.jboss.test.microcontainer.support.deployers.SampleDeployer">
+               <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
                <property name="type">beans</property>
             </bean>
          </list>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/DeployersInterceptedTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,12 +13,15 @@
    </bind>
 
    <bean name="MainDeployer" class="org.jboss.test.microcontainer.support.deployers.SampleMainDeployer">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="deployers">
          <list>
             <bean name="SampleDeployer1" class="org.jboss.test.microcontainer.support.deployers.SampleDeployer">
+               <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
                <property name="type">aop</property>
             </bean>
             <bean name="SampleDeployer2" class="org.jboss.test.microcontainer.support.deployers.SampleDeployer">
+               <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
                <property name="type">beans</property>
             </bean>
          </list>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/FieldAccessTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/FieldAccessTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/FieldAccessTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,14 +13,17 @@
 	</bind>
 
    <bean name="private" class="org.jboss.test.microcontainer.beans.support.AccessBean" access-mode="ALL">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="priString">foobar</property>
    </bean>
 
    <bean name="protected" class="org.jboss.test.microcontainer.beans.support.AccessBean" access-mode="ALL">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="protString">foobar</property>
    </bean>
 
    <bean name="public" class="org.jboss.test.microcontainer.beans.support.AccessBean" access-mode="ALL">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="pubString">foobar</property>
    </bean>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
 		<property name="testProperty">Test123</property>               
    </lifecycle-configure>
             
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,8 @@
       <property name="dependency"><inject bean="Dependency"/></property>
    </lifecycle-configure>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
    
 </aop>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -13,6 +13,7 @@
       <property name="dependency"><inject bean="Dependency"/></property>
    </lifecycle-configure>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptedTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptedTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptedTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -12,6 +12,7 @@
       <interceptor-ref name="InterceptedAdvice"/>
    </bind>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,13 +15,17 @@
    </bind>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency")</annotation>
    </bean>
 
-   <bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.AnnotatedSimpleBeanImpl"/>
-
+   <bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.AnnotatedSimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
+   
    <bean name="MethodIntercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
 	   <!-- no way to annotate methods via xml yet, so let us do a property  -->
       <property name="property">10
@@ -29,5 +33,7 @@
 	   </property>
    </bean>
 
-   <bean name="MethodAnnotatedIntercepted" class="org.jboss.test.microcontainer.support.MethodAnnotatedSimpleBeanImpl"/>
+   <bean name="MethodAnnotatedIntercepted" class="org.jboss.test.microcontainer.support.MethodAnnotatedSimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,6 +15,7 @@
    </bind>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,11 +15,13 @@
    </bind>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Containing(dependency=@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1"), contained=@org.jboss.test.microcontainer.support.Contained(dependencies= {@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2"), @org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency3")}))</annotation>
    </bean>
 
    <bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedAnnotatedSimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
-   </deployment>
+</deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,11 +15,13 @@
    </bind>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Containing(dependency=@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1"), contained=@org.jboss.test.microcontainer.support.Contained(dependencies= {@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2"), @org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency3")}))</annotation>
    </bean>
 
    <bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedMethodAnnotatedSimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
-   </deployment>
+</deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,10 +15,13 @@
    </bind>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.OverriddenAnnotationSimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency")</annotation>
    </bean>
 
-   <bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.OverriddenAnnotationSimpleBeanImpl"/>
+   <bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.OverriddenAnnotationSimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,9 +15,11 @@
    </bind>
 
    <bean name="NotDeployable" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    </bean>
 
    <bean name="NotDeployable1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
          <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
@@ -25,6 +27,7 @@
    </bean>
 
    <bean name="NotDeployable2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyB">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
          <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
@@ -32,6 +35,7 @@
    </bean>
 
    <bean name="Depends1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
@@ -44,6 +48,7 @@
    </bean>
 
    <bean name="Depends2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
@@ -56,6 +61,7 @@
    </bean>
 
    <bean name="Depends1And2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,9 +15,11 @@
    </bind>
 
    <bean name="NotDeployable" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
    </bean>
 
    <bean name="NotDeployable1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
 	      <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
@@ -25,6 +27,7 @@
    </bean>
 
    <bean name="NotDeployable2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyB">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
 	      <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
@@ -32,6 +35,7 @@
    </bean>
 
    <bean name="Depends1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
 	      <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
@@ -43,6 +47,7 @@
    </bean>
 
    <bean name="Depends2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
 	      <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
@@ -54,6 +59,7 @@
    </bean>
 
    <bean name="Depends1And2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="propertyA">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
          <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -19,9 +19,12 @@
    </introduction>
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
 
-   <bean name="Plain" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
+   <bean name="Plain" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecorated-flawed.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecorated-flawed.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecorated-flawed.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -6,6 +6,7 @@
         so we don't include it in the main deployment file that gets validated -->
    
    <bean name="FlawedRegistrant" class="org.jboss.test.microcontainer.support.JmxRegistrantImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:name=FlawedRegistrant", exposedInterface=org.jboss.test.microcontainer.support.JmxRegistrant.class,registerDirectly=true)</annotation>
    </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -31,22 +31,30 @@
    </bind>
 
    <bean name="Bean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="", exposedInterface=org.jboss.test.microcontainer.support.SimpleBean.class)</annotation>
    </bean>
 
    <bean name="Bean1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:name=NotBean1", exposedInterface=org.jboss.test.microcontainer.support.SimpleBeanImplMBean.class)</annotation>
    </bean>
 
-   <bean name="AnnotatedBean" class="org.jboss.test.microcontainer.support.SimpleBeanAnnotatedImpl"/>
+   <bean name="AnnotatedBean" class="org.jboss.test.microcontainer.support.SimpleBeanAnnotatedImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 
-   <bean name="AnnotatedBean2" class="org.jboss.test.microcontainer.support.SimpleBeanAnnotatedImpl2"/>
+   <bean name="AnnotatedBean2" class="org.jboss.test.microcontainer.support.SimpleBeanAnnotatedImpl2">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 
    <bean name="DirectRegistrant" class="org.jboss.test.microcontainer.support.JmxRegistrantDirect">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:name=DirectRegistrant", exposedInterface=org.jboss.test.microcontainer.support.JmxRegistrantDirectMBean.class,registerDirectly=true)</annotation>
    </bean>
 
    <bean name="NotDirectRegistrant" class="org.jboss.test.microcontainer.support.JmxRegistrantDirect">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:name=NotDirectRegistrant", exposedInterface=org.jboss.test.microcontainer.support.JmxRegistrantDirectMBean.class,registerDirectly=false)</annotation>
    </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -24,11 +24,13 @@
    
 
    <bean name="Bean" class="org.jboss.test.microcontainer.support.jndi.SimpleBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="beans/SimpleBean0", aliases={"beans/XmlAnnotatedSimpleBean0"})</annotation>
       <property name="prop1">bean0.prop1</property>
    </bean>
 
    <bean name="AnnotatedBean" class="org.jboss.test.microcontainer.support.jndi.SimpleBeanAnnotatedImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="prop1">bean1.prop1</property>
    </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MetaDataTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MetaDataTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MetaDataTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -15,12 +15,14 @@
    </bind>
 
    <bean name="Bean" class="org.jboss.test.microcontainer.support.PropertyBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
       <property name="intProperty">5</property>
       <property name="stringProperty">Bean</property>
    </bean>
 
    <bean name="Bean1" class="org.jboss.test.microcontainer.support.PropertyBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="intProperty">10
          <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
 	   </property>
@@ -28,6 +30,7 @@
    </bean>
 
    <bean name="NoMetaDataBean" class="org.jboss.test.microcontainer.support.PropertyBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <property name="intProperty">50</property>
       <property name="stringProperty">NoMetaDataBean</property>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MixinTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MixinTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/MixinTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -22,8 +22,11 @@
    </introduction>
 
    <bean name="Bean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
 
-   <bean name="Bean1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
+   <bean name="Bean1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/ScopingAopTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -41,11 +41,13 @@
    </bean>
 
    <bean name="simple1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.metadata.plugins.scope.ApplicationScope("testApp")</annotation>
       <annotation>@org.jboss.metadata.plugins.scope.DeploymentScope("deployment1")</annotation>
    </bean>
 
    <bean name="simple2" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.metadata.plugins.scope.ApplicationScope("testApp")</annotation>
       <annotation>@org.jboss.metadata.plugins.scope.DeploymentScope("deployment2")</annotation>
    </bean>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/SimpleAspectTestCase.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/SimpleAspectTestCase.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/SimpleAspectTestCase.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -16,6 +16,7 @@
       <advice aspect="InterceptedAdvice" name="bar"/>
    </bind>
 
-   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-   
+   <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>   
 </deployment>

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -3,6 +3,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
 

Modified: projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml	2010-01-04 12:06:37 UTC (rev 98980)
+++ projects/kernel/branches/disableaop/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml	2010-01-04 12:10:31 UTC (rev 98981)
@@ -3,6 +3,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
    <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
    </bean>
 


