[jboss-cvs] JBossAS SVN: r83154 - in projects/microcontainer/trunk/kernel/src/test: resources/org/jboss/test/kernel/deployment/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-01-21 08:55:52 -0500 (Wed, 21 Jan 2009)
New Revision: 83154

Modified:
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/FirstBean.java
   projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/SecondBean.java
   projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.xml
Log:
Do programmatic flag markup.

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/FirstBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/FirstBean.java	2009-01-21 13:39:58 UTC (rev 83153)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/FirstBean.java	2009-01-21 13:55:52 UTC (rev 83154)
@@ -44,7 +44,7 @@
       this.tm = tm;
    }
 
-   public void markSecondUninstall()
+   void markSecondUninstall()
    {
       flag = true;
    }

Modified: projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/SecondBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/SecondBean.java	2009-01-21 13:39:58 UTC (rev 83153)
+++ projects/microcontainer/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/support/SecondBean.java	2009-01-21 13:55:52 UTC (rev 83154)
@@ -35,6 +35,9 @@
 
    public void setFirstBean(FirstBean firstBean)
    {
+      if (firstBean == null)
+         this.firstBean.markSecondUninstall();
+      
       this.firstBean = firstBean;
    }
 }
\ No newline at end of file

Modified: projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.xml	2009-01-21 13:39:58 UTC (rev 83153)
+++ projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/kernel/deployment/test/TransitiveBeansTestCase.xml	2009-01-21 13:55:52 UTC (rev 83154)
@@ -10,7 +10,6 @@
 
   <bean name="SecondBean" class="org.jboss.test.kernel.deployment.support.SecondBean">
     <property name="firstBean"><inject bean="FirstBean"/></property>
-    <uninstall method="markSecondUninstall" bean="FirstBean" whenRequired="Configure"/>
   </bean>
 
 </deployment>