[jboss-cvs] JBossAS SVN: r71050 - in projects/microcontainer/trunk/aop-mc-int: src/main/org/jboss/aop/microcontainer/beans/metadata and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 20 08:19:46 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-20 08:19:45 -0400 (Thu, 20 Mar 2008)
New Revision: 71050
Added:
projects/microcontainer/trunk/aop-mc-int/aop-mc-int-srx.zip
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationIntroductionBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationOverrideBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ConfigureLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CreateLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DescribeLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstallLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstantiateLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/NamedPointcutBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PreInstallLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrepareMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StartLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCaseNotAutomatic.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCaseNotAutomatic.xml
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempJBossEntityResolver.java.bak
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempXMLDeployer.bak
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeployemtDifferentOrderTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentDifferentOrderTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentDifferentOrderTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentDifferentOrderTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTest.java
Removed:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerUtil.java
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleTestCaseNotAutomatic.xml
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java
Modified:
projects/microcontainer/trunk/aop-mc-int/.classpath
projects/microcontainer/trunk/aop-mc-int/.project
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java
projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareAopTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java
Log:
[JBAOP-468] Add more BeanMetaDataFactories and rework tests
Modified: projects/microcontainer/trunk/aop-mc-int/.classpath
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/.classpath 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/.classpath 2008-03-20 12:19:45 UTC (rev 71050)
@@ -5,10 +5,30 @@
<classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
<classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="src" path="/jboss-kernel"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar" sourcepath="/M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3-sources.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.7.1.GA/javassist-3.7.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR8/jboss-aop-2.0.0.CR8.jar" sourcepath="/M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR8/jboss-aop-2.0.0.CR8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.Beta11/jboss-managed-2.0.0.Beta11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.Beta11/jboss-metatype-2.0.0.Beta11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0-SNAPSHOT/jboss-reflect-2.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.4-SNAPSHOT/jboss-common-core-2.2.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.4-SNAPSHOT/jboss-common-core-2.2.4-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="src" path="/jboss-kernel"/>
+ <classpathentry kind="src" path="/jboss-dependency"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta11/jboss-mdr-2.0.0.Beta11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossxb-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossxb-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/microcontainer/trunk/aop-mc-int/.project
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/.project 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/.project 2008-03-20 12:19:45 UTC (rev 71050)
@@ -2,11 +2,8 @@
<name>jboss-aop-mc-int</name>
<comment>JBoss Microcontainer</comment>
<projects>
- <project>jboss-container</project>
- <project>jboss-dependency</project>
<project>jboss-kernel</project>
- <project>jboss-managed</project>
- <project>jboss-metatype</project>
+ <project>jboss-dependency</project>
</projects>
<buildSpec>
<buildCommand>
Added: projects/microcontainer/trunk/aop-mc-int/aop-mc-int-srx.zip
===================================================================
(Binary files differ)
Property changes on: projects/microcontainer/trunk/aop-mc-int/aop-mc-int-srx.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AOPDeployment.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -52,12 +52,29 @@
@XmlElements
({
+ @XmlElement(name="annotation", type=AnnotationOverrideBeanMetaDataFactory.class),
+ @XmlElement(name="annotation-introduction", type=AnnotationIntroductionBeanMetaDataFactory.class),
+ @XmlElement(name="arrayreplacement", type=ArrayReplacementBeanMetaDataFactory.class),
+ @XmlElement(name="arraybind", type=ArrayBindBeanMetaDataFactory.class),
@XmlElement(name="aspect", type=AspectBeanMetaDataFactory.class),
+ @XmlElement(name="bind", type=BindBeanMetaDataFactory.class),
+ @XmlElement(name="cflow-stack", type=CFlowStackBeanMetaDataFactory.class),
+ @XmlElement(name="dynamic-cflow", type=DynamicCflowBeanMetaDataFactory.class),
+ @XmlElement(name="domain", type=DomainBeanMetaDataFactory.class),
@XmlElement(name="interceptor", type=InterceptorBeanMetaDataFactory.class),
- @XmlElement(name="bind", type=BindBeanMetaDataFactory.class),
+ @XmlElement(name="introduction", type=IntroductionBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-configure", type=ConfigureLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-create", type=CreateLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-describe", type=DescribeLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-install", type=InstallLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-instantiate", type=InstantiateLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-preinstall", type=PreInstallLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-start", type=StartLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="pointcut", type=NamedPointcutBeanMetaDataFactory.class),
+ @XmlElement(name="precedence", type=PrecedenceBeanMetaDataFactory.class),
+ @XmlElement(name="prepare", type=PrepareMetaDataFactory.class),
@XmlElement(name="stack", type=StackBeanMetaDataFactory.class),
- @XmlElement(name="typedef", type=TypeDefBeanMetaDataFactory.class),
- @XmlElement(name="cflow-stack", type=CFlowStackBeanMetaDataFactory.class)
+ @XmlElement(name="typedef", type=TypeDefBeanMetaDataFactory.class)
})
@XmlAnyElement
public void setBeanFactories(List<BeanMetaDataFactory> beanFactories)
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractAnnotationBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,101 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlValue;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.util.id.GUID;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class AbstractAnnotationBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ String expr;
+
+ boolean invisible;
+
+ String annotation;
+
+ public String getExpr()
+ {
+ return expr;
+ }
+
+ @XmlAttribute
+ public void setExpr(String expr)
+ {
+ this.expr = expr;
+ }
+
+ public boolean isInvisible()
+ {
+ return invisible;
+ }
+
+ @XmlAttribute
+ public void setInvisible(boolean invisible)
+ {
+ this.invisible = invisible;
+ }
+
+ public String getAnnotation()
+ {
+ return annotation;
+ }
+
+ @XmlValue
+ public void setAnnotation(String annotation)
+ {
+ this.annotation = annotation;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(GUID.asString(), getBeanClassName());
+ builder.addPropertyMetaData("invisible", invisible);
+ builder.addPropertyMetaData("expr", expr);
+ builder.addPropertyMetaData("annotation", annotation);
+
+ setAspectManagerProperty(builder);
+
+ result.add(builder.getBeanMetaData());
+
+ return result;
+ }
+
+
+ protected abstract String getBeanClassName();
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AbstractPointcutBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.util.id.GUID;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class AbstractPointcutBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+ String expr;
+
+ public String getExpr()
+ {
+ return expr;
+ }
+
+ @XmlAttribute
+ public void setExpr(String expr)
+ {
+ this.expr = expr;
+ }
+
+ protected abstract String getBeanClass();
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
+
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, getBeanClass());
+ builder.addPropertyMetaData("name", name);
+ builder.addPropertyMetaData("expr", expr);
+ setAspectManagerProperty(builder);
+
+ result.add(builder.getBeanMetaData());
+
+ return result;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationIntroductionBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationIntroductionBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationIntroductionBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.AnnotationIntroduction;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="annotation-introduction")
+public class AnnotationIntroductionBeanMetaDataFactory extends AbstractAnnotationBeanMetaDataFactory
+{
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getBeanClassName()
+ {
+ return AnnotationIntroduction.class.getName();
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationOverrideBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationOverrideBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AnnotationOverrideBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.AnnotationOverride;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="annotation")
+public class AnnotationOverrideBeanMetaDataFactory extends AbstractAnnotationBeanMetaDataFactory
+{
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getBeanClassName()
+ {
+ return AnnotationOverride.class.getName();
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayBindBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,141 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.ArrayBinding;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.util.id.GUID;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="arraybind")
+public class ArrayBindBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+
+ private static final long serialVersionUID = 1L;
+
+ String type;
+
+ private List<BaseInterceptorData> interceptors = new ArrayList<BaseInterceptorData>();
+
+ public ArrayBindBeanMetaDataFactory()
+ {
+ }
+
+ @XmlAttribute
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ //Create AspectBinding
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
+ BeanMetaDataBuilder bindingBuilder = BeanMetaDataBuilder.createBuilder(name, ArrayBinding.class.getName());
+ bindingBuilder.addPropertyMetaData("name", name);
+ bindingBuilder.addPropertyMetaData("type", type);
+ setAspectManagerProperty(bindingBuilder);
+ result.add(bindingBuilder.getBeanMetaData());
+
+
+ if (interceptors.size() > 0)
+ {
+ List<ValueMetaData> bindingInterceptors = bindingBuilder.createList();
+ int i = 0;
+ for (BaseInterceptorData interceptor : interceptors)
+ {
+ String intName = name + "$" + i++;
+ BeanMetaDataBuilder interceptorBuilder = BeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
+ setAspectManagerProperty(interceptorBuilder);
+ ValueMetaData injectBinding = interceptorBuilder.createInject(name, null, null, ControllerState.INSTANTIATED);
+ interceptorBuilder.addPropertyMetaData("binding", injectBinding);
+
+ if (interceptor instanceof AdviceOrInterceptorData)
+ {
+ ValueMetaData injectAspect = interceptorBuilder.createInject(interceptor.getRefName());
+ interceptorBuilder.addPropertyMetaData("aspect", injectAspect);
+ if (((AdviceOrInterceptorData)interceptor).getAdviceMethod() != null)
+ {
+ interceptorBuilder.addPropertyMetaData("aspectMethod", ((AdviceOrInterceptorData)interceptor).getAdviceMethod());
+ }
+ interceptorBuilder.addPropertyMetaData("type", ((AdviceOrInterceptorData)interceptor).getType());
+ }
+ else
+ {
+ ValueMetaData injectStack = interceptorBuilder.createInject(interceptor.getRefName());
+ interceptorBuilder.addPropertyMetaData("stack", injectStack);
+ }
+ result.add(interceptorBuilder.getBeanMetaData());
+ ValueMetaData injectInterceptor = bindingBuilder.createInject(intName);
+ bindingInterceptors.add(injectInterceptor);
+ }
+ bindingBuilder.addPropertyMetaData("advices", bindingInterceptors);
+ }
+
+ return result;
+ }
+
+ @XmlElements
+ ({
+ @XmlElement(name="advice", type=AdviceData.class),
+ @XmlElement(name="around", type=AdviceData.class),
+ @XmlElement(name="before", type=BeforeAdviceData.class),
+ @XmlElement(name="after", type=AfterAdviceData.class),
+ @XmlElement(name="throwing", type=ThrowingAdviceData.class),
+ @XmlElement(name="finally", type=FinallyAdviceData.class),
+ @XmlElement(name="interceptor-ref", type=InterceptorRefData.class),
+ @XmlElement(name="stack-ref", type=StackRefData.class)
+ })
+ public List<BaseInterceptorData> getInterceptors()
+ {
+ return interceptors;
+ }
+
+ public void setInterceptors(List<BaseInterceptorData> interceptors)
+ {
+ this.interceptors = interceptors;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ArrayReplacementBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,96 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.ArrayReplacement;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.util.id.GUID;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="arrayreplacement")
+public class ArrayReplacementBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+
+ private static final long serialVersionUID = 1L;
+
+ String expr;
+
+ String clazz;
+
+ public String getExpr()
+ {
+ return expr;
+ }
+
+ @XmlAttribute
+ public void setExpr(String expr)
+ {
+ this.expr = expr;
+ }
+
+ public String getClazz()
+ {
+ return clazz;
+ }
+
+ @XmlAttribute(name="class")
+ public void setClazz(String clazz)
+ {
+ this.clazz = clazz;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> beans = new ArrayList<BeanMetaData>();
+
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
+
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, ArrayReplacement.class.getName());
+ builder.addPropertyMetaData("name", name);
+ builder.addPropertyMetaData("classes", clazz);
+ builder.addPropertyMetaData("expr", expr);
+ setAspectManagerProperty(builder);
+
+ beans.add(builder.getBeanMetaData());
+
+ return beans;
+ }
+
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -28,7 +28,6 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.jboss.aop.microcontainer.beans.Aspect;
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
@@ -47,7 +46,6 @@
*/
@JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
@XmlRootElement(name="aspect")
- at XmlType(propOrder={"aliases", "annotations", "classLoader", "constructor", "properties", "create", "start", "depends", "demands", "supplies", "installs", "uninstalls"})
public class AspectBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
implements BeanMetaDataFactory
{
@@ -129,7 +127,7 @@
//Add the Aspect
BeanMetaDataBuilder aspectBuilder = BeanMetaDataBuilder.createBuilder(aspectName, Aspect.class.getName());
aspectBuilder.addPropertyMetaData("scope", scope);
- util.setAspectManagerProperty(aspectBuilder, "manager");
+ setAspectManagerProperty(aspectBuilder);
if (this.factory != null)
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerAwareBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -23,6 +23,8 @@
import javax.xml.bind.annotation.XmlAttribute;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
/**
@@ -30,31 +32,57 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public class AspectManagerAwareBeanMetaDataFactory extends GenericBeanFactoryMetaData
+public abstract class AspectManagerAwareBeanMetaDataFactory extends GenericBeanFactoryMetaData
{
- private static final long serialVersionUID = 1L;
+ /** Unless specified use the bean with this name as the aspect manager */
+ protected final static String DEFAULT_ASPECT_MANAGER = "AspectManager";
+
+ /** The bean name of the aspect manager to use */
+ protected String managerBean = DEFAULT_ASPECT_MANAGER;
- protected AspectManagerUtil util = new AspectManagerUtil();
+ /** The property of the aspect manager bean, if any, containing the aspect manager */
+ protected String managerProperty;
@XmlAttribute(name="manager-bean")
public void setManagerBean(String managerBean)
{
- util.setManagerBean(managerBean);
+ this.managerBean = managerBean;
}
-
+
public String getManagerBean()
{
- return util.getManagerBean();
+ return managerBean;
}
@XmlAttribute(name="manager-property")
public void setManagerProperty(String aspectManagerProperty)
{
- util.setManagerProperty(aspectManagerProperty);
+ this.managerProperty = aspectManagerProperty;
}
public String getManagerProperty()
{
- return util.getManagerProperty();
+ return managerProperty;
}
+
+ protected void setAspectManagerProperty(BeanMetaDataBuilder builder)
+ {
+ setAspectManagerProperty(builder, "manager");
+ }
+
+ protected void setAspectManagerProperty(BeanMetaDataBuilder builder, String propertyName)
+ {
+ setAspectManagerProperty(builder, propertyName, managerBean, managerProperty);
+ }
+
+ protected void setAspectManagerProperty(BeanMetaDataBuilder builder, String managerBean, String managerProperty)
+ {
+ setAspectManagerProperty(builder, "manager", managerBean, managerProperty);
+ }
+
+ protected void setAspectManagerProperty(BeanMetaDataBuilder builder, String propertyName, String managerBean, String managerProperty)
+ {
+ ValueMetaData value = builder.createInject(managerBean, managerProperty);
+ builder.addPropertyMetaData(propertyName, value);
+ }
}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerUtil.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerUtil.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/AspectManagerUtil.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,74 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.microcontainer.beans.metadata;
-
-
-import java.io.Serializable;
-
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class AspectManagerUtil implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- /** Unless specified use the bean with this name as the aspect manager */
- protected final static String DEFAULT_ASPECT_MANAGER = "AspectManager";
-
- /** The bean name of the aspect manager to use */
- protected String managerBean = DEFAULT_ASPECT_MANAGER;
-
- /** The property of the aspect manager bean, if any, containing the aspect manager */
- protected String managerProperty;
-
-
- public String getManagerBean()
- {
- return managerBean;
- }
-
- public void setManagerBean(String managerBean)
- {
- this.managerBean = managerBean;
- }
-
- public String getManagerProperty()
- {
- return managerProperty;
- }
-
- public void setManagerProperty(String aspectManagerProperty)
- {
- this.managerProperty = aspectManagerProperty;
- }
-
- public void setAspectManagerProperty(BeanMetaDataBuilder builder, String propertyName)
- {
- ValueMetaData value = builder.createInject(managerBean, managerProperty);
- builder.addPropertyMetaData(propertyName, value);
- }
-}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/BindBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -85,7 +85,7 @@
bindingBuilder.addPropertyMetaData("cflow", cflow);
}
bindingBuilder.addPropertyMetaData("pointcut", pointcut);
- util.setAspectManagerProperty(bindingBuilder, "manager");
+ setAspectManagerProperty(bindingBuilder);
result.add(bindingBuilder.getBeanMetaData());
if (interceptors.size() > 0)
@@ -96,7 +96,7 @@
{
String intName = name + "$" + i++;
BeanMetaDataBuilder interceptorBuilder = BeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
- util.setAspectManagerProperty(interceptorBuilder, "manager");
+ setAspectManagerProperty(interceptorBuilder);
ValueMetaData injectBinding = interceptorBuilder.createInject(name, null, null, ControllerState.INSTANTIATED);
interceptorBuilder.addPropertyMetaData("binding", injectBinding);
@@ -125,12 +125,6 @@
return result;
}
- public void addInterceptor(BaseInterceptorData interceptorData)
- {
- interceptors.add(interceptorData);
- }
-
-
@XmlElements
({
@XmlElement(name="advice", type=AdviceData.class),
@@ -151,6 +145,4 @@
{
this.interceptors = interceptors;
}
-
-
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CFlowStackBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -64,7 +64,7 @@
//Add the Aspect
BeanMetaDataBuilder cflowStackBuilder = BeanMetaDataBuilder.createBuilder(getName(), CFlowStack.class.getName());
cflowStackBuilder.addPropertyMetaData("name", getName());
- util.setAspectManagerProperty(cflowStackBuilder, "manager");
+ setAspectManagerProperty(cflowStackBuilder);
result.add(cflowStackBuilder.getBeanMetaData());
List<ValueMetaData> entryList = cflowStackBuilder.createList(null, ArrayList.class.getName());
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ConfigureLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ConfigureLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/ConfigureLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-configure")
+ at XmlType(propOrder={"aliases", "annotations", "classLoader", "constructor", "properties", "create", "start", "depends", "demands", "supplies", "installs", "uninstalls"})
+public class ConfigureLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.CONFIGURED;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CreateLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CreateLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/CreateLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-create")
+public class CreateLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.CREATE;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DescribeLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DescribeLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DescribeLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-describe")
+public class DescribeLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.DESCRIBED;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DomainBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,169 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+import org.jboss.aop.microcontainer.beans.AOPDomain;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="domain")
+//Use the same propOrder as the GenericBeanMetaDataFactory, but remove the annotations part since we don't want that to be handled by the super class
+ at XmlType(name="domainType", propOrder={"aliases", "classLoader", "constructor", "properties", "create", "start", "depends", "demands", "supplies", "installs", "uninstalls", "installCallbacks", "uninstallCallbacks"})
+public class DomainBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+ String parentFirst;
+ String inheritDefinitions;
+ String inheritBindings;
+ String extendz;
+
+ List<BeanMetaDataFactory> childBeans;
+
+ public DomainBeanMetaDataFactory()
+ {
+ }
+
+ public void setParentFirst(String parentFirst)
+ {
+ this.parentFirst = parentFirst;
+ }
+
+ public void setInheritDefinitions(String inheritDefinitions)
+ {
+ this.inheritDefinitions = inheritDefinitions;
+ }
+
+ public void setInheritBindings(String inheritBindings)
+ {
+ this.inheritBindings = inheritBindings;
+ }
+
+ public void setExtends(String extendz)
+ {
+ this.extendz = extendz;
+ }
+
+ @XmlElements
+ ({
+ @XmlElement(name="annotation", type=AnnotationOverrideBeanMetaDataFactory.class),
+ @XmlElement(name="annotation-introduction", type=AnnotationIntroductionBeanMetaDataFactory.class),
+ @XmlElement(name="arrayreplacement", type=ArrayReplacementBeanMetaDataFactory.class),
+ @XmlElement(name="arraybind", type=ArrayBindBeanMetaDataFactory.class),
+ @XmlElement(name="aspect", type=AspectBeanMetaDataFactory.class),
+ @XmlElement(name="bind", type=BindBeanMetaDataFactory.class),
+ @XmlElement(name="dynamic-cflow", type=DynamicCflowBeanMetaDataFactory.class),
+ @XmlElement(name="cflow-stack", type=CFlowStackBeanMetaDataFactory.class),
+ @XmlElement(name="interceptor", type=InterceptorBeanMetaDataFactory.class),
+ @XmlElement(name="introduction", type=IntroductionBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-configure", type=ConfigureLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-create", type=CreateLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-describe", type=DescribeLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-install", type=InstallLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-instantiate", type=InstantiateLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-preinstall", type=PreInstallLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="lifecycle-start", type=StartLifecycleBeanMetaDataFactory.class),
+ @XmlElement(name="pointcut", type=NamedPointcutBeanMetaDataFactory.class),
+ @XmlElement(name="precedence", type=PrecedenceBeanMetaDataFactory.class),
+ @XmlElement(name="prepare", type=PrepareMetaDataFactory.class),
+ @XmlElement(name="stack", type=StackBeanMetaDataFactory.class),
+ @XmlElement(name="typedef", type=TypeDefBeanMetaDataFactory.class)
+ })
+ @XmlAnyElement
+ public void setChildren(List<BeanMetaDataFactory> childBeans)
+ {
+ this.childBeans = childBeans;
+ }
+
+ public List<BeanMetaDataFactory> getChildren()
+ {
+ return childBeans;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ BeanMetaDataBuilder domainBuilder = BeanMetaDataBuilder.createBuilder(getName(), AOPDomain.class.getName());
+ domainBuilder.addPropertyMetaData("name", getName());
+
+ if (parentFirst != null)
+ {
+ domainBuilder.addPropertyMetaData("parentFirst", parentFirst);
+ }
+ if (inheritDefinitions != null)
+ {
+ domainBuilder.addPropertyMetaData("inheritDefinitions", inheritDefinitions);
+ }
+ if (inheritBindings != null)
+ {
+ domainBuilder.addPropertyMetaData("inheritBindings", inheritBindings);
+ }
+ if (extendz != null)
+ {
+ domainBuilder.addPropertyMetaData("extends", extendz);
+ }
+ setAspectManagerProperty(domainBuilder);
+ result.add(domainBuilder.getBeanMetaData());
+
+ if (childBeans != null && childBeans.size() > 0)
+ {
+ for (BeanMetaDataFactory child : childBeans)
+ {
+ if (child instanceof AspectManagerAwareBeanMetaDataFactory)
+ {
+ //Set this domain as the manager of the child beans
+ AspectManagerAwareBeanMetaDataFactory amChild = (AspectManagerAwareBeanMetaDataFactory)child;
+ amChild.setManagerBean(name);
+ amChild.setManagerProperty("domain");
+ amChild.setAspectManagerProperty(BeanMetaDataBuilder.createBuilder(bean));
+ }
+ List<BeanMetaData> childResult = child.getBeans();
+ if (childResult != null && childBeans.size() > 0)
+ {
+ result.addAll(childResult);
+ }
+ }
+ }
+
+ return result;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/DynamicCflowBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,75 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.DynamicCFlowDef;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="dynamic-cflow")
+public class DynamicCflowBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ String clazz;
+
+ public String getClazz()
+ {
+ return clazz;
+ }
+
+ @XmlAttribute(name="class")
+ public void setClazz(String clazz)
+ {
+ this.clazz = clazz;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, DynamicCFlowDef.class.getName());
+ builder.addPropertyMetaData("name", name);
+ builder.addPropertyMetaData("className", clazz);
+ setAspectManagerProperty(builder);
+
+ result.add(builder.getBeanMetaData());
+
+ return result;
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstallLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstallLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstallLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-install")
+public class InstallLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.INSTALLED;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstantiateLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstantiateLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/InstantiateLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-instantiate")
+public class InstantiateLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.INSTANTIATED;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/IntroductionBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,186 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.IntroductionBinding;
+import org.jboss.aop.microcontainer.beans.MixinEntry;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.util.id.GUID;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * AspectBeanMetaDataFactory.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 61194 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="introduction")
+public class IntroductionBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+ implements BeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ private String clazz;
+ private String expr;
+ private String interfaces;
+ private ArrayList<MixinData> mixins = new ArrayList<MixinData>();
+
+ public IntroductionBeanMetaDataFactory()
+ {
+ }
+
+ public String getClazz()
+ {
+ return clazz;
+ }
+
+ @XmlAttribute(name="class")
+ public void setClazz(String clazz)
+ {
+ this.clazz = clazz;
+ }
+
+ public String getExpr()
+ {
+ return expr;
+ }
+
+ @XmlAttribute(name="expr")
+ public void setExpr(String expr)
+ {
+ this.expr = expr;
+ }
+
+
+ public String getInterfaces()
+ {
+ return interfaces;
+ }
+
+ public void setInterfaces(String interfaces)
+ {
+ this.interfaces = interfaces;
+ }
+
+ public ArrayList<MixinData> getMixins()
+ {
+ return mixins;
+ }
+
+ @XmlElement(name="mixin")
+ public void setMixins(ArrayList<MixinData> mixins)
+ {
+ this.mixins = mixins;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ //Add the Introduction
+ String name = getName();
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
+
+ BeanMetaDataBuilder introductionBuilder = BeanMetaDataBuilder.createBuilder(name, IntroductionBinding.class.getName());
+ introductionBuilder.addPropertyMetaData("name", name);
+ setAspectManagerProperty(introductionBuilder);
+ if (clazz != null)
+ {
+ introductionBuilder.addPropertyMetaData("classes", clazz);
+ }
+ if (expr != null)
+ {
+ introductionBuilder.addPropertyMetaData("expr", expr);
+ }
+
+ result.add(introductionBuilder.getBeanMetaData());
+
+ if (interfaces != null)
+ {
+ addInterfaces(introductionBuilder, interfaces);
+ }
+ if (mixins != null)
+ {
+ addMixins(introductionBuilder, result);
+ }
+
+ return result;
+ }
+
+ public static void addInterfaces(BeanMetaDataBuilder introductionBuilder, String interfaces)
+ {
+ addInterfaces(introductionBuilder, "interfaces", interfaces);
+ }
+
+ public static void addInterfaces(BeanMetaDataBuilder introductionBuilder, String propertyName, String interfaces)
+ {
+ List<ValueMetaData> ifs = introductionBuilder.createList(ArrayList.class.getName(), String.class.getName());
+ introductionBuilder.addPropertyMetaData(propertyName, ifs);
+ for (String token : interfaces.split(","))
+ {
+ ifs.add(introductionBuilder.createValue(token.trim()));
+ }
+ }
+
+ private void addMixins(BeanMetaDataBuilder introductionBuilder, List<BeanMetaData> result)
+ {
+ List<ValueMetaData> mixinList = introductionBuilder.createList(ArrayList.class.getName(), null);
+ introductionBuilder.addPropertyMetaData("mixins", mixinList);
+ int i = 0;
+ for (MixinData mixin : mixins)
+ {
+ String name = introductionBuilder.getBeanMetaData().getName() + "$" + i++;
+ BeanMetaDataBuilder mixinBuilder = BeanMetaDataBuilder.createBuilder(name, MixinEntry.class.getName());
+ mixinBuilder.addPropertyMetaData("mixin", mixin.getMixin());
+ addInterfaces(mixinBuilder, "interfaces", mixin.getInterfaces());
+ if (mixin.getTransient() != null)
+ {
+ mixinBuilder.addPropertyMetaData("transient", mixin.getTransient());
+ }
+ if (mixin.getConstruction() != null)
+ {
+ mixinBuilder.addPropertyMetaData("construction", mixin.getConstruction());
+ }
+
+ result.add(mixinBuilder.getBeanMetaData());
+
+ ValueMetaData injectMixin = introductionBuilder.createInject(name);
+ mixinList.add(injectMixin);
+ }
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,126 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import org.jboss.aop.microcontainer.beans.LifecycleBinding;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerState;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class LifecycleBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+ implements BeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ private String classes;
+ private String expr;
+ private String installMethod;
+ private String uninstallMethod;
+
+ @XmlAttribute
+ public void setClasses(String classes)
+ {
+ this.classes = classes;
+ }
+
+ @XmlAttribute
+ public void setExpr(String classes)
+ {
+ this.expr = classes;
+ }
+
+ @XmlAttribute
+ public void setInstallMethod(String installMethod)
+ {
+ this.installMethod = installMethod;
+ }
+
+ @XmlAttribute
+ public void setUninstallMethod(String uninstallMethod)
+ {
+ this.uninstallMethod = uninstallMethod;
+ }
+
+ protected abstract ControllerState getState();
+
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ //Do not include the bean factory here, just install the bean directly and the binding
+ BeanMetaDataBuilder lifecycleBuilder = BeanMetaDataBuilder.createBuilder(name, getBean());
+ for (PropertyMetaData pmd : properties)
+ {
+ lifecycleBuilder.addPropertyMetaData(pmd.getName(), pmd.getValue());
+ }
+ Set<DependencyMetaData> depends = getDepends();
+ if (depends != null)
+ {
+ for (DependencyMetaData depend : depends)
+ {
+ lifecycleBuilder.addDependency(depend.getDependency());
+ }
+ }
+
+ result.add(lifecycleBuilder.getBeanMetaData());
+
+
+ String aspectBindingName = name + "$AspectBinding";
+ BeanMetaDataBuilder bindingBuilder = BeanMetaDataBuilder.createBuilder(aspectBindingName, LifecycleBinding.class.getName());
+ bindingBuilder.addPropertyMetaData("callbackBean", name);
+ setAspectManagerProperty(bindingBuilder);
+ if (expr != null)
+ {
+ bindingBuilder.addPropertyMetaData("expr", expr);
+ }
+ else if (classes != null)
+ {
+ bindingBuilder.addPropertyMetaData("classes", classes);
+ }
+ bindingBuilder.addPropertyMetaData("state", getState());
+ if (installMethod != null)
+ {
+ bindingBuilder.addPropertyMetaData("installMethod", installMethod);
+ }
+ if (uninstallMethod != null)
+ {
+ bindingBuilder.addPropertyMetaData("uninstallMethod", uninstallMethod);
+ }
+ result.add(bindingBuilder.getBeanMetaData());
+
+ return result;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/MixinData.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,78 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MixinData
+{
+ String mixin;
+ String isTransient;
+ String construction;
+ String interfaces;
+
+ public String getTransient()
+ {
+ return isTransient;
+ }
+
+ public void setTransient(String isTransient)
+ {
+ this.isTransient = isTransient;
+ }
+
+ public String getMixin()
+ {
+ return mixin;
+ }
+
+ @XmlElement(name="class")
+ public void setMixin(String mixin)
+ {
+ this.mixin = mixin;
+ }
+
+ public String getConstruction()
+ {
+ return construction;
+ }
+
+ public void setConstruction(String construction)
+ {
+ this.construction = construction;
+ }
+
+ public String getInterfaces()
+ {
+ return interfaces;
+ }
+
+ public void setInterfaces(String interfaces)
+ {
+ this.interfaces = interfaces;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/NamedPointcutBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/NamedPointcutBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/NamedPointcutBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.NamedPointcut;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="pointcut")
+public class NamedPointcutBeanMetaDataFactory extends AbstractPointcutBeanMetaDataFactory
+{
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getBeanClass()
+ {
+ return NamedPointcut.class.getName();
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PreInstallLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PreInstallLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PreInstallLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * PreInstall lifecycle callback.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-preinstall")
+public class PreInstallLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.PRE_INSTALL;
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrecedenceBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,110 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.PrecedenceDef;
+import org.jboss.aop.microcontainer.beans.PrecedenceDefEntry;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.util.id.GUID;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="precedence")
+public class PrecedenceBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+ private List<BaseInterceptorData> entries = new ArrayList<BaseInterceptorData>();
+
+ public PrecedenceBeanMetaDataFactory()
+ {
+ }
+
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ //Add the PrecedenceDef
+ String name = getName();
+ if (name == null)
+ {
+ name = GUID.asString();
+ }
+ BeanMetaDataBuilder precedenceBuilder = BeanMetaDataBuilder.createBuilder(name, PrecedenceDef.class.getName());
+ precedenceBuilder.addPropertyMetaData("name", getName());
+ setAspectManagerProperty(precedenceBuilder);
+ result.add(precedenceBuilder.getBeanMetaData());
+
+ List<ValueMetaData> entryList = precedenceBuilder.createList(ArrayList.class.getName(), null);
+ precedenceBuilder.addPropertyMetaData("entries", entryList);
+ int i = 0;
+ for (BaseInterceptorData entry : entries)
+ {
+ String entryName = name + "$" + i++;
+ BeanMetaDataBuilder entryBuilder = BeanMetaDataBuilder.createBuilder(entryName, PrecedenceDefEntry.class.getName());
+
+ entryBuilder.addPropertyMetaData("aspectName", entry.getRefName());
+ if (entry instanceof AdviceOrInterceptorData)
+ {
+ entryBuilder.addPropertyMetaData("aspectMethod", ((AdviceOrInterceptorData)entry).getAdviceMethod());
+ }
+
+ ValueMetaData injectEntry = precedenceBuilder.createInject(entryName);
+ entryList.add(injectEntry);
+ result.add(entryBuilder.getBeanMetaData());
+ }
+
+ return result;
+ }
+
+ @XmlElements
+ ({
+ @XmlElement(name="advice", type=AdviceData.class),
+ @XmlElement(name="interceptor-ref", type=InterceptorRefData.class)
+ })
+ public List<BaseInterceptorData> getEntries()
+ {
+ return entries;
+ }
+
+ public void setEntries(List<BaseInterceptorData> entries)
+ {
+ this.entries = entries;
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrepareMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrepareMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/PrepareMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.Prepare;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="prepare")
+public class PrepareMetaDataFactory extends AbstractPointcutBeanMetaDataFactory
+{
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getBeanClass()
+ {
+ return Prepare.class.getName();
+ }
+
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StackBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -59,7 +59,7 @@
//Create Stack
BeanMetaDataBuilder stackBuilder = BeanMetaDataBuilder.createBuilder(name, Stack.class.getName());
stackBuilder.addPropertyMetaData("name", name);
- util.setAspectManagerProperty(stackBuilder, "manager");
+ setAspectManagerProperty(stackBuilder);
result.add(stackBuilder.getBeanMetaData());
if (interceptors.size() > 0)
@@ -70,7 +70,7 @@
{
String intName = name + "$" + i++;
BeanMetaDataBuilder interceptorBuilder = BeanMetaDataBuilder.createBuilder(intName, interceptor.getBeanClassName());
- util.setAspectManagerProperty(interceptorBuilder, "manager");
+ setAspectManagerProperty(interceptorBuilder);
interceptorBuilder.addPropertyMetaData("forStack", Boolean.TRUE);
if (interceptor instanceof AdviceOrInterceptorData)
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StartLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StartLifecycleBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/StartLifecycleBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.beans.metadata;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="lifecycle-start")
+public class StartLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ControllerState getState()
+ {
+ return ControllerState.START;
+ }
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/TypeDefBeanMetaDataFactory.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -69,7 +69,7 @@
typedefBuilder.addPropertyMetaData("name", getName());
typedefBuilder.addPropertyMetaData("expr", expr);
- util.setAspectManagerProperty(typedefBuilder, "manager");
+ setAspectManagerProperty(typedefBuilder);
beans.add(typedefBuilder.getBeanMetaData());
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/main/schema/aop-beans_1_0.xsd 2008-03-20 12:19:45 UTC (rev 71050)
@@ -2,16 +2,216 @@
<!-- A prototype xsd schema for javabeans
$Id$
-->
+<!-- xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:jboss:aop-beans:1.0"
+ xmlns="urn:jboss:aop-beans:1.0"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0"
+-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:jboss:aop-beans:1.0"
xmlns="urn:jboss:aop-beans:1.0"
- xmlns:mc="urn:jboss:bean-deployer:2.0"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0"
->
-
- <xsd:import namespace="urn:jboss:bean-deployer:2.0"/>
+>
+ <xsd:redefine schemaLocation="jboss-beans-common_2_0.xsd">
+ <xsd:complexType name="beanType">
+ <xsd:complexContent>
+ <xsd:extension base="beanType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="classloaderType">
+ <xsd:complexContent>
+ <xsd:extension base="classloaderType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="abstractBeanfactoryType">
+ <xsd:complexContent>
+ <xsd:extension base="abstractBeanfactoryType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="beanfactoryType">
+ <xsd:complexContent>
+ <xsd:extension base="beanfactoryType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="lazyType">
+ <xsd:complexContent>
+ <xsd:extension base="lazyType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="constructorType">
+ <xsd:complexContent>
+ <xsd:extension base="constructorType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="lifecycleType">
+ <xsd:complexContent>
+ <xsd:extension base="lifecycleType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="installType">
+ <xsd:complexContent>
+ <xsd:extension base="installType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="uninstallCallbackType">
+ <xsd:complexContent>
+ <xsd:extension base="uninstallCallbackType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="installCallbackType">
+ <xsd:complexContent>
+ <xsd:extension base="installCallbackType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="dependencyType">
+ <xsd:complexContent>
+ <xsd:extension base="dependencyType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="injectionType">
+ <xsd:complexContent>
+ <xsd:extension base="injectionType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="valueFactoryType">
+ <xsd:complexContent>
+ <xsd:extension base="valueFactoryType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="factoryType">
+ <xsd:complexContent>
+ <xsd:extension base="factoryType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="aliasType">
+ <xsd:complexContent>
+ <xsd:extension base="aliasType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="namedAliasType">
+ <xsd:complexContent>
+ <xsd:extension base="namedAliasType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="parameterType">
+ <xsd:complexContent>
+ <xsd:extension base="parameterType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="propertyType">
+ <xsd:complexContent>
+ <xsd:extension base="propertyType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="annotationType">
+ <xsd:complexContent>
+ <xsd:extension base="annotationType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="interfaceType">
+ <xsd:complexContent>
+ <xsd:extension base="interfaceType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:simpleType name="classNameType">
+ <xsd:restriction base="classNameType"></xsd:restriction>
+ </xsd:simpleType>
+ <xsd:group name="valueGroup"/>
+ <xsd:complexType name="plainValueType">
+ <xsd:complexContent>
+ <xsd:extension base="plainValueType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="valueType">
+ <xsd:complexContent>
+ <xsd:extension base="valueType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="classLoaderValueType">
+ <xsd:complexContent>
+ <xsd:extension base="classLoaderValueType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="annotatedValueType">
+ <xsd:complexContent>
+ <xsd:extension base="annotatedValueType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="namedValueType">
+ <xsd:complexContent>
+ <xsd:extension base="namedValueType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="baseCollectionType">
+ <xsd:complexContent>
+ <xsd:extension base="baseCollectionType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="collectionType">
+ <xsd:complexContent>
+ <xsd:extension base="collectionType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="listType">
+ <xsd:complexContent>
+ <xsd:extension base="listType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="setType">
+ <xsd:complexContent>
+ <xsd:extension base="setType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="arrayType">
+ <xsd:complexContent>
+ <xsd:extension base="arrayType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="mapType">
+ <xsd:complexContent>
+ <xsd:extension base="mapType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="entryType">
+ <xsd:complexContent>
+ <xsd:extension base="entryType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="dependsType">
+ <xsd:complexContent>
+ <xsd:extension base="dependsType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="demandType">
+ <xsd:complexContent>
+ <xsd:extension base="demandType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="supplyType">
+ <xsd:complexContent>
+ <xsd:extension base="supplyType"/>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:simpleType name="controllerStateType">
+ <xsd:restriction base="controllerStateType"></xsd:restriction>
+ </xsd:simpleType>
+ <xsd:simpleType name="controllerModeType">
+ <xsd:restriction base="controllerModeType"></xsd:restriction>
+ </xsd:simpleType>
+ <xsd:simpleType name="autowireTypeType">
+ <xsd:restriction base="autowireTypeType"></xsd:restriction>
+ </xsd:simpleType>
+ <xsd:simpleType name="optionType">
+ <xsd:restriction base="optionType"></xsd:restriction>
+ </xsd:simpleType>
+ <xsd:simpleType name="contextType">
+ <xsd:restriction base="contextType"></xsd:restriction>
+ </xsd:simpleType>
+ </xsd:redefine>
<xsd:annotation>
<xsd:documentation>
@@ -51,7 +251,7 @@
<xsd:element name="prepare" type="prepareType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="annotation" type="aopAnnotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="precedence" type="precedenceType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="introduction" type="introductionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="arrayreplacement" type="arrayreplacementType" minOccurs="0" maxOccurs="unbounded"/>
@@ -93,15 +293,15 @@
<xsd:element name="prepare" type="prepareType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="pointcut" type="pointcutType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="annotation-introduction" type="annotationIntroductionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="annotation" type="aopAnnotationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="precedence" type="precedenceType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="introduction" type="introductionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="arrayreplacement" type="arrayreplacementType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="arraybind" type="arraybindType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:choice>
<xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="parentFirst" type="xsd:string" use="optional" default="false"/>
- <xsd:attribute name="inheritDefinitions" type="xsd:string" use="optional" default="true"/>
+ <xsd:attribute name="parentFirst" type="xsd:boolean" use="optional" default="false"/>
+ <xsd:attribute name="inheritDefinitions" type="xsd:boolean" use="optional" default="true"/>
<xsd:attribute name="inheritBindings" type="xsd:boolean" use="optional" default="false"/>
<xsd:attribute name="extends" type="xsd:string" use="optional"/>
</xsd:complexType>
@@ -133,7 +333,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
- <xsd:extension base="mc:abstractBeanfactoryType">
+ <xsd:extension base="abstractBeanfactoryType">
<xsd:attribute name="class" type="xsd:token" use="required"/>
</xsd:extension>
</xsd:complexContent>
@@ -485,12 +685,12 @@
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="expr" type="xsd:string" use="required"/>
- <xsd:attribute name="invisible" type="xsd:string" use="required"/>
+ <xsd:attribute name="invisible" type="xsd:boolean" use="required"/>
<xsd:attribute name="manager-bean" type="xsd:string" use="optional"/>
<xsd:attribute name="manager-property" type="xsd:string" use="optional"/>
</xsd:complexType>
- <xsd:element name="annotation" type="annotationType">
+ <xsd:element name="annotation" type="aopAnnotationType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -500,7 +700,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:complexType name="annotationType">
+ <xsd:complexType name="aopAnnotationType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -512,7 +712,7 @@
<xsd:extension base="annotationIntroductionType"/>
</xsd:complexContent>
</xsd:complexType>
-
+
<xsd:element name="precedence" type="precedenceType">
<xsd:annotation>
<xsd:documentation>
@@ -693,7 +893,7 @@
<xsd:attribute name="type" type="xsd:string" use="required"></xsd:attribute>
</xsd:complexType>
- <xsd:complexType name="lifecycleType">
+ <xsd:complexType name="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -714,7 +914,7 @@
</xsd:complexContent>
</xsd:complexType>
- <xsd:element name="lifecycle-configure" type="lifecycleType">
+ <xsd:element name="lifecycle-configure" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -724,7 +924,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="lifecycle-create" type="lifecycleType">
+ <xsd:element name="lifecycle-create" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -734,7 +934,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="lifecycle-describe" type="lifecycleType">
+ <xsd:element name="lifecycle-describe" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -744,7 +944,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="lifecycle-install" type="lifecycleType">
+ <xsd:element name="lifecycle-install" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -754,7 +954,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="lifecycle-instantiate" type="lifecycleType">
+ <xsd:element name="lifecycle-instantiate" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -764,7 +964,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="lifecycle-preinstall" type="lifecycleType">
+ <xsd:element name="lifecycle-preinstall" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -774,7 +974,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="lifecycle-start" type="lifecycleType">
+ <xsd:element name="lifecycle-start" type="aopLifecycleType">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
@@ -783,5 +983,4 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
-
</xsd:schema>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <annotation xmlns="urn:jboss:aop-beans:1.0" expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ <annotation expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
@org.jboss.test.microcontainer.beans.Annotation1
</annotation>
- <annotation xmlns="urn:jboss:aop-beans:1.0" expr="method(void org.jboss.test.microcontainer.beans.POJO->method())" invisible="false">
+ <annotation expr="method(void org.jboss.test.microcontainer.beans.POJO->method())" invisible="false">
@org.jboss.test.microcontainer.beans.Annotation2
</annotation>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->@org.jboss.test.microcontainer.beans.Annotation2(..))">
+ <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->@org.jboss.test.microcontainer.beans.Annotation2(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <annotation xmlns="urn:jboss:aop-beans:1.0" expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ @org.jboss.test.microcontainer.beans.Annotation1
+ </annotation>
+
+ <annotation xmlns="urn:jboss:aop-beans:1.0" expr="method(void org.jboss.test.microcontainer.beans.POJO->method())" invisible="false">
+ @org.jboss.test.microcontainer.beans.Annotation2
+ </annotation>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->@org.jboss.test.microcontainer.beans.Annotation2(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory">
+ <aspect factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory">
</aspect>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-
-</deployment>
+
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory">
+ </aspect>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect">
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect">
</aspect>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect">
+ </aspect>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aop:aspect>
+ </aspect>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
- <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
- </aop:bind>
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </bind>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aop:property name="dependency"><aop:inject bean="Dependency"/></aop:property>
+ </aop:aspect>
+
+ <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </aop:bind>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <cflow-stack xmlns="urn:jboss:aop-beans:1.0" name="CFlow">
+ <cflow-stack name="CFlow">
<not-called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->notCallPOJO(..)"/>
<called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->callPOJO(..)"/>
</cflow-stack>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="CFlow">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="CFlow">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <cflow-stack xmlns="urn:jboss:aop-beans:1.0" name="CFlow">
+ <not-called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->notCallPOJO(..)"/>
+ <called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->callPOJO(..)"/>
+ </cflow-stack>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="CFlow">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <domain xmlns="urn:jboss:aop-beans:1.0" name="AOPDomain">
+ <domain name="AOPDomain">
<annotation xmlns="urn:jboss:aop-beans:1.0" expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
@org.jboss.test.microcontainer.beans.Annotation1
</annotation>
- <annotation-introduction xmlns="urn:jboss:aop-beans:1.0" expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ <annotation-introduction expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
@org.jboss.test.microcontainer.beans.Annotation1
</annotation-introduction>
@@ -21,7 +21,7 @@
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</precedence>
- <introduction xmlns="urn:jboss:aop-beans:1.0" name="MixinBinding" class="org.jboss.test.microcontainer.beans.POJO">
+ <introduction name="MixinBinding" class="org.jboss.test.microcontainer.beans.POJO">
<mixin>
<interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
<class>org.jboss.test.microcontainer.beans.MixinImpl</class>
@@ -29,13 +29,13 @@
</mixin>
</introduction>
- <pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="all(org.acme.POJO)"/>
+ <pointcut name="NamedPointcut" expr="all(org.acme.POJO)"/>
- <prepare xmlns="urn:jboss:aop-beans:1.0" name="Prepare" expr="all(org.acme.POJO)"/>
+ <prepare name="Prepare" expr="all(org.acme.POJO)"/>
- <dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
+ <dynamic-cflow name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
- <cflow-stack xmlns="urn:jboss:aop-beans:1.0" name="CFlow">
+ <cflow-stack name="CFlow">
<not-called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->notCallPOJO(..)"/>
<called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->callPOJO(..)"/>
</cflow-stack>
@@ -43,7 +43,7 @@
<typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
<aspect class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
- <mc:property xmlns:mc="urn:jboss:bean-deployer:2.0" name="someProperty">This is only a test</mc:property>
+ <property name="someProperty">This is only a test</property>
</aspect>
<interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
@@ -67,4 +67,4 @@
</arraybind>
</domain>
-</deployment>
+</aop>
\ No newline at end of file
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <domain xmlns="urn:jboss:aop-beans:1.0" name="AOPDomain">
+
+ <annotation xmlns="urn:jboss:aop-beans:1.0" expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ @org.jboss.test.microcontainer.beans.Annotation1
+ </annotation>
+
+ <annotation-introduction xmlns="urn:jboss:aop-beans:1.0" expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ @org.jboss.test.microcontainer.beans.Annotation1
+ </annotation-introduction>
+
+ <precedence xmlns="urn:jboss:aop-beans:1.0">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </precedence>
+
+ <introduction xmlns="urn:jboss:aop-beans:1.0" name="MixinBinding" class="org.jboss.test.microcontainer.beans.POJO">
+ <mixin>
+ <interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
+ <class>org.jboss.test.microcontainer.beans.MixinImpl</class>
+ <transient>true</transient>
+ </mixin>
+ </introduction>
+
+ <pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="all(org.acme.POJO)"/>
+
+ <prepare xmlns="urn:jboss:aop-beans:1.0" name="Prepare" expr="all(org.acme.POJO)"/>
+
+ <dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
+
+ <cflow-stack xmlns="urn:jboss:aop-beans:1.0" name="CFlow">
+ <not-called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->notCallPOJO(..)"/>
+ <called expr="void org.jboss.test.microcontainer.beans.test.CFlowTest->callPOJO(..)"/>
+ </cflow-stack>
+
+ <typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
+
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <mc:property xmlns:mc="urn:jboss:bean-deployer:2.0" name="someProperty">This is only a test</mc:property>
+ </aspect>
+
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <stack name="TestStack">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </stack>
+
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithProperty" name="advice"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <stack-ref name="TestStack"/>
+ </bind>
+
+ <arrayreplacement class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
+
+ <arraybind name="TestArrayBinding" type="READ_WRITE">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </arraybind>
+ </domain>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
+ <dynamic-cflow name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="DynamicCFlow">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="DynamicCFlow">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="DynamicCFlow">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+ <interceptor factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<interceptor-ref name="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aop:interceptor>
+ </interceptor>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
- <aop:interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
- </aop:bind>
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
+ </bind>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </interceptor>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
+ </bind>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <introduction xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.POJO">
+ <introduction class="org.jboss.test.microcontainer.beans.POJO">
<interfaces>org.jboss.test.microcontainer.beans.IntroductionInterface</interfaces>
</introduction>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
+ <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <introduction xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.POJO">
+ <interfaces>org.jboss.test.microcontainer.beans.IntroductionInterface</interfaces>
+ </introduction>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <introduction xmlns="urn:jboss:aop-beans:1.0" expr="has(* *->method())">
+ <introduction expr="has(* *->method())">
<interfaces>org.jboss.test.microcontainer.beans.IntroductionInterface</interfaces>
</introduction>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
+ <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <introduction xmlns="urn:jboss:aop-beans:1.0" expr="has(* *->method())">
+ <interfaces>org.jboss.test.microcontainer.beans.IntroductionInterface</interfaces>
+ </introduction>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
+
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.LightweightAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.LightweightAspect"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" name="Binding" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind name="Binding" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<before aspect="org.jboss.test.microcontainer.beans.LightweightAspect" name="before"/>
<around aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
<after aspect="org.jboss.test.microcontainer.beans.LightweightAspect" name="after"/>
@@ -21,4 +21,4 @@
<!-- TODO This test should go somewhere so it is only run as woven
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-->
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.LightweightAspect"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" name="Binding" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <before aspect="org.jboss.test.microcontainer.beans.LightweightAspect" name="before"/>
+ <around aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ <after aspect="org.jboss.test.microcontainer.beans.LightweightAspect" name="after"/>
+ <throwing aspect="org.jboss.test.microcontainer.beans.LightweightAspect" name="throwing"/>
+ <finally aspect="org.jboss.test.microcontainer.beans.LightweightAspect" name="finaly"/>
+ </bind>
+
+ <!-- TODO This test should go somewhere so it is only run as woven
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+ -->
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <introduction xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.POJO">
+ <introduction class="org.jboss.test.microcontainer.beans.POJO">
<mixin>
<interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
<class>org.jboss.test.microcontainer.beans.MixinImpl</class>
@@ -14,12 +14,12 @@
</mixin>
</introduction>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
+ <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <introduction xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.POJO">
+ <mixin>
+ <interfaces>org.jboss.test.microcontainer.beans.MixinInterface</interfaces>
+ <class>org.jboss.test.microcontainer.beans.MixinImpl</class>
+ <transient>true</transient>
+ </mixin>
+ </introduction>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <introduction xmlns="urn:jboss:aop-beans:1.0" expr="has(* *->method())">
+ <introduction expr="has(* *->method())">
<mixin>
<construction>new org.jboss.test.microcontainer.beans.MixinImpl(this, "CUSTOM CONSTRUCTION")</construction>
<interfaces>
@@ -16,12 +16,12 @@
</mixin>
</introduction>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
+ <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <introduction xmlns="urn:jboss:aop-beans:1.0" expr="has(* *->method())">
+ <mixin>
+ <construction>new org.jboss.test.microcontainer.beans.MixinImpl(this, "CUSTOM CONSTRUCTION")</construction>
+ <interfaces>
+ org.jboss.test.microcontainer.beans.MixinInterface
+ </interfaces>
+ <class>org.jboss.test.microcontainer.beans.MixinImpl</class>
+ </mixin>
+ </introduction>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency1" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency2" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency1"/></property>
- </aop:aspect>
+ </aspect>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
<property name="dependency"><inject bean="Dependency2"/></property>
- </aop:interceptor>
+ </interceptor>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->*(..))">
- <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
- </aop:bind>
+ <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </bind>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
- <aop:interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
- </aop:bind>
+ <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
+ </bind>
<bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
@@ -35,4 +35,4 @@
<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
</bean>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency1" class="org.jboss.test.microcontainer.beans.Dependency"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency2" class="org.jboss.test.microcontainer.beans.Dependency"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <property name="dependency"><inject bean="Dependency1"/></property>
+ </aspect>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <property name="dependency"><inject bean="Dependency2"/></property>
+ </interceptor>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </bind>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
+ </bind>
+
+ <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
+ </bean>
+
+ <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
+ </bean>
+
+ <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
+ </bean>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aop:aspect>
+ </aspect>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
- <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
- <aop:interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- </aop:bind>
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </bind>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aop:property name="dependency"><aop:inject bean="Dependency"/></aop:property>
+ </aop:aspect>
+
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ <aop:interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </aop:bind>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
+ <aspect factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+ <aspect factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStackA">
+ <stack name="TestStackA">
<advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</stack>
- <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStackB">
+ <stack name="TestStackB">
<interceptor-ref name="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</stack>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<stack-ref name="TestStackA"/>
<stack-ref name="TestStackB"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStackA">
+ <advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </stack>
+
+ <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStackB">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </stack>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <stack-ref name="TestStackA"/>
+ <stack-ref name="TestStackB"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="execution(* org.jboss.test.microcontainer.beans.POJO->*())"/>
+ <pointcut name="NamedPointcut" expr="execution(* org.jboss.test.microcontainer.beans.POJO->*())"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="NamedPointcut">
+ <bind pointcut="NamedPointcut">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="execution(* org.jboss.test.microcontainer.beans.POJO->*())"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="NamedPointcut">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,31 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" name="AspectA" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <aspect name="AspectA" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
<property name="someProperty">PropertyA</property>
- </aop:aspect>
+ </aspect>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" name="AspectB" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <aspect name="AspectB" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
<property name="someProperty">PropertyB</property>
- </aop:aspect>
+ </aspect>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method())">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method())">
<advice aspect="AspectA" name="advice"/>
</bind>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method(int))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method(int))">
<advice aspect="AspectB" name="advice"/>
</bind>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
-
-
-
-
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" name="AspectA" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <aop:property name="someProperty">PropertyA</aop:property>
+ </aop:aspect>
+
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" name="AspectB" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <aop:property name="someProperty">PropertyB</aop:property>
+ </aop:aspect>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method())">
+ <advice aspect="AspectA" name="advice"/>
+ </bind>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method(int))">
+ <advice aspect="AspectB" name="advice"/>
+ </bind>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
+
+
+
+
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
@@ -22,4 +22,4 @@
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <precedence xmlns="urn:jboss:aop-beans:1.0">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </precedence>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStack">
+ <stack name="TestStack">
<advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</stack>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<stack-ref name="TestStack"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStack">
+ <advice aspect="org.jboss.test.microcontainer.beans.SimpleAspectFactory" name="advice"/>
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </stack>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <stack-ref name="TestStack"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency1" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency2" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency1"/></property>
- </aop:aspect>
+ </aspect>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
<property name="dependency"><inject bean="Dependency2"/></property>
- </aop:interceptor>
+ </interceptor>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <stack xmlns="urn:jboss:aop-beans:1.0" name="AspectStack">
+ <stack name="AspectStack">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</stack>
- <stack xmlns="urn:jboss:aop-beans:1.0" name="InterceptorStack">
+ <stack name="InterceptorStack">
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</stack>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->*(..))">
- <aop:stack-ref name="AspectStack"/>
- </aop:bind>
+ <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->*(..))">
+ <stack-ref name="AspectStack"/>
+ </bind>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
- <aop:stack-ref name="InterceptorStack"/>
- </aop:bind>
+ <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
+ <stack-ref name="InterceptorStack"/>
+ </bind>
<bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
<annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
@@ -49,4 +49,4 @@
<annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
</bean>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency1" class="org.jboss.test.microcontainer.beans.Dependency"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency2" class="org.jboss.test.microcontainer.beans.Dependency"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <property name="dependency"><inject bean="Dependency1"/></property>
+ </aspect>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <property name="dependency"><inject bean="Dependency2"/></property>
+ </interceptor>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <stack xmlns="urn:jboss:aop-beans:1.0" name="AspectStack">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </stack>
+
+ <stack xmlns="urn:jboss:aop-beans:1.0" name="InterceptorStack">
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </stack>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->*(..))">
+ <stack-ref name="AspectStack"/>
+ </bind>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
+ <stack-ref name="InterceptorStack"/>
+ </bind>
+
+ <bean name="Intercepted1" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
+ </bean>
+
+ <bean name="Intercepted2" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
+ </bean>
+
+ <bean name="Intercepted3" class="org.jboss.test.microcontainer.beans.POJO">
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation1</annotation>
+ <annotation>@org.jboss.test.microcontainer.beans.Annotation2</annotation>
+ </bean>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</deployment>
+</aop>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aop:aspect>
+ </aspect>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStack">
+ <stack name="TestStack">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</stack>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
<stack-ref name="TestStack"/>
</bind>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </aspect>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <stack xmlns="urn:jboss:aop-beans:1.0" name="TestStack">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </stack>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <stack-ref name="TestStack"/>
+ </bind>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <typedef xmlns="urn:jboss:aop-beans:1.0" name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
+ <typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $typedef{TypeDef}->*(..))">
+ <bind pointcut="execution(* $typedef{TypeDef}->*(..))">
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</bind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
+
+ <typedef xmlns="urn:jboss:aop-beans:1.0" name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $typedef{TypeDef}->*(..))">
+ <advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
+ </bind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect"/>
+ <aspect class="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect"/>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <prepare xmlns="urn:jboss:aop-beans:1.0" expr="field(* org.jboss.test.microcontainer.beans.woven.test.ClassWithArray->*)"/>
+ <prepare expr="field(* org.jboss.test.microcontainer.beans.woven.test.ClassWithArray->*)"/>
- <arrayreplacement xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
+ <arrayreplacement class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
- <arraybind xmlns="urn:jboss:aop-beans:1.0" type="READ_WRITE">
+ <arraybind type="READ_WRITE">
<advice aspect="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect" name="advice"/>
<interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
</arraybind>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect"/>
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+
+ <prepare xmlns="urn:jboss:aop-beans:1.0" expr="field(* org.jboss.test.microcontainer.beans.woven.test.ClassWithArray->*)"/>
+
+ <arrayreplacement xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
+
+ <arraybind xmlns="urn:jboss:aop-beans:1.0" type="READ_WRITE">
+ <advice aspect="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect" name="advice"/>
+ <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ </arraybind>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.woven.test.ClassWithArray"/>
+
+</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareAopTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareAopTestCase.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareAopTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bean name="AspectManager" class="org.jboss.aop.AspectManager">
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <prepare xmlns="urn:jboss:aop-beans:1.0" expr="all(org.jboss.test.microcontainer.beans.POJO)"/>
+ <prepare expr="all(org.jboss.test.microcontainer.beans.POJO)"/>
<bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
-</deployment>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <prepare xmlns="urn:jboss:aop-beans:1.0" expr="all(org.jboss.test.microcontainer.beans.POJO)"/>
+
+ <bean name="Bean" class="org.jboss.test.microcontainer.beans.POJO"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <bean name="Dependency" class="java.lang.Object"/>
+
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <bean name="TheAspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <lifecycle-configure
+ name="LifecycleCallback"
+ class="org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency"
+ expr="class(org.jboss.test.microcontainer.support.SimpleBeanImpl)"
+ manager-bean="TheAspectManager">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </lifecycle-configure>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
+
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic0.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Dependency" class="java.lang.Object"/>
+
+</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TheAspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ name="LifecycleCallback"
+ class="org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency"
+ expr="class(org.jboss.test.microcontainer.support.SimpleBeanImpl)"
+ manager-bean="TheAspectManager">
+ <property name="dependency"><inject bean="Dependency"/></property>
+ </lifecycle-configure>
+
+ <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
+
+</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Dependency" class="java.lang.Object"/>
-
-</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TheAspectManager" class="org.jboss.aop.AspectManager">
- <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
- </bean>
-
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
- name="LifecycleCallback"
- class="org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency"
- expr="class(org.jboss.test.microcontainer.support.SimpleBeanImpl)"
- manager-bean="TheAspectManager">
- <property name="dependency"><inject bean="Dependency"/></property>
- </aop:lifecycle-configure>
-
- <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
-
-</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCaseNotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCaseNotAutomatic.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCaseNotAutomatic.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<aop xmlns="urn:jboss:aop-beans:1.0">
+
+ <bean name="MBeanServer" class="java.lang.Object">
+ <constructor factoryClass="javax.management.MBeanServerFactory" factoryMethod="createMBeanServer"/>
+ </bean>
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aop:lifecycle-configure
+ name="ConfigureAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Configure">
+ </aop:lifecycle-configure>
+
+ <aop:lifecycle-create
+ name="CreateAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Create">
+ </aop:lifecycle-create>
+
+ <aop:lifecycle-describe
+ name="DescribeAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Describe">
+ </aop:lifecycle-describe>
+
+ <aop:lifecycle-install
+ name="InstallAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Install">
+ </aop:lifecycle-install>
+
+ <aop:lifecycle-instantiate
+ name="InstantiateAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Instantiate">
+ </aop:lifecycle-instantiate>
+
+ <aop:lifecycle-start
+ name="StartAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Start">
+ </aop:lifecycle-start>
+
+ <bean name="ConfigureBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Configure</annotation>
+ </bean>
+
+ <bean name="CreateBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Create</annotation>
+ </bean>
+
+ <bean name="DescribeBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Describe</annotation>
+ </bean>
+
+ <bean name="InstallBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Install</annotation>
+ </bean>
+
+ <bean name="InstantiateBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Instantiate</annotation>
+ </bean>
+
+ <bean name="StartBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Start</annotation>
+ </bean>
+</aop>
Added: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCaseNotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCaseNotAutomatic.xml (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCaseNotAutomatic.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="MBeanServer" class="java.lang.Object">
+ <constructor factoryClass="javax.management.MBeanServerFactory" factoryMethod="createMBeanServer"/>
+ </bean>
+
+ <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+ <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+ </bean>
+
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="ConfigureAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Configure">
+ </aop:lifecycle-configure>
+
+ <aop:lifecycle-create xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="CreateAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Create">
+ </aop:lifecycle-create>
+
+ <aop:lifecycle-describe xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="DescribeAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Describe">
+ </aop:lifecycle-describe>
+
+ <aop:lifecycle-install xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="InstallAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Install">
+ </aop:lifecycle-install>
+
+ <aop:lifecycle-instantiate xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="InstantiateAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Instantiate">
+ </aop:lifecycle-instantiate>
+
+ <aop:lifecycle-start xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="StartAdvice"
+ class="org.jboss.test.microcontainer.support.LifecycleCallback"
+ classes="@org.jboss.test.microcontainer.support.Start">
+ </aop:lifecycle-start>
+
+ <bean name="ConfigureBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Configure</annotation>
+ </bean>
+
+ <bean name="CreateBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Create</annotation>
+ </bean>
+
+ <bean name="DescribeBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Describe</annotation>
+ </bean>
+
+ <bean name="InstallBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Install</annotation>
+ </bean>
+
+ <bean name="InstantiateBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Instantiate</annotation>
+ </bean>
+
+ <bean name="StartBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
+ <annotation>@org.jboss.test.microcontainer.support.Start</annotation>
+ </bean>
+</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleTestCaseNotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleTestCaseNotAutomatic.xml 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleTestCaseNotAutomatic.xml 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="MBeanServer" class="java.lang.Object">
- <constructor factoryClass="javax.management.MBeanServerFactory" factoryMethod="createMBeanServer"/>
- </bean>
-
- <bean name="AspectManager" class="org.jboss.aop.AspectManager">
- <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
- </bean>
-
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
- name="ConfigureAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Configure">
- </aop:lifecycle-configure>
-
- <aop:lifecycle-create xmlns:aop="urn:jboss:aop-beans:1.0"
- name="CreateAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Create">
- </aop:lifecycle-create>
-
- <aop:lifecycle-describe xmlns:aop="urn:jboss:aop-beans:1.0"
- name="DescribeAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Describe">
- </aop:lifecycle-describe>
-
- <aop:lifecycle-install xmlns:aop="urn:jboss:aop-beans:1.0"
- name="InstallAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Install">
- </aop:lifecycle-install>
-
- <aop:lifecycle-instantiate xmlns:aop="urn:jboss:aop-beans:1.0"
- name="InstantiateAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Instantiate">
- </aop:lifecycle-instantiate>
-
- <aop:lifecycle-start xmlns:aop="urn:jboss:aop-beans:1.0"
- name="StartAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Start">
- </aop:lifecycle-start>
-
- <bean name="ConfigureBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Configure</annotation>
- </bean>
-
- <bean name="CreateBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Create</annotation>
- </bean>
-
- <bean name="DescribeBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Describe</annotation>
- </bean>
-
- <bean name="InstallBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Install</annotation>
- </bean>
-
- <bean name="InstantiateBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Instantiate</annotation>
- </bean>
-
- <bean name="StartBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Start</annotation>
- </bean>
-</deployment>
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempJBossEntityResolver.java.bak
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempJBossEntityResolver.java.bak (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempJBossEntityResolver.java.bak 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,56 @@
+/*
+* 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.test.aop.junit.tempforjbossxb;
+
+
+import java.io.IOException;
+
+import org.jboss.util.xml.JBossEntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Override the behaviour of the main JBossEntityResolver so that we can get hold of the redefined
+ * schema while waiting for this bug fix
+ * http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4136648#4136648
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class TempJBossEntityResolver extends JBossEntityResolver
+{
+
+ @Override
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
+ {
+ if (systemId != null && systemId.equals("jboss-beans-common_2_0.xsd"))
+ {
+ InputSource source = resolveSystemID(systemId, true);
+ if (source != null)
+ {
+ return source;
+ }
+ }
+ return super.resolveEntity(publicId, systemId);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempXMLDeployer.bak
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempXMLDeployer.bak (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/tempforjbossxb/TempXMLDeployer.bak 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,184 @@
+/*
+* 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.test.aop.junit.tempforjbossxb;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.logging.Logger;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class TempXMLDeployer extends BasicXMLDeployer
+{
+ /** The log */
+ private static final Logger log = Logger.getLogger(BasicXMLDeployer.class);
+
+ /** Unmarshaller factory */
+ private static final UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
+
+ /** The resolver */
+ private static final SchemaBindingResolver resolver = new DefaultSchemaResolver(new TempJBossEntityResolver());
+
+ /** The deployments by url or name */
+ private Map<String, KernelDeployment> deploymentsByName = new ConcurrentHashMap<String, KernelDeployment>();
+
+ /**
+ * Create a new XML deployer with mode.
+ *
+ * @param kernel the kernel
+ * @param mode the controller mode
+ */
+ public TempXMLDeployer(Kernel kernel, ControllerMode mode)
+ {
+ super(kernel, mode);
+ }
+
+ public Collection<String> getDeploymentNames()
+ {
+ return deploymentsByName.keySet();
+ }
+
+ public void deploy(KernelDeployment deployment) throws Throwable
+ {
+ super.deploy(deployment);
+ deploymentsByName.put(deployment.getName(), deployment);
+ }
+
+ public void undeploy(KernelDeployment deployment)
+ {
+ deploymentsByName.remove(deployment.getName());
+ super.undeploy(deployment);
+ }
+
+ /**
+ * Undeploy a url
+ *
+ * @param url the url to undeploy
+ * @throws IllegalStateException if the url is unknown
+ */
+ public void undeploy(final URL url)
+ {
+ if (url == null)
+ throw new IllegalArgumentException("Null url");
+ undeploy(url.toString());
+ }
+
+ /**
+ * Undeploy a name deployment
+ *
+ * @param name the name of the deployment to undeploy
+ * @throws IllegalStateException if the name is unknown
+ */
+ public void undeploy(final String name)
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Null name");
+ KernelDeployment deployment = deploymentsByName.remove(name);
+ if (deployment == null)
+ throw new IllegalStateException("Unknown deployment " + name);
+ undeploy(deployment);
+ }
+
+ /**
+ * Deploy a url
+ *
+ * @param url the url to deploy
+ * @return the kernel deployment
+ * @throws Throwable for any error
+ */
+ public KernelDeployment deploy(final URL url) throws Throwable
+ {
+ final boolean trace = log.isTraceEnabled();
+
+ if (url == null)
+ throw new IllegalArgumentException("Null url");
+
+ if (trace)
+ log.trace("Parsing " + url);
+
+ long start = System.currentTimeMillis();
+
+ Unmarshaller unmarshaller = factory.newUnmarshaller();
+ KernelDeployment deployment = (KernelDeployment) unmarshaller.unmarshal(url.toString(), resolver);
+ if (deployment == null)
+ throw new RuntimeException("The xml " + url + " is not well formed!");
+ deployment.setName(url.toString());
+
+ if (trace)
+ {
+ long now = System.currentTimeMillis();
+ log.trace("Parsing " + url + " took " + (now-start) + " milliseconds");
+ }
+
+ deploy(deployment);
+
+ if (trace)
+ {
+ long now = System.currentTimeMillis();
+ log.trace("Deploying " + url + " took " + (now-start) + " milliseconds");
+ }
+
+ return deployment;
+ }
+
+ /**
+ * Deploy a stream. We may be deploying XML fragments.
+ *
+ * @param deploymentName the deployment name
+ * @param stream the stream
+ * @return the kernel deployment
+ * @throws Throwable for any error
+ */
+ public KernelDeployment deploy(String deploymentName, final InputStream stream) throws Throwable
+ {
+ boolean trace = log.isTraceEnabled();
+
+ if (trace)
+ log.trace("Parsing " + deploymentName);
+ Unmarshaller unmarshaller = factory.newUnmarshaller();
+ KernelDeployment deployment = (KernelDeployment) unmarshaller.unmarshal(stream, resolver);
+ if (deployment == null)
+ throw new RuntimeException("The deployment " + deploymentName + " is not well formed!");
+ deployment.setName(deploymentName);
+
+ deploy(deployment);
+
+ return deployment;
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AnnotationOverrideDeploymentTestCase extends AnnotationOverrideTest
+{
+ public static Test suite()
+ {
+ return suite(AnnotationOverrideDeploymentTestCase.class);
+ }
+
+ public AnnotationOverrideDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AspectFactorySimpleDeploymentTestCase extends AspectFactorySimpleTest
+{
+ public static Test suite()
+ {
+ return suite(AspectFactorySimpleDeploymentTestCase.class);
+ }
+
+ public AspectFactorySimpleDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,44 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AspectSimpleDeploymentTestCase extends AspectSimpleTest
+{
+
+ public static Test suite()
+ {
+ return suite(AspectSimpleDeploymentTestCase.class);
+ }
+
+ public AspectSimpleDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeployemtDifferentOrderTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeployemtDifferentOrderTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeployemtDifferentOrderTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,47 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AspectWithDependencyDeployemtDifferentOrderTestCase extends AspectWithDependencyDeploymentTestCase
+{
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new AspectWithDependencyDeployemtDifferentOrderTestCase("testInterceptorWithDependencyWrongOrder"));
+ suite.addTest(new AspectWithDependencyDeployemtDifferentOrderTestCase("testInterceptorWithDependencyCorrectOrder"));
+ return suite;
+ }
+
+ public AspectWithDependencyDeployemtDifferentOrderTestCase(String test)
+ {
+ super(test);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AspectWithDependencyDeploymentTestCase extends AspectWithDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(AspectWithDependencyDeploymentTestCase.class);
+ }
+
+ public AspectWithDependencyDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "AspectWithDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class CFlowDeploymentTestCase extends CFlowTest
+{
+ public static Test suite()
+ {
+ return suite(CFlowDeploymentTestCase.class);
+ }
+
+ public CFlowDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class CopyOfAnnotationOverrideDeploymentTestCase extends AnnotationOverrideTest
+{
+ public static Test suite()
+ {
+ return suite(CopyOfAnnotationOverrideDeploymentTestCase.class);
+ }
+
+ public CopyOfAnnotationOverrideDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,44 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class DomainSimpleDeploymentTestCase extends DomainSimpleTest
+{
+
+ public DomainSimpleDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(DomainSimpleDeploymentTestCase.class);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class DynamicCFlowDeploymentTestCase extends DynamicCFlowTest
+{
+ public static Test suite()
+ {
+ return suite(DynamicCFlowDeploymentTestCase.class);
+ }
+
+ public DynamicCFlowDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InterceptorFactorySimpleDeploymentTestCase extends InterceptorFactorySimpleTest
+{
+ public static Test suite()
+ {
+ return suite(InterceptorFactorySimpleDeploymentTestCase.class);
+ }
+
+ public InterceptorFactorySimpleDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InterceptorSimpleDeploymentTestCase extends InterceptorSimpleTest
+{
+
+ public static Test suite()
+ {
+ return suite(InterceptorSimpleDeploymentTestCase.class);
+ }
+
+ public InterceptorSimpleDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentDifferentOrderTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentDifferentOrderTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,47 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InterceptorWithDependencyDeploymentDifferentOrderTestCase extends InterceptorWithDependencyDeploymentTestCase
+{
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new InterceptorWithDependencyDeploymentTestCase("testInterceptorWithDependencyWrongOrder"));
+ suite.addTest(new InterceptorWithDependencyDeploymentTestCase("testInterceptorWithDependencyCorrectOrder"));
+ return suite;
+ }
+
+ public InterceptorWithDependencyDeploymentDifferentOrderTestCase(String test)
+ {
+ super(test);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InterceptorWithDependencyDeploymentTestCase extends InterceptorWithDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(InterceptorWithDependencyDeploymentTestCase.class);
+ }
+
+ public InterceptorWithDependencyDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "InterceptorWithDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class IntroductionClassesDeploymentTestCase extends IntroductionClassesTest
+{
+ public static Test suite()
+ {
+ return suite(IntroductionClassesDeploymentTestCase.class);
+ }
+
+ public IntroductionClassesDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class IntroductionExprDeploymentTestCase extends IntroductionExprTest
+{
+ public static Test suite()
+ {
+ return suite(IntroductionExprDeploymentTestCase.class);
+ }
+
+ public IntroductionExprDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,45 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class LightweightAspectDeploymentTestCase extends LightweightAspectTest
+{
+ public static Test suite()
+ {
+ return suite(LightweightAspectDeploymentTestCase.class);
+ }
+
+ public LightweightAspectDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MixinClassesDeploymentTestCase extends MixinClassesTest
+{
+ public static Test suite()
+ {
+ return suite(MixinClassesDeploymentTestCase.class);
+ }
+
+ public MixinClassesDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MixinExprDeploymentTestCase extends MixinExprTest
+{
+ public static Test suite()
+ {
+ return suite(MixinExprDeploymentTestCase.class);
+ }
+
+ public MixinExprDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,42 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MultipleAdviceDeploymentTestCase extends MultipleAdviceTest
+{
+ public static Test suite()
+ {
+ return suite(MultipleAdviceDeploymentTestCase.class);
+ }
+
+ public MultipleAdviceDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,49 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase
+ extends
+ MultipleAdvicesWithMultipleDependencyDeploymentTestCase
+{
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyWrongOrder"));
+ suite.addTest(new MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyCorrectOrder"));
+ return suite;
+ }
+
+ public MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase(String test)
+ {
+ super(test);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MultipleAdvicesWithMultipleDependencyDeploymentTestCase extends MultipleAdvicesWithMultipleDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(MultipleAdvicesWithMultipleDependencyDeploymentTestCase.class);
+ }
+
+ public MultipleAdvicesWithMultipleDependencyDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+ @Override
+ public String getFile0()
+ {
+ return "MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ public String getFile1()
+ {
+ return "MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+
+ @Override
+ public String getFile2()
+ {
+ return "MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml";
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,49 @@
+/*
+* 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase
+ extends
+ MultipleAdvicesWithSingleDependencyDeploymentTestCase
+{
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyWrongOrder"));
+ suite.addTest(new MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyCorrectOrder"));
+ return suite;
+ }
+
+ public MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase(String test)
+ {
+ super(test);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MultipleAdvicesWithSingleDependencyDeploymentTestCase extends MultipleAdvicesWithSingleDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(MultipleAdvicesWithSingleDependencyDeploymentTestCase.class);
+ }
+
+ public MultipleAdvicesWithSingleDependencyDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class MultipleStackDeploymentTestCase extends MultipleStackTest
+{
+ public static Test suite()
+ {
+ return suite(MultipleStackDeploymentTestCase.class);
+ }
+
+ public MultipleStackDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class NamedPointcutDeploymentTestCase extends NamedPointcutTest
+{
+ public static Test suite()
+ {
+ return suite(NamedPointcutAopTestCase.class);
+ }
+
+ public NamedPointcutDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,44 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class NonStandardNameAspectDeploymentTestCase extends NonStandardNameAspectTest
+{
+ public static Test suite()
+ {
+ return suite(NonStandardNameAspectDeploymentTestCase.class);
+ }
+
+ public NonStandardNameAspectDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,44 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class PrecedenceDeploymentTestCase extends PrecedenceTest
+{
+ public static Test suite()
+ {
+ return suite(PrecedenceDeploymentTestCase.class);
+ }
+
+ public PrecedenceDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class StackDeploymentTestCase extends StackTest
+{
+ public static Test suite()
+ {
+ return suite(StackDeploymentTestCase.class);
+ }
+
+ public StackDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentDifferentOrderTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentDifferentOrderTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class StackWithMultipleDependencyDeploymentDifferentOrderTestCase extends StackWithMultipleDependencyDeploymentTestCase
+{
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new StackWithMultipleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyWrongOrder"));
+ suite.addTest(new StackWithMultipleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyCorrectOrder"));
+ return suite;
+ }
+
+ public StackWithMultipleDependencyDeploymentDifferentOrderTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class StackWithMultipleDependencyDeploymentTestCase extends StackWithMultipleDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(StackWithMultipleDependencyDeploymentTestCase.class);
+ }
+
+ public StackWithMultipleDependencyDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "StackWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "StackWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+
+ @Override
+ protected String getFile2()
+ {
+ return "StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml";
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentDifferentOrderTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentDifferentOrderTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class StackWithSingleDependencyDeploymentDifferentOrderTestCase extends StackWithSingleDependencyDeploymentTestCase
+{
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new StackWithSingleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyWrongOrder"));
+ suite.addTest(new StackWithSingleDependencyDeploymentDifferentOrderTestCase("testInterceptorWithDependencyCorrectOrder"));
+ return suite;
+ }
+
+ public StackWithSingleDependencyDeploymentDifferentOrderTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class StackWithSingleDependencyDeploymentTestCase extends StackWithSingleDependencyTest
+{
+ public static Test suite()
+ {
+ return suite(StackWithSingleDependencyDeploymentTestCase.class);
+ }
+
+ public StackWithSingleDependencyDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "StackWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.microcontainer.beans.test;
+
+import junit.framework.Test;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class TypeDefDeploymentTestCase extends TypeDefTest
+{
+ public static Test suite()
+ {
+ return suite(TypeDefDeploymentTestCase.class);
+ }
+
+ public TypeDefDeploymentTestCase(String test)
+ {
+ super(test);
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,44 @@
+/*
+* 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.test.microcontainer.beans.woven.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ArrayDeploymentTestCase extends ArrayTest
+{
+
+ public static Test suite()
+ {
+ return suite(ArrayDeploymentTestCase.class);
+ }
+
+ public ArrayDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,44 @@
+/*
+* 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.test.microcontainer.beans.woven.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class PrepareDeploymentTestCase extends PrepareTest
+{
+
+ public static Test suite()
+ {
+ return suite(PrepareDeploymentTestCase.class);
+ }
+
+ public PrepareDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/MetaDataContextInterceptor.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.microcontainer.support;
+import java.lang.annotation.Annotation;
+
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
@@ -34,7 +36,7 @@
public static Object classAnnotation;
public static Object joinpointAnnotation;
- private Class<?> annotationType;
+ private Class<? extends Annotation> annotationType;
public static void reset()
{
@@ -46,7 +48,7 @@
{
try
{
- this.annotationType = Thread.currentThread().getContextClassLoader().loadClass(annotationType);
+ this.annotationType = (Class<? extends Annotation>)Thread.currentThread().getContextClassLoader().loadClass(annotationType);
}
catch (ClassNotFoundException e)
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -54,7 +54,7 @@
suite.addTest(InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCase.suite());
suite.addTest(InterceptorWithOverriddenMethodAnnotationDependencyTestCase.suite());
suite.addTest(IntroductionDependencyTestCase.suite());
- suite.addTest(LifecycleTestCase.suite());
+ suite.addTest(LifecycleAopTestCase.suite());
suite.addTest(JMXDecoratedTestCase.suite());
suite.addTest(JMXLifecycleTestCase.suite());
suite.addTest(JndiDecoratedTestCase.suite());
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,54 @@
+/*
+* 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.test.microcontainer.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InitialLifecycleCallbackWithDependencyAopTestCase extends InitialLifecycleCallbackWithDependencyTest
+{
+ public InitialLifecycleCallbackWithDependencyAopTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(InitialLifecycleCallbackWithDependencyAopTestCase.class);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml";
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,55 @@
+/*
+* 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.test.microcontainer.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class InitialLifecycleCallbackWithDependencyDeploymentTestCase extends InitialLifecycleCallbackWithDependencyTest
+{
+
+ public InitialLifecycleCallbackWithDependencyDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(InitialLifecycleCallbackWithDependencyDeploymentTestCase.class);
+ }
+
+ @Override
+ protected String getFile0()
+ {
+ return "InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic0.xml";
+ }
+
+ @Override
+ protected String getFile1()
+ {
+ return "InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml";
+ }
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTest.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTest.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,357 @@
+/*
+* 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.test.microcontainer.test;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
+import org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency;
+import org.jboss.test.microcontainer.support.SimpleBean;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class InitialLifecycleCallbackWithDependencyTest extends AOPMicrocontainerTest
+{
+ public InitialLifecycleCallbackWithDependencyTest(String name)
+ {
+ super(name);
+ }
+
+ public void testLifecycleInterceptionsWithDependencyCorrectOrder() throws Exception
+ {
+ deploy(getFile0());
+ try
+ {
+ Object dependency = getCheckBeanExists("Dependency");
+ assertNotNull(dependency);
+ boolean itworked = false;
+
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ deploy(getFile1());
+ try
+ {
+ validate();
+ getCheckBeanExists("Intercepted");
+ LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ assertNotNull(lifecycle.getDependency());
+ assertEquals(dependency, lifecycle.getDependency());
+ itworked = true;
+ }
+ finally
+ {
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ undeploy(getFile1());
+ if (itworked)
+ {
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ }
+ }
+ }
+ finally
+ {
+ undeploy(getFile0());
+ }
+ }
+
+ public void testLifecycleInterceptionsWithDependencyWrongOrder() throws Exception
+ {
+ deploy(getFile1());
+ try
+ {
+ SimpleBean bean;
+ try
+ {
+ bean = (SimpleBean) getBean("Intercepted");
+ fail("'Interceped' should not be installed yet");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
+ assertNull("This should not be deployed until the interceptor is", bean);
+
+ boolean itworked = false;
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ deploy(getFile0());
+ try
+ {
+ validate();
+ Object dependency = getCheckBeanExists("Dependency");
+ LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
+ getCheckBeanExists("Intercepted");
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ assertNotNull(lifecycle.getDependency());
+ assertEquals(dependency, lifecycle.getDependency());
+
+ itworked = true;
+
+ }
+ finally
+ {
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ undeploy(getFile0());
+ if (itworked)
+ {
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ }
+
+ try
+ {
+ bean = (SimpleBean) getBean("Intercepted");
+ fail("'Interceped' should not be installed yet");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
+ assertNull("This should not be deployed until the interceptor is", bean);
+ }
+ }
+ finally
+ {
+ undeploy(getFile1());
+ }
+ }
+
+ public void testLifecycleInterceptionsWithDependencyRedeploy() throws Exception
+ {
+ deploy(getFile1());
+ try
+ {
+ SimpleBean bean;
+ try
+ {
+ bean = (SimpleBean) getBean("Intercepted");
+ fail("'Interceped' should not be installed yet");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
+ assertNull("This should not be deployed until the interceptor is", bean);
+
+ boolean itworked = false;
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ deploy(getFile0());
+ try
+ {
+ validate();
+ Object dependency = getCheckBeanExists("Dependency");
+ LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
+ getCheckBeanExists("Intercepted");
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ assertNotNull(lifecycle.getDependency());
+ assertEquals(dependency, lifecycle.getDependency());
+
+ itworked = true;
+
+ }
+ finally
+ {
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ undeploy(getFile0());
+ if (itworked)
+ {
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ }
+
+ try
+ {
+ bean = (SimpleBean) getBean("Intercepted");
+ fail("'Interceped' should not be installed yet");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
+ assertNull("This should not be deployed until the interceptor is", bean);
+ }
+
+ try
+ {
+ bean = (SimpleBean) getBean("Intercepted");
+ fail("'Interceped' should not be installed yet");
+ }
+ catch (IllegalStateException expected)
+ {
+ KernelControllerContext context = getControllerContext("Intercepted", ControllerState.DESCRIBED);
+ assertNotNull(context);
+ }
+
+ itworked = false;
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ deploy(getFile0());
+ try
+ {
+ validate();
+ Object dependency = getCheckBeanExists("Dependency");
+ LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
+ getCheckBeanExists("Intercepted");
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ assertNotNull(lifecycle.getDependency());
+ assertTrue("Should not be caching the lifecycle's callback across rebinding", dependency == lifecycle.getDependency());
+
+ itworked = true;
+ }
+ finally
+ {
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ undeploy(getFile0());
+ if (itworked)
+ {
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ }
+
+ try
+ {
+ bean = (SimpleBean) getBean("Intercepted");
+ fail("'Interceped' should not be installed yet");
+ }
+ catch (IllegalStateException expected)
+ {
+ }
+
+ bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
+ assertNull("This should not be deployed until the interceptor is", bean);
+ }
+ }
+ finally
+ {
+ undeploy(getFile1());
+ }
+ }
+
+ public void testLifecycleInterceptionsWithDependencyRedeploy2() throws Exception
+ {
+ deploy(getFile0());
+ try
+ {
+ Object dependency = getCheckBeanExists("Dependency");
+ boolean itworked = false;
+
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ deploy(getFile1());
+ try
+ {
+ validate();
+ getCheckBeanExists("Intercepted");
+ LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ assertNotNull(lifecycle.getDependency());
+ assertTrue(dependency == lifecycle.getDependency());
+ itworked = true;
+ }
+ finally
+ {
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ undeploy(getFile1());
+ if (itworked)
+ {
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ }
+ }
+
+ Object dependency2 = getCheckBeanExists("Dependency");
+ assertTrue(dependency == dependency2);
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ deploy(getFile1());
+ try
+ {
+ validate();
+ getCheckBeanExists("Intercepted");
+ LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ assertNotNull(lifecycle.getDependency());
+ assertTrue(dependency == lifecycle.getDependency());
+ itworked = true;
+ }
+ finally
+ {
+ LifecycleCallbackWithBeanDependency.interceptions.clear();
+ undeploy(getFile1());
+ if (itworked)
+ {
+ assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
+ LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
+ assertEquals("Intercepted", handled.contextName);
+ assertEquals(ControllerState.CONFIGURED, handled.toState);
+ }
+ }
+ }
+ finally
+ {
+ undeploy(getFile0());
+ }
+ }
+
+ public Object getCheckBeanExists(String name)
+ {
+ Object bean = getBean(name);
+ assertNotNull(bean);
+ return bean;
+ }
+
+ protected abstract String getFile0();
+
+ protected abstract String getFile1();
+}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,360 +0,0 @@
-/*
-* 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.test.microcontainer.test;
-
-import junit.framework.Test;
-
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.test.aop.junit.AOPMicrocontainerTest;
-import org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency;
-import org.jboss.test.microcontainer.support.SimpleBean;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class InitialLifecycleCallbackWithDependencyTestCase extends AOPMicrocontainerTest
-{
- public static Test suite()
- {
- return suite(InitialLifecycleCallbackWithDependencyTestCase.class);
- }
-
- public InitialLifecycleCallbackWithDependencyTestCase(String name)
- {
- super(name);
- }
-
- public void testLifecycleInterceptionsWithDependencyCorrectOrder() throws Exception
- {
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- try
- {
- Object dependency = getCheckBeanExists("Dependency");
- assertNotNull(dependency);
- boolean itworked = false;
-
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- try
- {
- validate();
- getCheckBeanExists("Intercepted");
- LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- assertNotNull(lifecycle.getDependency());
- assertEquals(dependency, lifecycle.getDependency());
- itworked = true;
- }
- finally
- {
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- if (itworked)
- {
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- }
- }
- }
- finally
- {
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- }
- }
-
- public void testLifecycleInterceptionsWithDependencyWrongOrder() throws Exception
- {
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- try
- {
- SimpleBean bean;
- try
- {
- bean = (SimpleBean) getBean("Intercepted");
- fail("'Interceped' should not be installed yet");
- }
- catch (IllegalStateException expected)
- {
- }
-
- bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
- assertNull("This should not be deployed until the interceptor is", bean);
-
- boolean itworked = false;
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- try
- {
- validate();
- Object dependency = getCheckBeanExists("Dependency");
- LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
- getCheckBeanExists("Intercepted");
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- assertNotNull(lifecycle.getDependency());
- assertEquals(dependency, lifecycle.getDependency());
-
- itworked = true;
-
- }
- finally
- {
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- if (itworked)
- {
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- }
-
- try
- {
- bean = (SimpleBean) getBean("Intercepted");
- fail("'Interceped' should not be installed yet");
- }
- catch (IllegalStateException expected)
- {
- }
-
- bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
- assertNull("This should not be deployed until the interceptor is", bean);
- }
- }
- finally
- {
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- }
- }
-
- public void testLifecycleInterceptionsWithDependencyRedeploy() throws Exception
- {
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- try
- {
- SimpleBean bean;
- try
- {
- bean = (SimpleBean) getBean("Intercepted");
- fail("'Interceped' should not be installed yet");
- }
- catch (IllegalStateException expected)
- {
- }
-
- bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
- assertNull("This should not be deployed until the interceptor is", bean);
-
- boolean itworked = false;
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- try
- {
- validate();
- Object dependency = getCheckBeanExists("Dependency");
- LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
- getCheckBeanExists("Intercepted");
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- assertNotNull(lifecycle.getDependency());
- assertEquals(dependency, lifecycle.getDependency());
-
- itworked = true;
-
- }
- finally
- {
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- if (itworked)
- {
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- }
-
- try
- {
- bean = (SimpleBean) getBean("Intercepted");
- fail("'Interceped' should not be installed yet");
- }
- catch (IllegalStateException expected)
- {
- }
-
- bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
- assertNull("This should not be deployed until the interceptor is", bean);
- }
-
- try
- {
- bean = (SimpleBean) getBean("Intercepted");
- fail("'Interceped' should not be installed yet");
- }
- catch (IllegalStateException expected)
- {
- KernelControllerContext context = getControllerContext("Intercepted", ControllerState.DESCRIBED);
- assertNotNull(context);
- }
-
- itworked = false;
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- try
- {
- validate();
- Object dependency = getCheckBeanExists("Dependency");
- LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
- getCheckBeanExists("Intercepted");
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- assertNotNull(lifecycle.getDependency());
- assertTrue("Should not be caching the lifecycle's callback across rebinding", dependency == lifecycle.getDependency());
-
- itworked = true;
- }
- finally
- {
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- if (itworked)
- {
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- }
-
- try
- {
- bean = (SimpleBean) getBean("Intercepted");
- fail("'Interceped' should not be installed yet");
- }
- catch (IllegalStateException expected)
- {
- }
-
- bean = (SimpleBean) getBean("Intercepted", ControllerState.DESCRIBED);
- assertNull("This should not be deployed until the interceptor is", bean);
- }
- }
- finally
- {
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- }
- }
-
- public void testLifecycleInterceptionsWithDependencyRedeploy2() throws Exception
- {
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- try
- {
- Object dependency = getCheckBeanExists("Dependency");
- boolean itworked = false;
-
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- try
- {
- validate();
- getCheckBeanExists("Intercepted");
- LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- assertNotNull(lifecycle.getDependency());
- assertTrue(dependency == lifecycle.getDependency());
- itworked = true;
- }
- finally
- {
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- if (itworked)
- {
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- }
- }
-
- Object dependency2 = getCheckBeanExists("Dependency");
- assertTrue(dependency == dependency2);
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- try
- {
- validate();
- getCheckBeanExists("Intercepted");
- LifecycleCallbackWithBeanDependency lifecycle = (LifecycleCallbackWithBeanDependency)getCheckBeanExists("LifecycleCallback");
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- assertNotNull(lifecycle.getDependency());
- assertTrue(dependency == lifecycle.getDependency());
- itworked = true;
- }
- finally
- {
- LifecycleCallbackWithBeanDependency.interceptions.clear();
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml");
- if (itworked)
- {
- assertEquals(1, LifecycleCallbackWithBeanDependency.interceptions.size());
- LifecycleCallbackWithBeanDependency.Handled handled = LifecycleCallbackWithBeanDependency.interceptions.get(0);
- assertEquals("Intercepted", handled.contextName);
- assertEquals(ControllerState.CONFIGURED, handled.toState);
- }
- }
- }
- finally
- {
- undeploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
- }
- }
-
- public Object getCheckBeanExists(String name)
- {
- Object bean = getBean(name);
- assertNotNull(bean);
- return bean;
- }
-}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,49 @@
+/*
+* 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.test.microcontainer.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class LifecycleAopTestCase extends LifecycleTest
+{
+ public LifecycleAopTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(LifecycleAopTestCase.class);
+ }
+
+ @Override
+ protected String getFile()
+ {
+ return "LifecycleAopTestCaseNotAutomatic.xml";
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCase.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,49 @@
+/*
+* 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.test.microcontainer.test;
+
+import junit.framework.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class LifecycleDeploymentTestCase extends LifecycleTest
+{
+ public LifecycleDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(LifecycleDeploymentTestCase.class);
+ }
+
+ @Override
+ protected String getFile()
+ {
+ return "LifecycleDeploymentTestCaseNotAutomatic.xml";
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTest.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTest.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.test.microcontainer.test;
+
+import java.util.ArrayList;
+
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
+import org.jboss.test.microcontainer.support.Configure;
+import org.jboss.test.microcontainer.support.Create;
+import org.jboss.test.microcontainer.support.Describe;
+import org.jboss.test.microcontainer.support.Install;
+import org.jboss.test.microcontainer.support.Instantiate;
+import org.jboss.test.microcontainer.support.LifecycleCallback;
+import org.jboss.test.microcontainer.support.Start;
+
+public abstract class LifecycleTest extends AOPMicrocontainerTest
+{
+ public LifecycleTest(String name)
+ {
+ super(name);
+ }
+
+ public void testLifecycleInterceptions() throws Exception
+ {
+ boolean undeployed = false;
+ try
+ {
+ LifecycleCallback.interceptions.clear();
+ deploy(getFile());
+
+ //Verify the beans exist
+ checkBeanExists("ConfigureBean");
+ checkBeanExists("CreateBean");
+ checkBeanExists("DescribeBean");
+ checkBeanExists("InstallBean");
+ checkBeanExists("InstantiateBean");
+ checkBeanExists("StartBean");
+
+ //Now check the expected lifecycle events for each bean
+ checkExpectedAnnotations("ConfigureBean", Configure.class);
+ checkExpectedAnnotations("CreateBean", Create.class);
+ checkExpectedAnnotations("DescribeBean", Describe.class);
+ checkExpectedAnnotations("InstallBean", Install.class);
+ checkExpectedAnnotations("InstantiateBean", Instantiate.class);
+ checkExpectedAnnotations("StartBean", Start.class);
+
+
+ LifecycleCallback.interceptions.clear();
+
+ undeploy(getFile());
+ undeployed = true;
+
+ checkExpectedAnnotations("ConfigureBean", Configure.class);
+ checkExpectedAnnotations("CreateBean", Create.class);
+ checkExpectedAnnotations("DescribeBean", Describe.class);
+ checkExpectedAnnotations("InstallBean", Install.class);
+ checkExpectedAnnotations("InstantiateBean", Instantiate.class);
+ checkExpectedAnnotations("StartBean", Start.class);
+
+ }
+ finally
+ {
+ if (!undeployed)
+ {
+ undeploy(getFile());
+ }
+ }
+ }
+
+ public void checkBeanExists(String name)
+ {
+ Object bean = getBean(name);
+ assertNotNull(bean);
+ }
+
+ public void checkExpectedAnnotations(String name, Class<?> annotation)
+ {
+ ArrayList<Class<?>> events = LifecycleCallback.interceptions.get(name);
+ assertNotNull(events);
+ assertEquals("Wrong events, expected one element only " + events, 1, events.size());
+ Class<?> actualAnnotation = events.get(0);
+ assertEquals(annotation, actualAnnotation);
+ }
+
+ protected abstract String getFile();
+}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java 2008-03-20 08:17:35 UTC (rev 71049)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java 2008-03-20 12:19:45 UTC (rev 71050)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.microcontainer.test;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-
-import org.jboss.test.aop.junit.AOPMicrocontainerTest;
-import org.jboss.test.microcontainer.support.Configure;
-import org.jboss.test.microcontainer.support.Create;
-import org.jboss.test.microcontainer.support.Describe;
-import org.jboss.test.microcontainer.support.Install;
-import org.jboss.test.microcontainer.support.Instantiate;
-import org.jboss.test.microcontainer.support.LifecycleCallback;
-import org.jboss.test.microcontainer.support.Start;
-
-public class LifecycleTestCase extends AOPMicrocontainerTest
-{
- public static Test suite()
- {
- return suite(LifecycleTestCase.class);
- }
-
- public LifecycleTestCase(String name)
- {
- super(name);
- }
-
- public void testLifecycleInterceptions() throws Exception
- {
- boolean undeployed = false;
- try
- {
- LifecycleCallback.interceptions.clear();
- deploy("LifecycleTestCaseNotAutomatic.xml");
-
- //Verify the beans exist
- checkBeanExists("ConfigureBean");
- checkBeanExists("CreateBean");
- checkBeanExists("DescribeBean");
- checkBeanExists("InstallBean");
- checkBeanExists("InstantiateBean");
- checkBeanExists("StartBean");
-
- //Now check the expected lifecycle events for each bean
- checkExpectedAnnotations("ConfigureBean", Configure.class);
- checkExpectedAnnotations("CreateBean", Create.class);
- checkExpectedAnnotations("DescribeBean", Describe.class);
- checkExpectedAnnotations("InstallBean", Install.class);
- checkExpectedAnnotations("InstantiateBean", Instantiate.class);
- checkExpectedAnnotations("StartBean", Start.class);
-
-
- LifecycleCallback.interceptions.clear();
-
- undeploy("LifecycleTestCaseNotAutomatic.xml");
- undeployed = true;
-
- checkExpectedAnnotations("ConfigureBean", Configure.class);
- checkExpectedAnnotations("CreateBean", Create.class);
- checkExpectedAnnotations("DescribeBean", Describe.class);
- checkExpectedAnnotations("InstallBean", Install.class);
- checkExpectedAnnotations("InstantiateBean", Instantiate.class);
- checkExpectedAnnotations("StartBean", Start.class);
-
- }
- finally
- {
- if (!undeployed)
- {
- undeploy("LifecycleTestCaseNotAutomatic.xml");
- }
- }
- }
-
- public void checkBeanExists(String name)
- {
- Object bean = getBean(name);
- assertNotNull(bean);
- }
-
- public void checkExpectedAnnotations(String name, Class<?> annotation)
- {
- ArrayList<Class<?>> events = LifecycleCallback.interceptions.get(name);
- assertNotNull(events);
- assertEquals("Wrong events, expected one element only " + events, 1, events.size());
- Class<?> actualAnnotation = events.get(0);
- assertEquals(annotation, actualAnnotation);
- }
-}
More information about the jboss-cvs-commits
mailing list