[jboss-cvs] JBossAS SVN: r100963 - in projects/kernel/trunk/aop-mc-int/src: main/java/org/jboss/aop/microcontainer/integration and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 15 06:55:34 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-15 06:55:33 -0500 (Mon, 15 Feb 2010)
New Revision: 100963
Added:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopAnnotationDependency.java
Modified:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java
projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/OverriddenAnnotationSimpleBeanImpl.java
projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
Log:
[JBKERNEL-98] Don't check @Dependency annotation dependencies unless @EnableAopAnnotationDependency is there
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/DisabledType.java 2010-02-15 11:55:33 UTC (rev 100963)
@@ -34,7 +34,8 @@
{
ALL,
LIFECYCLE,
- POINTCUTS;
+ POINTCUTS,
+ ANNOTATION_DEPENDENCIES;
/**
* Is the type disabled for this constraint.
Added: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopAnnotationDependency.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopAnnotationDependency.java (rev 0)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopAnnotationDependency.java 2010-02-15 11:55:33 UTC (rev 100963)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(ElementType.TYPE)
+public @interface EnableAopAnnotationDependency {
+
+}
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/annotations/EnableAopProxy.java 2010-02-15 11:55:33 UTC (rev 100963)
@@ -21,12 +21,19 @@
*/
package org.jboss.aop.microcontainer.annotations;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
/**
* Use to enable aop proxies for a bean. By default they are disabled
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(ElementType.TYPE)
public @interface EnableAopProxy {
}
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2010-02-15 11:55:33 UTC (rev 100963)
@@ -132,10 +132,13 @@
}
}
- HashSet<String> annotationDependencies = getAnnotationDependencies(beanInfo.getClassInfo(), metaData);
- for (String dependency : annotationDependencies)
+ if (bypassAOP(beanInfo, metaData, DisabledType.ANNOTATION_DEPENDENCIES) == false)
{
- depends.add(new AnnotationDependencyBuilderListItem(dependency));
+ HashSet<String> annotationDependencies = getAnnotationDependencies(beanInfo.getClassInfo(), metaData);
+ for (String dependency : annotationDependencies)
+ {
+ depends.add(new AnnotationDependencyBuilderListItem(dependency));
+ }
}
return depends;
}
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/DisableAOPHelper.java 2010-02-15 11:55:33 UTC (rev 100963)
@@ -23,6 +23,7 @@
import org.jboss.aop.microcontainer.annotations.DisableAOP;
import org.jboss.aop.microcontainer.annotations.DisabledType;
+import org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency;
import org.jboss.aop.microcontainer.annotations.EnableAopProxy;
import org.jboss.metadata.spi.MetaData;
@@ -45,11 +46,6 @@
{
if (metaData != null)
{
- Boolean legacyDisabled = null;
- DisableAOP aop = metaData.getAnnotation(DisableAOP.class);
- if (aop != null)
- legacyDisabled = DisabledType.isDisabled(aop.value(), constraint);
-
if (constraint == DisabledType.POINTCUTS)
{
EnableAopProxy proxy = metaData.getAnnotation(EnableAopProxy.class);
@@ -57,8 +53,19 @@
return false;
return true;
}
+ else if (constraint == DisabledType.ANNOTATION_DEPENDENCIES)
+ {
+ EnableAopAnnotationDependency proxy = metaData.getAnnotation(EnableAopAnnotationDependency.class);
+ if (proxy != null)
+ return false;
+ return true;
+ }
else if (constraint == DisabledType.ALL)
{
+ Boolean legacyDisabled = null;
+ DisableAOP aop = metaData.getAnnotation(DisableAOP.class);
+ if (aop != null)
+ legacyDisabled = DisabledType.isDisabled(aop.value(), constraint);
if (legacyDisabled != null)
return legacyDisabled;
return false;
Modified: projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/OverriddenAnnotationSimpleBeanImpl.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/OverriddenAnnotationSimpleBeanImpl.java 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/OverriddenAnnotationSimpleBeanImpl.java 2010-02-15 11:55:33 UTC (rev 100963)
@@ -21,6 +21,9 @@
*/
package org.jboss.test.microcontainer.support;
+import org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency;
+import org.jboss.aop.microcontainer.annotations.EnableAopProxy;
+
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -28,6 +31,8 @@
*/
@Test
@TestAnnotationDependency(data="OverriddenByXml")
+ at EnableAopAnnotationDependency
+ at EnableAopProxy
public class OverriddenAnnotationSimpleBeanImpl implements SimpleBean, SimpleBeanImplMBean
{
Modified: projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 2010-02-15 11:55:33 UTC (rev 100963)
@@ -16,16 +16,19 @@
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency")</annotation>
</bean>
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.AnnotatedSimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
</bean>
<bean name="MethodIntercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<!-- no way to annotate methods via xml yet, so let us do a property -->
<property name="property">10
@@ -35,5 +38,6 @@
<bean name="MethodAnnotatedIntercepted" class="org.jboss.test.microcontainer.support.MethodAnnotatedSimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
</bean>
</deployment>
Modified: projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2010-02-15 11:55:33 UTC (rev 100963)
@@ -16,12 +16,14 @@
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.Containing(dependency=@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1"), contained=@org.jboss.test.microcontainer.support.Contained(dependencies= {@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2"), @org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency3")}))</annotation>
</bean>
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedAnnotatedSimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
</deployment>
Modified: projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2010-02-15 11:55:33 UTC (rev 100963)
@@ -16,12 +16,14 @@
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.Containing(dependency=@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1"), contained=@org.jboss.test.microcontainer.support.Contained(dependencies= {@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2"), @org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency3")}))</annotation>
</bean>
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedMethodAnnotatedSimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
</deployment>
Modified: projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 2010-02-15 11:55:33 UTC (rev 100963)
@@ -16,12 +16,12 @@
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.OverriddenAnnotationSimpleBeanImpl">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency")</annotation>
</bean>
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.OverriddenAnnotationSimpleBeanImpl">
- <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
</bean>
</deployment>
Modified: projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 2010-02-15 11:55:33 UTC (rev 100963)
@@ -16,10 +16,12 @@
<bean name="NotDeployable" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
</bean>
<bean name="NotDeployable1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
@@ -28,6 +30,7 @@
<bean name="NotDeployable2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyB">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
@@ -36,6 +39,7 @@
<bean name="Depends1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
@@ -49,6 +53,7 @@
<bean name="Depends2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
@@ -62,6 +67,7 @@
<bean name="Depends1And2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
Modified: projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 2010-02-15 11:17:04 UTC (rev 100962)
+++ projects/kernel/trunk/aop-mc-int/src/test/resources/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 2010-02-15 11:55:33 UTC (rev 100963)
@@ -16,10 +16,12 @@
<bean name="NotDeployable" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
</bean>
<bean name="NotDeployable1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
@@ -28,6 +30,7 @@
<bean name="NotDeployable2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyB">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
@@ -36,6 +39,7 @@
<bean name="Depends1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
@@ -48,6 +52,7 @@
<bean name="Depends2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
@@ -60,6 +65,7 @@
<bean name="Depends1And2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+ <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopAnnotationDependency</annotation>
<property name="propertyA">10
<annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
More information about the jboss-cvs-commits
mailing list