[jboss-cvs] JBossAS SVN: r71086 - in projects/microcontainer/trunk/aop-mc-int/src: main/org/jboss/aop/microcontainer/beans and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 20 13:05:47 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-20 13:05:46 -0400 (Thu, 20 Mar 2008)
New Revision: 71086
Added:
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
Removed:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/
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/FieldAccessTestCase.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/jaxb/
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/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic0.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/JBossXBDeployer.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/support/
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/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/FieldAccessTestCase.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/jaxb/
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
Modified:
projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml
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/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.xml
projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCaseNotAutomatic.xml
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java
Log:
Rollback the JAXB changes to the tests
Modified: projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/assembly/impl.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,16 +1,16 @@
-<assembly>
- <id>impl</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <excludes>
- <exclude>org/jboss/aop/microcontainer/aspects/**</exclude>
- </excludes>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
+<assembly>
+ <id>impl</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <excludes>
+ <exclude>org/jboss/aop/microcontainer/aspects/**</exclude>
+ </excludes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ <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 expr="method(void org.jboss.test.microcontainer.beans.POJO->method())" invisible="false">
+ <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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation1->@org.jboss.test.microcontainer.beans.Annotation2(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,25 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory">
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory">
</aspect>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-
-</aop>
+
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,18 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect">
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect">
</aspect>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,18 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aspect>
+ </aop:aspect>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
- <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.POJO->*(..))">
+ <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </aop:bind>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,6 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <cflow-stack name="CFlow">
+ <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 pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="CFlow">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,22 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 name="AOPDomain">
+ <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 expr="class(org.jboss.test.microcontainer.beans.POJO)" invisible="false">
+ <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>
@@ -21,7 +21,7 @@
<advice aspect="org.jboss.test.microcontainer.beans.TestAspect" name="advice"/>
</precedence>
- <introduction name="MixinBinding" class="org.jboss.test.microcontainer.beans.POJO">
+ <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>
@@ -29,13 +29,13 @@
</mixin>
</introduction>
- <pointcut name="NamedPointcut" expr="all(org.acme.POJO)"/>
+ <pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="all(org.acme.POJO)"/>
- <prepare name="Prepare" expr="all(org.acme.POJO)"/>
+ <prepare xmlns="urn:jboss:aop-beans:1.0" name="Prepare" expr="all(org.acme.POJO)"/>
- <dynamic-cflow name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
+ <dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
- <cflow-stack name="CFlow">
+ <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>
@@ -43,7 +43,7 @@
<typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
<aspect class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
- <property name="someProperty">This is only a test</property>
+ <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"/>
@@ -67,4 +67,4 @@
</arraybind>
</domain>
-</aop>
\ No newline at end of file
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,70 +0,0 @@
-<?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">
- <property xmlns:mc="urn:jboss:bean-deployer:2.0" name="someProperty">This is only a test</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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <dynamic-cflow name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
+ <dynamic-cflow xmlns="urn:jboss:aop-beans:1.0" name="DynamicCFlow" class="org.jboss.test.microcontainer.beans.DynamicCFlowImpl"/>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))" cflow="DynamicCFlow">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +0,0 @@
-<?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>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/FieldAccessTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/FieldAccessTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/FieldAccessTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,27 +0,0 @@
-<?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.support.AccessBean->*(..))">
- <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- </bind>
-
- <bean name="private" class="org.jboss.test.microcontainer.beans.support.AccessBean" access-mode="ALL">
- <property name="priString">foobar</property>
- </bean>
-
- <bean name="protected" class="org.jboss.test.microcontainer.beans.support.AccessBean" access-mode="ALL">
- <property name="protString">foobar</property>
- </bean>
-
- <bean name="public" class="org.jboss.test.microcontainer.beans.support.AccessBean" access-mode="ALL">
- <property name="pubString">foobar</property>
- </bean>
-
-</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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,17 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,17 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </interceptor>
+ </aop:interceptor>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
- <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
- </bind>
+ <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>
<bean name="Intercepted" class="org.jboss.test.microcontainer.beans.POJO"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,6 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.POJO">
+ <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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,21 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 expr="has(* *->method())">
+ <introduction xmlns="urn:jboss:aop-beans:1.0" expr="has(* *->method())">
<interfaces>org.jboss.test.microcontainer.beans.IntroductionInterface</interfaces>
</introduction>
- <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.IntroductionInterface}->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,22 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <aspect class="org.jboss.test.microcontainer.beans.LightweightAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.LightweightAspect"/>
- <bind name="Binding" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
@@ -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"/>
-->
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,24 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.POJO">
+ <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>
@@ -14,12 +14,12 @@
</mixin>
</introduction>
- <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,25 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 expr="has(* *->method())">
+ <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>
@@ -16,12 +16,12 @@
</mixin>
</introduction>
- <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <bind pointcut="execution(* $instanceof{org.jboss.test.microcontainer.beans.MixinInterface}->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,27 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,20 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency1" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency2" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyAopTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency1"/></property>
- </aspect>
+ </aop:aspect>
- <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
<property name="dependency"><inject bean="Dependency2"/></property>
- </interceptor>
+ </aop:interceptor>
- <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.Annotation1->*(..))">
+ <aop:advice aspect="org.jboss.test.microcontainer.beans.TestAspectWithDependency" name="advice"/>
+ </aop:bind>
- <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
- <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency"/>
- </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>
<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>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,38 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aspect>
+ </aop:aspect>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <aop:interceptor xmlns:aop="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.TestAspectWithDependency" name="advice"/>
- <interceptor-ref name="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- </bind>
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,22 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
- <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <aspect factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" factory="org.jboss.test.microcontainer.beans.SimpleInterceptorFactory"/>
- <aspect class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <stack name="TestStackA">
+ <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 name="TestStackB">
+ <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 pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,34 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <pointcut name="NamedPointcut" expr="execution(* org.jboss.test.microcontainer.beans.POJO->*())"/>
+ <pointcut xmlns="urn:jboss:aop-beans:1.0" name="NamedPointcut" expr="execution(* org.jboss.test.microcontainer.beans.POJO->*())"/>
- <bind pointcut="NamedPointcut">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,19 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,27 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 name="AspectA" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" name="AspectA" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
<property name="someProperty">PropertyA</property>
- </aspect>
+ </aop:aspect>
- <aspect name="AspectB" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" name="AspectB" class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
<property name="someProperty">PropertyB</property>
- </aspect>
+ </aop:aspect>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method())">
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method())">
<advice aspect="AspectA" name="advice"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->method(int))">
+ <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"/>
-</aop>
+</deployment>
+
+
+
+
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,31 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,25 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 factory="org.jboss.test.microcontainer.beans.SimpleAspectFactory"/>
- <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <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 name="TestStack">
+ <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 pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,23 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency1" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency2" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyAopTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency1"/></property>
- </aspect>
+ </aop:aspect>
- <aspect class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptorWithDependency">
<property name="dependency"><inject bean="Dependency2"/></property>
- </interceptor>
+ </aop:interceptor>
- <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <stack name="AspectStack">
+ <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 name="InterceptorStack">
+ <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 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.Annotation1->*(..))">
+ <aop:stack-ref name="AspectStack"/>
+ </aop:bind>
- <bind pointcut="execution(* @org.jboss.test.microcontainer.beans.Annotation2->*(..))">
- <stack-ref name="InterceptorStack"/>
- </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>
<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>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,52 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="Dependency" class="org.jboss.test.microcontainer.beans.Dependency"/>
-</aop>
+</deployment>
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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
+ <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspectWithDependency">
<property name="dependency"><inject bean="Dependency"/></property>
- </aspect>
+ </aop:aspect>
- <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <stack name="TestStack">
+ <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 pointcut="execution(* org.jboss.test.microcontainer.beans.POJO->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,7 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,26 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.TestAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestAspect"/>
- <typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
+ <typedef xmlns="urn:jboss:aop-beans:1.0" name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
- <bind pointcut="execution(* $typedef{TypeDef}->*(..))">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,17 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 class="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect"/>
+ <aspect xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.woven.test.TestArrayAspect"/>
- <interceptor class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" class="org.jboss.test.microcontainer.beans.TestInterceptor"/>
- <prepare expr="field(* org.jboss.test.microcontainer.beans.woven.test.ClassWithArray->*)"/>
+ <prepare xmlns="urn:jboss:aop-beans:1.0" expr="field(* org.jboss.test.microcontainer.beans.woven.test.ClassWithArray->*)"/>
- <arrayreplacement class="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 type="READ_WRITE">
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,24 +0,0 @@
-<?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 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareAopTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
+<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 expr="all(org.jboss.test.microcontainer.beans.POJO)"/>
+ <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"/>
-</aop>
+</deployment>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,13 +0,0 @@
-<?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>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,12 +6,12 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0"
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0"
name="InterceptedAdvice"
class="org.jboss.test.microcontainer.support.InterceptorWithDependency"
manager-bean="TheAspectManager">
<property name="simpleBean"><inject bean="Dependency"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0"
pointcut="execution(@org.jboss.test.microcontainer.support.Test->new(..))"
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -5,12 +5,12 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
name="LifecycleCallback"
class="org.jboss.test.microcontainer.support.SimpleLifecycleCallback"
classes="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<property name="testProperty">Test123</property>
- </lifecycle-configure>
+ </aop:lifecycle-configure>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
-
- <bean name="Dependency" class="java.lang.Object"/>
-
-</aop>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyAopTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,18 +0,0 @@
-<?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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -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/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyDeploymentTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -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>
-
- <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>
Copied: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml (from rev 70090, 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 (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -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>
Copied: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml (from rev 70090, 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 (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -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>
+
+ <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>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
<property name="simpleBean"><inject bean="Dependency"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->@org.jboss.test.microcontainer.support.Test(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->@org.jboss.test.microcontainer.support.Test(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
<property name="simpleBean"><inject bean="Dependency"/></property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.jboss.test.microcontainer.support.MarkerInterface}->*(..))">
<interceptor-ref name="InterceptedAdvice"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -10,13 +10,13 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="JMXAspect" class="org.jboss.aop.microcontainer.aspects.jmx.JMXIntroduction">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="JMXAspect" class="org.jboss.aop.microcontainer.aspects.jmx.JMXIntroduction">
<property name="mbeanServer"><inject bean="MBeanServer"/></property>
- </interceptor>
+ </aop:interceptor>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="MetaDataContextAspect" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="MetaDataContextAspect" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
<property name="annotation">org.jboss.aop.microcontainer.aspects.jmx.JMX</property>
- </interceptor>
+ </aop:interceptor>
<introduction xmlns="urn:jboss:aop-beans:1.0" class="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
<interfaces>org.jboss.kernel.spi.dependency.KernelControllerContextAware</interfaces>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -10,12 +10,12 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
name="DependencyAdvice"
class="org.jboss.aop.microcontainer.aspects.jmx.JMXLifecycleCallback"
classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
<property name="mbeanServer"><inject bean="MBeanServer"/></property>
- </lifecycle-configure>
+ </aop:lifecycle-configure>
<bean name="Bean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="", exposedInterface=org.jboss.test.microcontainer.support.SimpleBean.class)</annotation>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,13 +6,13 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="JndiAspect" class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="JndiAspect" class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>java.naming.factory.initial</key><value>org.jboss.test.microcontainer.support.jndi.MockInitialContextFactory</value></entry>
</map>
</property>
- </interceptor>
+ </aop:interceptor>
<introduction xmlns="urn:jboss:aop-beans:1.0" class="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding">
<interfaces>org.jboss.kernel.spi.dependency.KernelControllerContextAware</interfaces>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,7 +6,7 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
name="DependencyAdvice"
class="org.jboss.aop.microcontainer.aspects.jndi.JndiLifecycleCallback"
classes="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding">
@@ -15,7 +15,7 @@
<entry><key>java.naming.factory.initial</key><value>org.jboss.test.microcontainer.support.jndi.MockInitialContextFactory</value></entry>
</map>
</property>
- </lifecycle-configure>
+ </aop:lifecycle-configure>
<bean name="Bean" class="org.jboss.test.microcontainer.support.jndi.SimpleBean">
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCaseNotAutomatic.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,72 +0,0 @@
-<?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>
-
- <lifecycle-configure
- name="ConfigureAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Configure">
- </lifecycle-configure>
-
- <lifecycle-create
- name="CreateAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Create">
- </lifecycle-create>
-
- <lifecycle-describe
- name="DescribeAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Describe">
- </lifecycle-describe>
-
- <lifecycle-install
- name="InstallAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Install">
- </lifecycle-install>
-
- <lifecycle-instantiate
- name="InstantiateAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Instantiate">
- </lifecycle-instantiate>
-
- <lifecycle-start
- name="StartAdvice"
- class="org.jboss.test.microcontainer.support.LifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Start">
- </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>
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCaseNotAutomatic.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -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>
Copied: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleTestCaseNotAutomatic.xml (from rev 70090, 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 (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleTestCaseNotAutomatic.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -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>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <interceptor xmlns="urn:jboss:aop-beans:1.0" name="MetaDataContextAspect" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
+ <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="MetaDataContextAspect" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
<property name="annotation">org.jboss.test.microcontainer.support.Test</property>
- </interceptor>
+ </aop:interceptor>
<bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.test.microcontainer.support.PropertyBean->*(..))">
<interceptor-ref name="MetaDataContextAspect"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -10,18 +10,18 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
name="JMXAdvice"
class="org.jboss.aop.microcontainer.aspects.jmx.JMXLifecycleCallback"
classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX">
<property name="mbeanServer"><inject bean="MBeanServer"/></property>
- </lifecycle-configure>
+ </aop:lifecycle-configure>
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
name="JndiAdvice"
class="org.jboss.test.microcontainer.support.SimpleLifecycleCallback"
classes="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- </lifecycle-configure>
+ </aop:lifecycle-configure>
<bean name="Bean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="", exposedInterface=org.jboss.test.microcontainer.support.SimpleBean.class)</annotation>
Modified: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCaseNotAutomatic.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCaseNotAutomatic.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCaseNotAutomatic.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -4,7 +4,7 @@
<bean name="TheAspectManager" class="org.jboss.test.microcontainer.support.AspectManagerBean">
</bean>
- <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+ <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
name="LifecycleCallback"
class="org.jboss.test.microcontainer.support.NonDefaultMethodsLifecycleCallback"
classes="org.jboss.test.microcontainer.support.SimpleBeanImpl"
@@ -12,7 +12,7 @@
uninstall="uninit"
manager-bean="TheAspectManager"
manager-property="manager">
- </lifecycle-configure>
+ </aop:lifecycle-configure>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic0.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,14 +0,0 @@
-<?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:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice1" class="org.jboss.test.microcontainer.support.SimpleInterceptor1"/>
-
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
- <interceptor-ref name="InterceptedAdvice1"/>
- </bind>
-</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice2" class="org.jboss.test.microcontainer.support.SimpleInterceptor2"/>
-
- <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.test.microcontainer.support.Test->*(..))">
- <interceptor-ref name="InterceptedAdvice2"/>
- </bind>
-
-</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
- </bean>
-
-</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic0.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic0.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic0.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,15 +0,0 @@
-<?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:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
- name="LifecycleCallbackConfigure"
- class="org.jboss.test.microcontainer.support.SimpleLifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Test">
- </aop:lifecycle-configure>
-
-</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic1.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice2" class="org.jboss.test.microcontainer.support.SimpleInterceptor2"/>
-
- <aop:lifecycle-start xmlns:aop="urn:jboss:aop-beans:1.0"
- name="LifecycleCallbackStart"
- class="org.jboss.test.microcontainer.support.SimpleLifecycleCallback"
- classes="@org.jboss.test.microcontainer.support.Test">
- </aop:lifecycle-start>
-
-</deployment>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCaseNotAutomatic2.xml 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
- </bean>
-
-</deployment>
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -26,8 +26,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.jboss.aop.AspectXmlLoader;
-import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
/**
@@ -119,22 +117,22 @@
}
}
- @Override
- protected BasicXMLDeployer createDeployer()
- {
- if (useJaxbDeployer)
- {
- return new JBossXBDeployer(kernel, defaultMode, clazz);
- }
- return super.createDeployer();
- }
-
- protected KernelDeployment unmarshal(final URL url) throws Exception
- {
- if (!useJaxbDeployer)
- {
- throw new IllegalStateException("useJaxbDeployer needs to be true");
- }
- return ((JBossXBDeployer)deployer).unmarshal(url);
- }
+// @Override
+// protected BasicXMLDeployer createDeployer()
+// {
+// if (useJaxbDeployer)
+// {
+// return new JBossXBDeployer(kernel, defaultMode, clazz);
+// }
+// return super.createDeployer();
+// }
+//
+// protected KernelDeployment unmarshal(final URL url) throws Exception
+// {
+// if (!useJaxbDeployer)
+// {
+// throw new IllegalStateException("useJaxbDeployer needs to be true");
+// }
+// return ((JBossXBDeployer)deployer).unmarshal(url);
+// }
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -47,6 +47,6 @@
protected KernelDeployment unmarshal(final URL url) throws Exception
{
- return ((AOPMicrocontainerTestDelegate)getDelegate()).unmarshal(url);
+ return null;//((AOPMicrocontainerTestDelegate)getDelegate()).unmarshal(url);
}
}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/JBossXBDeployer.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/JBossXBDeployer.java 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/JBossXBDeployer.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,142 +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.aop.junit;
-
-import java.net.URL;
-
-import org.jboss.aop.microcontainer.beans.metadata.AOPDeployment;
-import org.jboss.dependency.spi.ControllerMode;
-import org.jboss.javabean.plugins.jaxb.JavaBean10;
-import org.jboss.javabean.plugins.jaxb.JavaBean20;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-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.sunday.unmarshalling.SchemaBinding;
-import org.jboss.xb.builder.JBossXBBuilder;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class JBossXBDeployer extends BasicXMLDeployer
-{
- /** The log */
- private static final Logger log = Logger.getLogger(BasicXMLDeployer.class);
-
- JBossXBTestDelegate jbossXbTestDelegate;
-
- public JBossXBDeployer(Kernel kernel, ControllerMode mode, Class<?> clazz)
- {
- super(kernel, mode);
- setupJaxbDelegate(clazz);
- }
-
- public JBossXBDeployer(Kernel kernel, Class<?> clazz)
- {
- super(kernel);
- setupJaxbDelegate(clazz);
- }
-
- private void setupJaxbDelegate(Class<?> clazz)
- {
- try
- {
- jbossXbTestDelegate = new JBossXBTestDelegate(clazz);
- jbossXbTestDelegate.setUp();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- public KernelDeployment unmarshal(final URL url) throws Exception
- {
- TestSchemaResolver resolver = setupResolver();
-
- KernelDeployment deployment = (KernelDeployment)jbossXbTestDelegate.unmarshal(url.toString(), resolver);
-
- deployment.setName(url.toString());
-
- return deployment;
- }
-
- private TestSchemaResolver setupResolver()
- {
- TestSchemaResolver resolver = new TestSchemaResolver();
-
- addSchemaBinding(resolver, AbstractKernelDeployment.class);
- addSchemaBinding(resolver, AOPDeployment.class);
- addSchemaBinding(resolver, JavaBean10.class);
- addSchemaBinding(resolver, JavaBean20.class);
-
- return resolver;
- }
-
- private SchemaBinding addSchemaBinding(TestSchemaResolver resolver, Class<?> clazz)
- {
- SchemaBinding binding = JBossXBBuilder.build(clazz);
- resolver.addSchemaBinding(binding);
- return binding;
- }
- /**
- * 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();
-
- KernelDeployment deployment = unmarshal(url);
-
- 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;
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,44 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeployemtDifferentOrderTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,47 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,55 +0,0 @@
-/*
-* 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";
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,44 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/FieldAccessTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/FieldAccessTestCase.java 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/FieldAccessTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,86 +0,0 @@
-/*
-* 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 org.jboss.test.aop.junit.AbstractTypeTest;
-import org.jboss.test.aop.junit.AbstractTypeTestDelegate;
-import org.jboss.test.microcontainer.beans.support.AccessBean;
-
-/**
- * AOP field test case.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class FieldAccessTestCase extends AbstractTypeTest
-{
- public FieldAccessTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(FieldAccessTestCase.class);
- }
-
- protected void testAccessBean(String name) throws Throwable
- {
- AccessBean bean = getBean(name, AccessBean.class);
- AbstractTypeTestDelegate.Type type = getType(name);
- if (type == AbstractTypeTestDelegate.Type.PROXY)
- {
- assertNull(bean.getPriString());
- assertNull(bean.getProtString());
- assertNull(bean.getPubString());
- }
- else
- {
- assertEquals("foobar", concat(bean));
- }
- }
-
- private String concat(AccessBean bean)
- {
- String string = "";
- if (bean.getPriString() != null)
- string += bean.getPriString();
- if (bean.getProtString() != null)
- string += bean.getProtString();
- if (bean.getPubString() != null)
- string += bean.getPubString();
- return string;
- }
-
- public void testFieldAccess() throws Throwable
- {
- testAccessBean("private");
- testAccessBean("protected");
- testAccessBean("public");
-
- // this should fail or something :-) on proxy
- AccessBean pb = getBean("public", AccessBean.class);
- assertEquals("foobar", pb.pubString);
- AbstractTypeTestDelegate.Type type = getType("public");
- assertTrue(pb.getPubString() == null || type != AbstractTypeTestDelegate.Type.PROXY);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +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.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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,47 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,55 +0,0 @@
-/*
-* 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";
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,45 +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.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);
- }
-
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,42 +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.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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,49 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,61 +0,0 @@
-/*
-* 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";
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,49 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,57 +0,0 @@
-/*
-* 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";
- }
-
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,44 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,44 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,46 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,61 +0,0 @@
-/*
-* 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";
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentDifferentOrderTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,46 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,57 +0,0 @@
-/*
-* 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";
- }
-
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,43 +0,0 @@
-/*
-* 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);
- }
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,44 +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.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);
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,44 +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.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/test/AspectMCAllTestSuite.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/AspectMCAllTestSuite.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -54,7 +54,7 @@
suite.addTest(InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCase.suite());
suite.addTest(InterceptorWithOverriddenMethodAnnotationDependencyTestCase.suite());
suite.addTest(IntroductionDependencyTestCase.suite());
- suite.addTest(LifecycleAopTestCase.suite());
+ suite.addTest(LifecycleTestCase.suite());
suite.addTest(JMXDecoratedTestCase.suite());
suite.addTest(JMXLifecycleTestCase.suite());
suite.addTest(JndiDecoratedTestCase.suite());
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java (from rev 70090, 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 (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -0,0 +1,360 @@
+/*
+* 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;
+ }
+}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,49 +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;
-
-/**
- *
- * @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";
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleDeploymentTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,49 +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;
-
-/**
- *
- * @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";
- }
-
-}
Deleted: 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 2008-03-20 17:05:36 UTC (rev 71085)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTest.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -1,105 +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 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();
-}
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java (from rev 70090, 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 (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java 2008-03-20 17:05:46 UTC (rev 71086)
@@ -0,0 +1,110 @@
+/*
+ * 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