[jboss-cvs] JBossAS SVN: r71062 - in projects/microcontainer/trunk/aop-mc-int/src: resources/tests/org/jboss/test/microcontainer/beans/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 20 10:44:46 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-20 10:44:46 -0400 (Thu, 20 Mar 2008)
New Revision: 71062
Removed:
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java
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/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/LifecycleAopTestCaseNotAutomatic.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
Log:
[JBAOP-468] Get more tests working with the JAXB parsing
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java 2008-03-20 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/LifecycleBeanMetaDataFactory.java 2008-03-20 14:44:46 UTC (rev 71062)
@@ -62,13 +62,13 @@
this.expr = classes;
}
- @XmlAttribute
+ @XmlAttribute(name="install")
public void setInstallMethod(String installMethod)
{
this.installMethod = installMethod;
}
- @XmlAttribute
+ @XmlAttribute(name="uninstall")
public void setUninstallMethod(String uninstallMethod)
{
this.uninstallMethod = uninstallMethod;
@@ -82,12 +82,15 @@
//Do not include the bean factory here, just install the bean directly and the binding
BeanMetaDataBuilder lifecycleBuilder = BeanMetaDataBuilder.createBuilder(name, getBean());
- for (PropertyMetaData pmd : properties)
+ if (properties != null && properties.size() > 0)
{
- lifecycleBuilder.addPropertyMetaData(pmd.getName(), pmd.getValue());
+ for (PropertyMetaData pmd : properties)
+ {
+ lifecycleBuilder.addPropertyMetaData(pmd.getName(), pmd.getValue());
+ }
}
Set<DependencyMetaData> depends = getDepends();
- if (depends != null)
+ if (depends != null && depends.size() > 0)
{
for (DependencyMetaData depend : depends)
{
Modified: 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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/beans/test/DomainSimpleDeploymentTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -43,7 +43,7 @@
<typedef name="TypeDef" expr="class(org.jboss.test.microcontainer.beans.POJO)"/>
<aspect class="org.jboss.test.microcontainer.beans.TestAspectWithProperty">
- <mc:property xmlns:mc="urn:jboss:bean-deployer:2.0" name="someProperty">This is only a test</mc:property>
+ <property 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"/>
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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,12 +6,12 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0"
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCaseNotAutomatic.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -5,12 +5,12 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-configure xmlns="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>
- </aop:lifecycle-configure>
+ </lifecycle-configure>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCaseNotAutomatic1.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCaseNotAutomatic1.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
<property name="simpleBean"><inject bean="Dependency"/></property>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCaseNotAutomatic1.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyForChildTestCaseNotAutomatic2.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyTestCaseNotAutomatic2.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCaseNotAutomatic1.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" name="InterceptedAdvice" class="org.jboss.test.microcontainer.support.InterceptorWithDependency">
<property name="simpleBean"><inject bean="Dependency"/></property>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -10,13 +10,13 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="JMXAspect" class="org.jboss.aop.microcontainer.aspects.jmx.JMXIntroduction">
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" name="JMXAspect" class="org.jboss.aop.microcontainer.aspects.jmx.JMXIntroduction">
<property name="mbeanServer"><inject bean="MBeanServer"/></property>
- </aop:interceptor>
+ </interceptor>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="MetaDataContextAspect" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -10,12 +10,12 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-configure xmlns="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>
- </aop:lifecycle-configure>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,13 +6,13 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="JndiAspect" class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,7 +6,7 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-configure xmlns="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>
- </aop:lifecycle-configure>
+ </lifecycle-configure>
<bean name="Bean" class="org.jboss.test.microcontainer.support.jndi.SimpleBean">
Modified: 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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/LifecycleAopTestCaseNotAutomatic.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -10,41 +10,41 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:lifecycle-configure
+ <lifecycle-configure
name="ConfigureAdvice"
class="org.jboss.test.microcontainer.support.LifecycleCallback"
classes="@org.jboss.test.microcontainer.support.Configure">
- </aop:lifecycle-configure>
+ </lifecycle-configure>
- <aop:lifecycle-create
+ <lifecycle-create
name="CreateAdvice"
class="org.jboss.test.microcontainer.support.LifecycleCallback"
classes="@org.jboss.test.microcontainer.support.Create">
- </aop:lifecycle-create>
+ </lifecycle-create>
- <aop:lifecycle-describe
+ <lifecycle-describe
name="DescribeAdvice"
class="org.jboss.test.microcontainer.support.LifecycleCallback"
classes="@org.jboss.test.microcontainer.support.Describe">
- </aop:lifecycle-describe>
+ </lifecycle-describe>
- <aop:lifecycle-install
+ <lifecycle-install
name="InstallAdvice"
class="org.jboss.test.microcontainer.support.LifecycleCallback"
classes="@org.jboss.test.microcontainer.support.Install">
- </aop:lifecycle-install>
+ </lifecycle-install>
- <aop:lifecycle-instantiate
+ <lifecycle-instantiate
name="InstantiateAdvice"
class="org.jboss.test.microcontainer.support.LifecycleCallback"
classes="@org.jboss.test.microcontainer.support.Instantiate">
- </aop:lifecycle-instantiate>
+ </lifecycle-instantiate>
- <aop:lifecycle-start
+ <lifecycle-start
name="StartAdvice"
class="org.jboss.test.microcontainer.support.LifecycleCallback"
classes="@org.jboss.test.microcontainer.support.Start">
- </aop:lifecycle-start>
+ </lifecycle-start>
<bean name="ConfigureBean" class="org.jboss.test.microcontainer.support.SimpleBeanImpl">
<annotation>@org.jboss.test.microcontainer.support.Configure</annotation>
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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -6,9 +6,9 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0" name="MetaDataContextAspect" class="org.jboss.test.microcontainer.support.MetaDataContextInterceptor">
+ <interceptor xmlns="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>
- </aop:interceptor>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -10,18 +10,18 @@
<constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
</bean>
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-configure xmlns="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>
- </aop:lifecycle-configure>
+ </lifecycle-configure>
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
name="JndiAdvice"
class="org.jboss.test.microcontainer.support.SimpleLifecycleCallback"
classes="org.jboss.test.microcontainer.support.SimpleBeanImpl">
- </aop:lifecycle-configure>
+ </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 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/resources/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCaseNotAutomatic.xml 2008-03-20 14:44:46 UTC (rev 71062)
@@ -4,7 +4,7 @@
<bean name="TheAspectManager" class="org.jboss.test.microcontainer.support.AspectManagerBean">
</bean>
- <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-configure xmlns="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">
- </aop:lifecycle-configure>
+ </lifecycle-configure>
<bean name="Intercepted" class="org.jboss.test.microcontainer.support.SimpleBeanImpl"/>
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java 2008-03-20 14:42:08 UTC (rev 71061)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CopyOfAnnotationOverrideDeploymentTestCase.java 2008-03-20 14:44:46 UTC (rev 71062)
@@ -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 CopyOfAnnotationOverrideDeploymentTestCase extends AnnotationOverrideTest
-{
- public static Test suite()
- {
- return suite(CopyOfAnnotationOverrideDeploymentTestCase.class);
- }
-
- public CopyOfAnnotationOverrideDeploymentTestCase(String test)
- {
- super(test);
- }
-}
More information about the jboss-cvs-commits
mailing list