[jboss-cvs] JBossAS SVN: r64511 - in projects/microcontainer/trunk: kernel/src/main/org/jboss/kernel/plugins/dependency and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 8 10:46:12 EDT 2007
Author: alesj
Date: 2007-08-08 10:46:12 -0400 (Wed, 08 Aug 2007)
New Revision: 64511
Added:
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder0.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder1.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall0.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall1.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder0.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder1.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder0.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder1.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder2.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall0.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall1.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall2.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder0.xml
projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder2.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackCardinalitySimpleBeanRepository.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackSimpleBeanRepository.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackXMLTestCase.java
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java
Log:
Added Callback tests - plain, XML and annotations.
Fixed missing impl in the callback items.
Changed the behaviour on ClassDependencyItem.unresolved - class reference doesn't get removed until depending instance is removed (see AbstractKernelControllerContext.removeClassContextReference).
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractCallbackItem.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractCallbackItem.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -60,6 +60,7 @@
public void ownerCallback(Controller controller, boolean isInstallPhase) throws Throwable
{
+ log.info("Owner callback not implemented.");
}
/**
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -243,7 +243,9 @@
dependencys.addAll(dependencyInfo.getIDependOn(CallbackDependencyItem.class));
for (DependencyItem di : dependencys)
{
- di.unresolved(getController());
+ // can cast because of getIDepend method impl
+ ClassDependencyItem cdi = (ClassDependencyItem)di;
+ cdi.clear(getController());
}
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CallbackDependencyItem.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -83,10 +83,8 @@
return isResolved();
}
- public boolean checkUnresolved(Controller controller, boolean previous)
+ public boolean unresolved(Controller controller)
{
- if (previous == false)
- return false;
if (getIDependOn() == null)
return true;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassAttributeCallbackItem.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -23,10 +23,13 @@
import org.jboss.dependency.plugins.AttributeCallbackItem;
import org.jboss.dependency.spi.Cardinality;
+import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.dependency.spi.dispatch.AttributeDispatchContext;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
/**
* Class callback item - class dependency.
@@ -48,6 +51,22 @@
this.cardinality = cardinality;
}
+ public void ownerCallback(Controller controller, boolean isInstallPhase) throws Throwable
+ {
+ if (controller instanceof KernelController)
+ {
+ KernelController kc = (KernelController)controller;
+ KernelControllerContext context = kc.getContextByClass(getIDependOn());
+ if (context != null)
+ {
+ Object target = context.getTarget();
+ owner.set(getAttributeName(), target);
+ }
+ }
+ else
+ log.info("Controller not KernelController instance, cannot execute owner callback.");
+ }
+
protected DependencyItem createDependencyItem(ControllerContext owner)
{
if (cardinality != null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassDependencyItem.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -22,8 +22,8 @@
package org.jboss.kernel.plugins.dependency;
import org.jboss.dependency.plugins.AbstractDependencyItem;
-import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.Controller;
import org.jboss.util.JBossStringBuilder;
/**
@@ -43,23 +43,14 @@
return (Class)getIDependOn();
}
- public boolean unresolved(Controller controller)
- {
- boolean result = checkUnresolved(controller, super.unresolved(controller));
- setIDependOn(null);
- return result;
- }
-
/**
- * Check some additionl dependency.
- *
+ * Clear the class reference.
+ *
* @param controller the controller
- * @param previous previous result
- * @return see unresolved method
*/
- protected boolean checkUnresolved(Controller controller, boolean previous)
+ public void clear(Controller controller)
{
- return previous;
+ setIDependOn(null);
}
public void toString(JBossStringBuilder buffer)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/ClassSingleCallbackItem.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -21,12 +21,17 @@
*/
package org.jboss.kernel.plugins.dependency;
+import java.util.Set;
+
import org.jboss.dependency.plugins.SingleCallbackItem;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
/**
* Class single dependency item - class dependency.
@@ -58,6 +63,27 @@
this.cardinality = cardinality;
}
+ public void ownerCallback(Controller controller, boolean isInstallPhase) throws Throwable
+ {
+ if (controller instanceof KernelController)
+ {
+ KernelController kc = (KernelController)controller;
+ Set<KernelControllerContext> contexts = kc.getContexts(getIDependOn(), getDependentState());
+ if (contexts != null && contexts.isEmpty() == false)
+ {
+ for(KernelControllerContext context : contexts)
+ {
+ Object target = context.getTarget();
+ if (signature == null)
+ signature = target.getClass().getName();
+ owner.invoke(getAttributeName(), new Object[]{target}, new String[]{signature});
+ }
+ }
+ }
+ else
+ log.info("Controller not KernelController instance, cannot execute owner callback.");
+ }
+
protected DependencyItem createDependencyItem(ControllerContext owner)
{
if (cardinality != null)
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder0.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder0.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder0.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name1" class="org.jboss.test.kernel.dependency.support.SimpleBeanRepository">
+ <incallback method="addSimpleBean"/>
+ <uncallback method="removeSimpleBean"/>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder1.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder1.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackCorrectOrder1.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name2" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall0.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall0.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall0.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name1" class="org.jboss.test.kernel.dependency.support.SimpleBeanRepository">
+ <incallback method="addSimpleBean"/>
+ <uncallback method="removeSimpleBean"/>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall1.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall1.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackReinstall1.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name2" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder0.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder0.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder0.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name1" class="org.jboss.test.kernel.dependency.support.SimpleBeanRepository">
+ <incallback method="addSimpleBean"/>
+ <uncallback method="removeSimpleBean"/>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder1.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder1.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCallbackWrongOrder1.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name2" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder0.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder0.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder0.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name1" class="org.jboss.test.kernel.dependency.support.SimpleBeanRepository">
+ <incallback method="addSimpleBean" cardinality="2..n"/>
+ <uncallback method="removeSimpleBean"/>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder1.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder1.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder1.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name2" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder2.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder2.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackCorrectOrder2.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name3" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall0.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall0.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall0.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name1" class="org.jboss.test.kernel.dependency.support.SimpleBeanRepository">
+ <incallback method="addSimpleBean" cardinality="2..n"/>
+ <uncallback method="removeSimpleBean"/>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall1.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall1.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall1.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name2" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall2.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall2.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackReinstall2.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name3" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder0.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder0.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder0.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name1" class="org.jboss.test.kernel.dependency.support.SimpleBeanRepository">
+ <incallback method="addSimpleBean" cardinality="2..n"/>
+ <uncallback method="removeSimpleBean"/>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder2.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder2.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/xml-test/org/jboss/test/kernel/dependency/test/testCardinalityCallbackWrongOrder2.xml 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Name3" class="org.jboss.test.kernel.dependency.support.SimpleBeanImpl">
+ <property name="string">String1</property>
+ </bean>
+</deployment>
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackCardinalitySimpleBeanRepository.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackCardinalitySimpleBeanRepository.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackCardinalitySimpleBeanRepository.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,40 @@
+/*
+* 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.kernel.dependency.support;
+
+import org.jboss.beans.metadata.plugins.annotations.Install;
+import org.jboss.beans.metadata.plugins.annotations.Uninstall;
+
+public class CallbackCardinalitySimpleBeanRepository extends SimpleBeanRepository
+{
+ @Install(cardinality = "2..n")
+ public void addSimpleBean(SimpleBean bean)
+ {
+ super.addSimpleBean(bean);
+ }
+
+ @Uninstall
+ public void removeSimpleBean(SimpleBean bean)
+ {
+ super.removeSimpleBean(bean);
+ }
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackSimpleBeanRepository.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackSimpleBeanRepository.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/CallbackSimpleBeanRepository.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,40 @@
+/*
+* 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.kernel.dependency.support;
+
+import org.jboss.beans.metadata.plugins.annotations.Install;
+import org.jboss.beans.metadata.plugins.annotations.Uninstall;
+
+public class CallbackSimpleBeanRepository extends SimpleBeanRepository
+{
+ @Install
+ public void addSimpleBean(SimpleBean bean)
+ {
+ super.addSimpleBean(bean);
+ }
+
+ @Uninstall
+ public void removeSimpleBean(SimpleBean bean)
+ {
+ super.removeSimpleBean(bean);
+ }
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackAnnotationTestCase.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,53 @@
+/*
+* 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.kernel.dependency.test;
+
+import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.dependency.spi.Cardinality;
+import org.jboss.test.kernel.dependency.support.CallbackCardinalitySimpleBeanRepository;
+import org.jboss.test.kernel.dependency.support.CallbackSimpleBeanRepository;
+
+/**
+ * Callback tests.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CallbackAnnotationTestCase extends CallbackTestCase
+{
+ public CallbackAnnotationTestCase(String name)
+ throws Throwable
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(CallbackAnnotationTestCase.class);
+ }
+
+ protected AbstractBeanMetaData buildRepository(Cardinality cardinality)
+ {
+ Class clazz = cardinality != null ? CallbackCardinalitySimpleBeanRepository.class : CallbackSimpleBeanRepository.class;
+ return new AbstractBeanMetaData("Name1", clazz.getName());
+ }
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackTestCase.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,301 @@
+/*
+* 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.kernel.dependency.test;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import junit.framework.Test;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.Cardinality;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.kernel.dependency.support.SimpleBeanRepository;
+import org.jboss.test.kernel.dependency.support.SimpleBean;
+import org.jboss.test.kernel.dependency.support.SimpleBeanImpl;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.InstallCallbackMetaData;
+import org.jboss.beans.metadata.plugins.UninstallCallbackMetaData;
+import org.jboss.beans.metadata.spi.CallbackMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+
+/**
+ * Callback tests.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CallbackTestCase extends OldAbstractKernelDependencyTest
+{
+ public CallbackTestCase(String name)
+ throws Throwable
+ {
+ super(name);
+ }
+
+ public CallbackTestCase(String name, boolean xmltest)
+ throws Throwable
+ {
+ super(name, xmltest);
+ }
+
+ public static Test suite()
+ {
+ return suite(CallbackTestCase.class);
+ }
+
+ public void testCallbackCorrectOrder() throws Throwable
+ {
+ callbackCorrectOrder();
+
+ ControllerContext context1 = assertInstall(0, "Name1");
+ SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ List beans = repository.getBeans();
+ assertEmpty(beans);
+
+ ControllerContext context2 = assertInstall(1, "Name2");
+ SimpleBean bean = (SimpleBean)context2.getTarget();
+ assertNotNull(bean);
+
+ assertFalse(beans.isEmpty());
+ assertEquals(1, beans.size());
+ assertTrue(bean == beans.get(0));
+ }
+
+ protected void callbackCorrectOrder() throws Throwable
+ {
+ buildMetaData(buildRepository());
+ }
+
+ public void testCallbackWrongOrder() throws Throwable
+ {
+ callbackWrongOrder();
+
+ ControllerContext context2 = assertInstall(1, "Name2");
+ SimpleBean bean = (SimpleBean)context2.getTarget();
+ assertNotNull(bean);
+
+ ControllerContext context1 = assertInstall(0, "Name1");
+ SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ List beans = repository.getBeans();
+ assertFalse(beans.isEmpty());
+ assertEquals(1, beans.size());
+ assertTrue(bean == beans.get(0));
+ }
+
+ protected void callbackWrongOrder() throws Throwable
+ {
+ buildMetaData(buildRepository());
+ }
+
+ public void testCallbackReinstall() throws Throwable
+ {
+ callbackReinstall();
+
+ ControllerContext context1 = assertInstall(0, "Name1");
+ SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ List beans = repository.getBeans();
+ assertEmpty(beans);
+
+ ControllerContext context2 = assertInstall(1, "Name2");
+ SimpleBean bean = (SimpleBean)context2.getTarget();
+ assertNotNull(bean);
+
+ assertFalse(beans.isEmpty());
+ assertEquals(1, beans.size());
+ assertTrue(bean == beans.get(0));
+
+ assertUninstall("Name1");
+ assertEquals(ControllerState.ERROR, context1.getState());
+ assertEmpty(beans);
+
+ context1 = assertInstall(0, "Name1");
+ repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ beans = repository.getBeans();
+ assertFalse(beans.isEmpty());
+ assertEquals(1, beans.size());
+ assertTrue(bean == beans.get(0));
+
+ assertUninstall("Name2");
+ assertEquals(ControllerState.ERROR, context2.getState());
+ assertEmpty(beans);
+ }
+
+ protected void callbackReinstall() throws Throwable
+ {
+ buildMetaData(buildRepository());
+ }
+
+ public void testCardinalityCallbackCorrectOrder() throws Throwable
+ {
+ callbackCardinalityCorrectOrder();
+
+ ControllerContext context1 = assertInstall(0, "Name1", ControllerState.INSTANTIATED);
+ SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ List beans = repository.getBeans();
+ assertEmpty(beans);
+
+ ControllerContext context2 = assertInstall(1, "Name2");
+ SimpleBean bean1 = (SimpleBean)context2.getTarget();
+ assertNotNull(bean1);
+ assertEmpty(beans);
+
+ ControllerContext context3 = assertInstall(2, "Name3");
+ SimpleBean bean2 = (SimpleBean)context3.getTarget();
+ assertNotNull(bean2);
+
+ assertEquals(ControllerState.INSTALLED, context1.getState());
+ assertFalse(beans.isEmpty());
+ assertEquals(2, beans.size());
+ boolean first = bean1 == beans.get(0);
+ if (first)
+ assertTrue(bean2 == beans.get(1));
+ else
+ assertTrue(bean2 == beans.get(0));
+ }
+
+ protected void callbackCardinalityCorrectOrder() throws Throwable
+ {
+ AbstractBeanMetaData repository = buildRepository(Cardinality.createUnlimitedCardinality(2));
+ buildMetaData(repository);
+ }
+
+ public void testCardinalityCallbackWrongOrder() throws Throwable
+ {
+ callbackCardinalityWrongOrder();
+
+ ControllerContext context2 = assertInstall(1, "Name2");
+ SimpleBean bean1 = (SimpleBean)context2.getTarget();
+ assertNotNull(bean1);
+
+ ControllerContext context3 = assertInstall(2, "Name3");
+ SimpleBean bean2 = (SimpleBean)context3.getTarget();
+
+ ControllerContext context1 = assertInstall(0, "Name1");
+ SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ List beans = repository.getBeans();
+
+ assertFalse(beans.isEmpty());
+ assertEquals(2, beans.size());
+ boolean first = bean1 == beans.get(0);
+ if (first)
+ assertTrue(bean2 == beans.get(1));
+ else
+ assertTrue(bean2 == beans.get(0));
+ }
+
+ protected void callbackCardinalityWrongOrder() throws Throwable
+ {
+ AbstractBeanMetaData repository = buildRepository(Cardinality.createUnlimitedCardinality(2));
+ buildMetaData(repository);
+ }
+
+ public void testCardinalityCallbackReinstall() throws Throwable
+ {
+ callbackCardinalityReinstall();
+
+ ControllerContext context1 = assertInstall(0, "Name1", ControllerState.INSTANTIATED);
+ SimpleBeanRepository repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ List beans = repository.getBeans();
+ assertEmpty(beans);
+
+ ControllerContext context2 = assertInstall(1, "Name2");
+ SimpleBean bean1 = (SimpleBean)context2.getTarget();
+ assertNotNull(bean1);
+ assertEmpty(beans);
+
+ ControllerContext context3 = assertInstall(2, "Name3");
+ SimpleBean bean2 = (SimpleBean)context3.getTarget();
+ assertNotNull(bean2);
+ assertEquals(ControllerState.INSTALLED, context1.getState());
+ assertFalse(beans.isEmpty());
+ assertEquals(2, beans.size());
+
+ assertUninstall("Name1");
+ assertEquals(ControllerState.ERROR, context1.getState());
+ assertEmpty(beans);
+
+ context1 = assertInstall(0, "Name1");
+ repository = (SimpleBeanRepository)context1.getTarget();
+ assertNotNull(repository);
+ beans = repository.getBeans();
+ assertFalse(beans.isEmpty());
+ assertEquals(2, beans.size());
+
+ assertUninstall("Name2");
+ assertEquals(ControllerState.ERROR, context2.getState());
+ assertEquals(ControllerState.INSTANTIATED, context1.getState());
+ assertEmpty(beans);
+
+ assertInstall(1, "Name2");
+ assertEquals(ControllerState.INSTALLED, context1.getState());
+ assertEquals(2, beans.size());
+
+ assertUninstall("Name3");
+ assertEquals(ControllerState.ERROR, context3.getState());
+ assertEquals(ControllerState.INSTANTIATED, context1.getState());
+ assertEmpty(beans);
+ }
+
+ protected void callbackCardinalityReinstall() throws Throwable
+ {
+ AbstractBeanMetaData repository = buildRepository(Cardinality.createUnlimitedCardinality(2));
+ buildMetaData(repository);
+ }
+
+ protected void buildMetaData(BeanMetaData repository)
+ {
+ setBeanMetaDatas(new BeanMetaData[]{
+ repository,
+ new AbstractBeanMetaData("Name2", SimpleBeanImpl.class.getName()),
+ new AbstractBeanMetaData("Name3", SimpleBeanImpl.class.getName())
+ });
+ }
+
+ protected AbstractBeanMetaData buildRepository()
+ {
+ return buildRepository(null);
+ }
+
+ protected AbstractBeanMetaData buildRepository(Cardinality cardinality)
+ {
+ AbstractBeanMetaData repository = new AbstractBeanMetaData("Name1", SimpleBeanRepository.class.getName());
+ List<CallbackMetaData> installs = new ArrayList<CallbackMetaData>();
+ repository.setInstallCallbacks(installs);
+ InstallCallbackMetaData install = new InstallCallbackMetaData();
+ install.setMethodName("addSimpleBean");
+ if (cardinality != null)
+ install.setCardinality(cardinality);
+ installs.add(install);
+ List<CallbackMetaData> unstalls = new ArrayList<CallbackMetaData>();
+ repository.setUninstallCallbacks(unstalls);
+ UninstallCallbackMetaData uninstall = new UninstallCallbackMetaData();
+ uninstall.setMethodName("removeSimpleBean");
+ unstalls.add(uninstall);
+ return repository;
+ }
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackXMLTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackXMLTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/CallbackXMLTestCase.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -0,0 +1,44 @@
+/*
+* 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.kernel.dependency.test;
+
+import junit.framework.Test;
+
+/**
+ * Callback tests.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CallbackXMLTestCase extends CallbackTestCase
+{
+ public CallbackXMLTestCase(String name)
+ throws Throwable
+ {
+ super(name, true);
+ }
+
+ public static Test suite()
+ {
+ return suite(CallbackXMLTestCase.class);
+ }
+
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java 2007-08-08 14:26:52 UTC (rev 64510)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DependencyTestSuite.java 2007-08-08 14:46:12 UTC (rev 64511)
@@ -91,6 +91,9 @@
suite.addTest(PlainAliasTestCase.suite());
suite.addTest(PlainAliasXMLTestCase.suite());
suite.addTest(PlainAliasAnnotationTestCase.suite());
+ suite.addTest(CallbackTestCase.suite());
+ suite.addTest(CallbackXMLTestCase.suite());
+ suite.addTest(CallbackAnnotationTestCase.suite());
return suite;
}
}
More information about the jboss-cvs-commits
mailing list