[Jboss-cvs] JBossAS SVN: r55527 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/beans/metadata/plugins main/org/jboss/beans/metadata/spi main/org/jboss/kernel/plugins/deployment/xml tests/org/jboss/test/kernel/config/support tests/org/jboss/test/kernel/dependency/test tests/org/jboss/test/kernel/deployment/xml/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 11 11:17:16 EDT 2006
Author: adrian at jboss.org
Date: 2006-08-11 11:17:03 -0400 (Fri, 11 Aug 2006)
New Revision: 55527
Removed:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/mbeanserver/
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanDependsInterceptor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainLifecycleDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java
Log:
Generification of DependencyMetaData.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -32,6 +32,7 @@
import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.beans.metadata.spi.DemandMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.beans.metadata.spi.InstallMetaData;
import org.jboss.beans.metadata.spi.LifecycleMetaData;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
@@ -86,6 +87,9 @@
/** What the bean supplies Set<SupplyMetaData> */
protected Set<SupplyMetaData> supplies;
+ /** What the bean dependencies Set<DependencyMetaData> */
+ protected Set<DependencyMetaData> depends;
+
/** The install operations List<InstallMetaData> */
protected List<InstallMetaData> installs;
@@ -236,6 +240,17 @@
flushJBossObjectCache();
}
+ /**
+ * Set what the bean depends.
+ *
+ * @param depends Set<DependencyMetaData>
+ */
+ public void setDepends(Set<DependencyMetaData> depends)
+ {
+ this.depends = depends;
+ flushJBossObjectCache();
+ }
+
public String getName()
{
return name;
@@ -346,6 +361,11 @@
{
return supplies;
}
+
+ public Set<DependencyMetaData> getDepends()
+ {
+ return depends;
+ }
public List<InstallMetaData> getInstalls()
{
@@ -400,6 +420,8 @@
children.addAll(demands);
if (supplies != null)
children.addAll(supplies);
+ if (depends != null)
+ children.addAll(depends);
if (installs != null)
children.addAll(installs);
if (uninstalls != null)
@@ -434,6 +456,11 @@
buffer.append(" supplies=");
JBossObject.list(buffer, supplies);
}
+ if (depends != null)
+ {
+ buffer.append(" depends=");
+ JBossObject.list(buffer, depends);
+ }
if (installs != null)
{
buffer.append(" installs=");
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -138,6 +138,13 @@
* @return Set<SupplyMetaData>
*/
Set<SupplyMetaData> getSupplies();
+
+ /**
+ * Get what this bean depends.
+ *
+ * @return Set<DependencyMetaData>
+ */
+ Set<DependencyMetaData> getDepends();
/**
* Get the installation oeprations.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanDependsInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanDependsInterceptor.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanDependsInterceptor.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -28,6 +28,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor;
/**
@@ -45,12 +46,12 @@
{
AbstractBeanMetaData bean = (AbstractBeanMetaData) parent;
AbstractDependencyMetaData dependency = (AbstractDependencyMetaData) child;
- Set demands = bean.getDemands();
- if (demands == null)
+ Set<DependencyMetaData> depends = bean.getDepends();
+ if (depends == null)
{
- demands = new HashSet();
- bean.setDemands(demands);
+ depends = new HashSet<DependencyMetaData>();
+ bean.setDepends(depends);
}
- demands.add(dependency);
+ depends.add(dependency);
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -49,6 +49,7 @@
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.DemandMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
@@ -650,13 +651,13 @@
{
AbstractBeanMetaData bean = (AbstractBeanMetaData) parent;
AbstractDependencyMetaData dependency = (AbstractDependencyMetaData) child;
- Set demands = bean.getDemands();
- if (demands == null)
+ Set<DependencyMetaData> depends = bean.getDepends();
+ if (depends == null)
{
- demands = new HashSet();
- bean.setDemands(demands);
+ depends = new HashSet<DependencyMetaData>();
+ bean.setDepends(depends);
}
- demands.add(dependency);
+ depends.add(dependency);
}
});
@@ -667,13 +668,13 @@
{
GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
AbstractDependencyMetaData dependency = (AbstractDependencyMetaData) child;
- Set demands = bean.getDemands();
- if (demands == null)
+ Set<DependencyMetaData> depends = bean.getDepends();
+ if (depends == null)
{
- demands = new HashSet();
- bean.setDemands(demands);
+ depends = new HashSet<DependencyMetaData>();
+ bean.setDepends(depends);
}
- demands.add(dependency);
+ depends.add(dependency);
}
});
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainLifecycleDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainLifecycleDependencyTestCase.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainLifecycleDependencyTestCase.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -30,6 +30,7 @@
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.test.kernel.dependency.support.SimpleBeanWithLifecycle;
@@ -82,9 +83,9 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
- HashSet demands = new HashSet();
- demands.add(new AbstractDependencyMetaData("Name1"));
- metaData2.setDemands(demands);
+ HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
+ depends.add(new AbstractDependencyMetaData("Name1"));
+ metaData2.setDepends(depends);
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
@@ -115,9 +116,9 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
- HashSet demands = new HashSet();
- demands.add(new AbstractDependencyMetaData("Name1"));
- metaData2.setDemands(demands);
+ HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
+ depends.add(new AbstractDependencyMetaData("Name1"));
+ metaData2.setDepends(depends);
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
@@ -180,9 +181,9 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
- HashSet demands = new HashSet();
- demands.add(new AbstractDependencyMetaData("Name1"));
- metaData2.setDemands(demands);
+ HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
+ depends.add(new AbstractDependencyMetaData("Name1"));
+ metaData2.setDepends(depends);
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/PlainLifecycleDependencyTestCase.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -28,6 +28,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.test.kernel.dependency.support.SimpleBeanWithLifecycle;
@@ -79,9 +80,9 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
AbstractBeanMetaData metaData2 = new AbstractBeanMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
- HashSet demands = new HashSet();
- demands.add(new AbstractDependencyMetaData("Name1"));
- metaData2.setDemands(demands);
+ HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
+ depends.add(new AbstractDependencyMetaData("Name1"));
+ metaData2.setDepends(depends);
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
@@ -111,9 +112,9 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
AbstractBeanMetaData metaData2 = new AbstractBeanMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
- HashSet demands = new HashSet();
- demands.add(new AbstractDependencyMetaData("Name1"));
- metaData2.setDemands(demands);
+ HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
+ depends.add(new AbstractDependencyMetaData("Name1"));
+ metaData2.setDepends(depends);
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
@@ -180,9 +181,9 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
AbstractBeanMetaData metaData2 = new AbstractBeanMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
- HashSet demands = new HashSet();
- demands.add(new AbstractDependencyMetaData("Name1"));
- metaData2.setDemands(demands);
+ HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
+ depends.add(new AbstractDependencyMetaData("Name1"));
+ metaData2.setDepends(depends);
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -189,14 +189,13 @@
fail("Expected " + expected + " got " + properties);
}
- protected void assertDepends(Set<String> expected, Set depends)
+ protected void assertDepends(Set<String> expected, Set<DependencyMetaData> depends)
{
assertNotNull(depends);
assertEquals(expected.size(), depends.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = depends.iterator(); i.hasNext();)
+ for (DependencyMetaData depend : depends)
{
- DependencyMetaData depend = (DependencyMetaData) i.next();
if (clonedExpected.remove(depend.getDependency()) == false)
fail("Did not expect " + depend + " expected " + expected);
}
@@ -209,9 +208,8 @@
assertNotNull(demands);
assertEquals(expected.size(), demands.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = demands.iterator(); i.hasNext();)
+ for (DemandMetaData demand : demands)
{
- DemandMetaData demand = (DemandMetaData) i.next();
if (clonedExpected.remove(demand.getDemand()) == false)
fail("Did not expect " + demand + " expected " + expected);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -59,7 +59,6 @@
Annotation ann = annotation.getAnnotationInstance();
assertEquals(Annotation1.class.getName(), ann.annotationType().getName());
assertTrue(ann instanceof Annotation1);
- Annotation1 ann1 = (Annotation1)ann;
}
public void testAnnotationWithAttribute() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -287,7 +287,7 @@
assertNull(factory.getDestroy());
HashSet<String> expected = new HashSet<String>();
expected.add("Depends1");
- assertDepends(expected, factory.getDemands());
+ assertDepends(expected, factory.getDepends());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
assertNull(factory.getUninstalls());
@@ -316,7 +316,7 @@
expected.add("Depends1");
expected.add("Depends2");
expected.add("Depends3");
- assertDepends(expected, factory.getDemands());
+ assertDepends(expected, factory.getDepends());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
assertNull(factory.getUninstalls());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -325,7 +325,7 @@
assertNull(bean.getDestroy());
HashSet<String> expected = new HashSet<String>();
expected.add("Depends1");
- assertDepends(expected, bean.getDemands());
+ assertDepends(expected, bean.getDepends());
assertNull(bean.getSupplies());
assertNull(bean.getInstalls());
assertNull(bean.getUninstalls());
@@ -349,7 +349,7 @@
expected.add("Depends1");
expected.add("Depends2");
expected.add("Depends3");
- assertDepends(expected, bean.getDemands());
+ assertDepends(expected, bean.getDepends());
assertNull(bean.getSupplies());
assertNull(bean.getInstalls());
assertNull(bean.getUninstalls());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java 2006-08-11 15:16:26 UTC (rev 55526)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java 2006-08-11 15:17:03 UTC (rev 55527)
@@ -27,6 +27,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
/**
* DependencyTestCase.
@@ -39,7 +40,7 @@
protected AbstractDependencyMetaData getDependency(String name) throws Exception
{
AbstractBeanMetaData bean = unmarshalBean(name);
- Set dependencies = bean.getDemands();
+ Set<DependencyMetaData> dependencies = bean.getDepends();
assertNotNull(dependencies);
assertEquals(1, dependencies.size());
AbstractDependencyMetaData dependency = (AbstractDependencyMetaData) dependencies.iterator().next();
More information about the jboss-cvs-commits
mailing list