[jboss-cvs] aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test ...
Kabir Khan
kkhan at jboss.com
Wed Jul 19 14:22:15 EDT 2006
User: kkhan
Date: 06/07/19 14:22:15
Modified: src/resources/tests/org/jboss/test/microcontainer/test
InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
IntroductionDependencyTestCaseNotAutomatic1.xml
ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
JMXDecoratedTestCase.xml
InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
MetaDataTestCase.xml
InterceptorWithDependencyTestCaseNotAutomatic1.xml
InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
MixinTestCase.xml
Log:
[JBMICROCONT-98] Make the annotation metadata more free format
Revision Changes Path
1.2 +20 -36 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 4 Jul 2006 13:18:47 -0000 1.1
+++ InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -18,64 +18,48 @@
<bean name="NotDeployable1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
</bean>
<bean name="NotDeployable2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
</bean>
<bean name="Depends1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
</bean>
<bean name="Depends2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
</bean>
<bean name="Depends1And2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
</bean>
1.2 +4 -4 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IntroductionDependencyTestCaseNotAutomatic1.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- IntroductionDependencyTestCaseNotAutomatic1.xml 24 Jun 2006 17:41:34 -0000 1.1
+++ IntroductionDependencyTestCaseNotAutomatic1.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -24,7 +24,7 @@
</bean>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
<bean name="Plain" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
1.2 +4 -4 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml 24 Jun 2006 16:08:51 -0000 1.1
+++ ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -14,7 +14,7 @@
</aop:aspect>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
</deployment>
1.2 +20 -36 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 4 Jul 2006 17:55:50 -0000 1.1
+++ InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -18,64 +18,48 @@
<bean name="NotDeployable1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
</bean>
<bean name="NotDeployable2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
</bean>
<bean name="Depends1" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
</bean>
<bean name="Depends2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
</bean>
<bean name="Depends1And2" class="org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedChild">
<property name="propertyA">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency1"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency1")</annotation>
</property>
<property name="propertyB">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency2"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency2")</annotation>
</property>
</bean>
1.3 +14 -19 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JMXDecoratedTestCase.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- JMXDecoratedTestCase.xml 3 May 2006 14:30:10 -0000 1.2
+++ JMXDecoratedTestCase.xml 19 Jul 2006 18:22:15 -0000 1.3
@@ -53,16 +53,11 @@
</bean>
<bean name="Bean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.aop.microcontainer.aspects.jmx.JMX">
- <attribute name="exposedInterface" value="org.jboss.test.microcontainer.support.SimpleBean"/>
- </annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="", exposedInterface=org.jboss.test.microcontainer.support.SimpleBean.class)</annotation>
</bean>
<bean name="Bean1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.aop.microcontainer.aspects.jmx.JMX">
- <attribute name="name" value="test:name=NotBean1"/>
- <attribute name="exposedInterface" value="org.jboss.test.microcontainer.support.SimpleBeanImplMBean"/>
- </annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:name=NotBean1", exposedInterface=org.jboss.test.microcontainer.support.SimpleBeanImplMBean.class)</annotation>
</bean>
<bean name="AnnotatedBean" class="org.jboss.test.microcontainer.support.SimpleBeanAnnotatedImpl"/>
1.2 +5 -7 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 4 Jul 2006 13:18:47 -0000 1.1
+++ InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -14,10 +14,8 @@
</aop:aspect>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.OverriddenAnnotationSimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency"/>
- </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"/>
1.3 +4 -4 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 11 Jul 2006 13:41:50 -0000 1.2
+++ InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 19 Jul 2006 18:22:15 -0000 1.3
@@ -15,10 +15,10 @@
<!-- TODO JBAOP-274 Figure out how to create nested dependencies with beans.xml
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
-->
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedAnnotatedSimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
</deployment>
1.2 +4 -4 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 11 Jul 2006 13:55:48 -0000 1.1
+++ InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -15,10 +15,10 @@
<!-- TODO JBAOP-274 Figure out how to create nested dependencies with beans.xml
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
-->
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.NestedMethodAnnotatedSimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
</deployment>
1.3 +9 -9 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MetaDataTestCase.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MetaDataTestCase.xml 3 May 2006 14:30:10 -0000 1.2
+++ MetaDataTestCase.xml 19 Jul 2006 18:22:15 -0000 1.3
@@ -26,14 +26,14 @@
</bean>
<bean name="Bean" class="org.jboss.test.microcontainer.support.PropertyBean">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
<property name="intProperty">5</property>
<property name="stringProperty">Bean</property>
</bean>
<bean name="Bean1" class="org.jboss.test.microcontainer.support.PropertyBean">
<property name="intProperty">10
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</property>
<property name="stringProperty">Bean1</property>
</bean>
1.3 +4 -4 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithDependencyTestCaseNotAutomatic1.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- InterceptorWithDependencyTestCaseNotAutomatic1.xml 3 May 2006 14:30:10 -0000 1.2
+++ InterceptorWithDependencyTestCaseNotAutomatic1.xml 19 Jul 2006 18:22:15 -0000 1.3
@@ -14,7 +14,7 @@
</aop:aspect>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
</deployment>
1.4 +8 -12 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 22 May 2006 11:37:29 -0000 1.3
+++ InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 19 Jul 2006 18:22:15 -0000 1.4
@@ -14,21 +14,17 @@
</aop:aspect>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency")</annotation>
</bean>
<bean name="AnnotatedIntercepted" class="org.jboss.test.microcontainer.support.AnnotatedSimpleBeanImpl"/>
<bean name="MethodIntercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <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
- <annotation name="org.jboss.test.microcontainer.support.TestAnnotationDependency">
- <attribute name="data" value="Dependency"/>
- </annotation>
+ <annotation>@org.jboss.test.microcontainer.support.TestAnnotationDependency(data="Dependency")</annotation>
</property>
</bean>
1.2 +6 -6 aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MixinTestCase.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MixinTestCase.xml
===================================================================
RCS file: /cvsroot/jboss/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MixinTestCase.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MixinTestCase.xml 22 May 2006 20:58:41 -0000 1.1
+++ MixinTestCase.xml 19 Jul 2006 18:22:15 -0000 1.2
@@ -37,7 +37,7 @@
</bean>
<bean name="Bean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- <annotation name="org.jboss.test.microcontainer.support.Test"/>
+ <annotation>@org.jboss.test.microcontainer.support.Test</annotation>
</bean>
<bean name="Bean1" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
More information about the jboss-cvs-commits
mailing list