[jboss-cvs] JBossAS SVN: r71101 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/kernel/plugins/config and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 20 16:51:02 EDT 2008
Author: adrian at jboss.org
Date: 2008-03-20 16:51:01 -0400 (Thu, 20 Mar 2008)
New Revision: 71101
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/AbstractInjectionValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryConstructorInterceptor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryCreateInterceptor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryHandler.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryPropertyInterceptor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryStartInterceptor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/GenericFactoryInstantiateTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryConstructorDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryField2PropertyDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryFieldPropertyDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryInstallDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainDependencyTestCase.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/GenericBeanFactoryPropertyDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/FineGrainedBean.java
Log:
Be quiet
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 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -706,7 +706,7 @@
return name;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation"})
public Object getValue(TypeInfo info, ClassLoader cl) throws Throwable
{
if (context == null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -152,7 +152,7 @@
return lookupExists || isCallback;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation"})
public Object getValue(TypeInfo info, ClassLoader cl) throws Throwable
{
// controller context property injection
@@ -267,6 +267,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void describeVisit(MetaDataVisitor visitor)
{
// no bean and not by_name
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/CallbackCreatorUtil.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -72,7 +72,7 @@
* @param cardinality cardinality
* @return collection callback item
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation"})
private static CallbackItem<Class<?>> createCollectionCallback(
TypeInfo info,
KernelControllerContext context,
@@ -108,7 +108,7 @@
* @param cardinality cardinality
* @return callback item
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "deprecation"})
public static CallbackItem<Class<?>> createCallback(
KernelControllerContext context,
AttributeInfo ai,
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/AbstractKernelConfigurator.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -167,6 +167,7 @@
return Configurator.getPropertyNullerJoinPoints(info, metaData);
}
+ @Deprecated
public TargettedJoinpoint getPropertyNullerJoinPoint(BeanInfo info, PropertyMetaData metaData) throws Throwable
{
return Configurator.getPropertyNullerJoinPoint(info, metaData);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -712,6 +712,7 @@
* @return the property info
* @throws Throwable for any error
*/
+ @SuppressWarnings("deprecation")
public static PropertyInfo resolveProperty(boolean trace, BeanInfo info, ClassLoader cl, String name, String type) throws Throwable
{
if (info == null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractConfigureAction.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -21,15 +21,14 @@
*/
package org.jboss.kernel.plugins.dependency;
+import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.ConfigureKernelControllerContextAware;
import org.jboss.kernel.spi.dependency.CreateKernelControllerContextAware;
-import org.jboss.kernel.spi.dependency.DescribeKernelControllerContextAware;
import org.jboss.kernel.spi.dependency.InstallKernelControllerContextAware;
import org.jboss.kernel.spi.dependency.InstantiateKernelControllerContextAware;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
import org.jboss.kernel.spi.dependency.StartKernelControllerContextAware;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.dependency.spi.ControllerState;
/**
* AbstractConfigureAction.
@@ -88,13 +87,14 @@
* @param o the target to test
* @return true if exact match
*/
+ @SuppressWarnings("deprecation")
protected boolean isExactlyKernelControllerContextAware(Object o)
{
Class<?> clazz = o.getClass();
return KernelControllerContextAware.class.isAssignableFrom(clazz) &&
(!ConfigureKernelControllerContextAware.class.isAssignableFrom(clazz) &&
!CreateKernelControllerContextAware.class.isAssignableFrom(clazz) &&
- !DescribeKernelControllerContextAware.class.isAssignableFrom(clazz) &&
+ !org.jboss.kernel.spi.dependency.DescribeKernelControllerContextAware.class.isAssignableFrom(clazz) &&
!InstallKernelControllerContextAware.class.isAssignableFrom(clazz) &&
!InstantiateKernelControllerContextAware.class.isAssignableFrom(clazz) &&
!StartKernelControllerContextAware.class.isAssignableFrom(clazz));
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryConstructorInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryConstructorInterceptor.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryConstructorInterceptor.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor;
/**
@@ -38,9 +37,10 @@
/** The interceptor */
public static final BeanFactoryConstructorInterceptor INTERCEPTOR = new BeanFactoryConstructorInterceptor();
+ @SuppressWarnings("deprecation")
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractConstructorMetaData constructor = (AbstractConstructorMetaData) child;
bean.setBeanConstructor(constructor);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryCreateInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryCreateInterceptor.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryCreateInterceptor.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor;
/**
@@ -38,9 +37,10 @@
/** The interceptor */
public static final BeanFactoryCreateInterceptor INTERCEPTOR = new BeanFactoryCreateInterceptor();
+ @SuppressWarnings("deprecation")
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractLifecycleMetaData lifecycle = (AbstractLifecycleMetaData) child;
lifecycle.setType("create");
bean.setBeanCreate(lifecycle);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryHandler.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryHandler.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -24,11 +24,10 @@
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+import org.jboss.beans.info.spi.BeanAccessMode;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.info.spi.BeanAccessMode;
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementHandler;
import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding;
@@ -45,14 +44,16 @@
/** The handler */
public static final BeanFactoryHandler HANDLER = new BeanFactoryHandler();
+ @SuppressWarnings("deprecation")
public Object startElement(Object parent, QName name, ElementBinding element)
{
- return new GenericBeanFactoryMetaData();
+ return new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData();
}
+ @SuppressWarnings("deprecation")
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) o;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) o;
for (int i = 0; i < attrs.getLength(); ++i)
{
String localName = attrs.getLocalName(i);
@@ -76,9 +77,10 @@
}
}
+ @SuppressWarnings("deprecation")
public Object endElement(Object o, QName qName, ElementBinding element)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) o;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) o;
if (bean.getBeanClass() == null)
{
PropertyMetaData property = bean.getProperty("constructor");
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryPropertyInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryPropertyInterceptor.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryPropertyInterceptor.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor;
/**
@@ -38,9 +37,11 @@
/** The interceptor */
public static final BeanFactoryPropertyInterceptor INTERCEPTOR = new BeanFactoryPropertyInterceptor();
+ @Deprecated
+ @SuppressWarnings("deprecation")
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractPropertyMetaData property = (AbstractPropertyMetaData) child;
bean.addBeanProperty(property);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryStartInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryStartInterceptor.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanFactoryStartInterceptor.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor;
/**
@@ -38,9 +37,10 @@
/** The interceptor */
public static final BeanFactoryStartInterceptor INTERCEPTOR = new BeanFactoryStartInterceptor();
+ @SuppressWarnings("deprecation")
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractLifecycleMetaData lifecycle = (AbstractLifecycleMetaData) child;
lifecycle.setType("start");
bean.setBeanStart(lifecycle);
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 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -49,7 +49,6 @@
import org.jboss.beans.metadata.api.model.FromContext;
import org.jboss.beans.metadata.api.model.AutowireType;
import org.jboss.beans.metadata.plugins.StringValueMetaData;
-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;
@@ -77,6 +76,7 @@
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at SuppressWarnings("deprecation")
public class BeanSchemaBinding
{
/** The log */
@@ -362,12 +362,12 @@
{
public Object startElement(Object parent, QName name, ElementBinding element)
{
- return new GenericBeanFactoryMetaData();
+ return new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData();
}
public void attributes(Object o, QName elementName, ElementBinding element, Attributes attrs, NamespaceContext nsCtx)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) o;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) o;
for (int i = 0; i < attrs.getLength(); ++i)
{
String localName = attrs.getLocalName(i);
@@ -399,7 +399,7 @@
{
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractClassLoaderMetaData classloader = (AbstractClassLoaderMetaData) child;
bean.setClassLoader(classloader);
}
@@ -421,7 +421,7 @@
{
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractConstructorMetaData constructor = (AbstractConstructorMetaData) child;
bean.setBeanConstructor(constructor);
}
@@ -574,7 +574,7 @@
{
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractLifecycleMetaData lifecycle = (AbstractLifecycleMetaData) child;
lifecycle.setType("create");
bean.setBeanCreate(lifecycle);
@@ -598,7 +598,7 @@
{
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractLifecycleMetaData lifecycle = (AbstractLifecycleMetaData) child;
lifecycle.setType("start");
bean.setBeanStart(lifecycle);
@@ -692,7 +692,7 @@
{
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractPropertyMetaData property = (AbstractPropertyMetaData) child;
bean.addBeanProperty(property);
}
@@ -720,7 +720,7 @@
{
public void add(Object parent, Object child, QName name)
{
- GenericBeanFactoryMetaData bean = (GenericBeanFactoryMetaData) parent;
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData bean = (org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData) parent;
AbstractDependencyMetaData dependency = (AbstractDependencyMetaData) child;
Set<DependencyMetaData> depends = bean.getDepends();
if (depends == null)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/AbstractLazyInitializer.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -209,6 +209,7 @@
* @return array of classes
* @throws Throwable for any error
*/
+ @SuppressWarnings("deprecation")
protected static Class<?>[] getClasses(KernelConfigurator configurator, Set<String> classNames, ClassLoader cl)
throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JDKLazyInitializer.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -39,6 +39,7 @@
*/
public class JDKLazyInitializer extends AbstractLazyInitializer
{
+ @SuppressWarnings("deprecation")
public Object initializeProxy(Kernel kernel, String bean, boolean exposeClass, Set<String> interfaces) throws Throwable
{
if (exposeClass)
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/lazy/JavassistLazyInitializer.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -43,6 +43,7 @@
*/
public class JavassistLazyInitializer extends AbstractLazyInitializer
{
+ @SuppressWarnings("deprecation")
public Object initializeProxy(Kernel kernel, String bean, boolean exposeClass, Set<String> interfaces) throws Throwable
{
KernelControllerContext context = getKernelControllerContext(kernel, bean);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -135,6 +135,7 @@
assertEquals("Uninstall", slb.getInstall());
}
+ @SuppressWarnings("deprecation")
public void testDemandSupply() throws Throwable
{
BeanMetaDataBuilder demand = BeanMetaDataBuilderFactory.createBuilder("DemandBean", SimpleBean.class.getName());
@@ -162,7 +163,8 @@
deployer.undeploy(deployment);
}
- public void testDependency() throws Throwable
+ @SuppressWarnings("deprecation")
+ public void testDependency() throws Throwable
{
BeanMetaDataBuilder dependOn = BeanMetaDataBuilderFactory.createBuilder("DependOnBean", SimpleBean.class.getName());
dependOn.addDependency("DependencyResolver");
@@ -188,7 +190,8 @@
deployer.undeploy(deployment);
}
- public void testCollectionProperties() throws Throwable
+ @SuppressWarnings("deprecation")
+ public void testCollectionProperties() throws Throwable
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("CollectionBean", SimpleBean.class.getName());
@@ -257,7 +260,8 @@
assertEquals("Dos", mp.get("Two"));
}
- public void testReplacePropertyMetaData() throws Throwable
+ @SuppressWarnings("deprecation")
+ public void testReplacePropertyMetaData() throws Throwable
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("ReplaceBean", SimpleBean.class.getName());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/GenericFactoryInstantiateTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/GenericFactoryInstantiateTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/GenericFactoryInstantiateTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -22,14 +22,14 @@
package org.jboss.test.kernel.config.test;
import junit.framework.Test;
+
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.spi.factory.BeanFactory;
+import org.jboss.test.kernel.config.support.MyBeanFactory;
import org.jboss.test.kernel.config.support.SimpleBean;
import org.jboss.test.kernel.config.support.SimpleBeanFactory;
-import org.jboss.test.kernel.config.support.MyBeanFactory;
/**
* GenericFactory Instantiation Test Case.
@@ -71,9 +71,10 @@
assertFactory(factory);
}
+ @SuppressWarnings("deprecation")
protected BeanFactory configureFromBean() throws Throwable
{
- GenericBeanFactoryMetaData factory = new GenericBeanFactoryMetaData("Factory", SimpleBean.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData factory = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Factory", SimpleBean.class.getName());
factory.addBeanProperty(new AbstractPropertyMetaData("anint", 123));
return (BeanFactory)instantiate(factory);
}
@@ -84,9 +85,10 @@
assertFactory(factory);
}
+ @SuppressWarnings("deprecation")
protected BeanFactory configureFromFactory() throws Throwable
{
- GenericBeanFactoryMetaData factory = new GenericBeanFactoryMetaData("Factory");
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData factory = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Factory");
AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
factory.setBeanConstructor(constructor);
constructor.setFactory(new AbstractValueMetaData(new SimpleBeanFactory()));
@@ -101,9 +103,10 @@
assertFactory(factory);
}
+ @SuppressWarnings("deprecation")
protected BeanFactory configureFromStaticFactory() throws Throwable
{
- GenericBeanFactoryMetaData factory = new GenericBeanFactoryMetaData("Factory");
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData factory = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Factory");
AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();
factory.setBeanConstructor(constructor);
constructor.setFactoryClass(SimpleBeanFactory.class.getName());
@@ -126,9 +129,10 @@
}
}
+ @SuppressWarnings("deprecation")
protected BeanFactory configureFromIllegalClass() throws Throwable
{
- GenericBeanFactoryMetaData factory = new GenericBeanFactoryMetaData("Factory", "org.jboss.test.NoSuchClass");
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData factory = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Factory", "org.jboss.test.NoSuchClass");
return (BeanFactory)instantiate(factory);
}
@@ -140,9 +144,10 @@
assertEquals("foobar", factory.createBean());
}
+ @SuppressWarnings("deprecation")
protected BeanFactory configureFromDefinedFactoryClass() throws Throwable
{
- GenericBeanFactoryMetaData factory = new GenericBeanFactoryMetaData("Factory", SimpleBean.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData factory = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Factory", SimpleBean.class.getName());
factory.setFactoryClass(MyBeanFactory.class.getName());
return (BeanFactory)instantiate(factory);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextAnnotationTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -28,7 +28,6 @@
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.api.model.FromContext;
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.test.kernel.deployment.support.NameAwareBean;
@@ -68,11 +67,12 @@
assertEquals(c2, c3);
}
+ @SuppressWarnings("deprecation")
protected void setBeanMetaDatas() throws Throwable
{
BeanMetaDataBuilder b1 = BeanMetaDataBuilderFactory.createBuilder("set_name_bean", BeanNameAwareBean.class.getName());
- GenericBeanFactoryMetaData b2 = new GenericBeanFactoryMetaData("set_name_factory", NameAwareBean.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData b2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("set_name_factory", NameAwareBean.class.getName());
AbstractInjectionValueMetaData v2 = new AbstractInjectionValueMetaData();
v2.setFromContext(FromContext.NAME);
b2.addBeanProperty(new AbstractPropertyMetaData("name", v2));
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/FromContextTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -29,7 +29,6 @@
import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
import org.jboss.beans.metadata.api.model.FromContext;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -130,6 +129,7 @@
assertTrue(aliases.contains("a3"));
}
+ @SuppressWarnings("deprecation")
protected void setBeanMetaDatas() throws Throwable
{
BeanMetaDataBuilder b1 = BeanMetaDataBuilderFactory.createBuilder("set_name_bean", NameAwareBean.class.getName());
@@ -137,7 +137,7 @@
v1.setFromContext(FromContext.NAME);
b1.addPropertyMetaData("name", v1);
- GenericBeanFactoryMetaData b2 = new GenericBeanFactoryMetaData("set_name_factory", NameAwareBean.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData b2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("set_name_factory", NameAwareBean.class.getName());
AbstractInjectionValueMetaData v2 = new AbstractInjectionValueMetaData();
v2.setFromContext(FromContext.NAME);
b2.addBeanProperty(new AbstractPropertyMetaData("name", v2));
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryConstructorDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryConstructorDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryConstructorDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -30,7 +30,6 @@
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
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.ParameterMetaData;
import org.jboss.dependency.spi.ControllerContext;
@@ -180,12 +179,13 @@
buildMetaData();
}
+ @SuppressWarnings("deprecation")
protected void buildMetaData()
{
- GenericBeanFactoryMetaData metaData1 = new GenericBeanFactoryMetaData("Name1", SimpleBeanImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData1 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name1", SimpleBeanImpl.class.getName());
metaData1.addBeanProperty(new AbstractPropertyMetaData("string", "String1"));
- GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanWithConstructorDependencyImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimpleBeanWithConstructorDependencyImpl.class.getName());
metaData2.addBeanProperty(new AbstractPropertyMetaData("string", "String2"));
AbstractConstructorMetaData cmd = new AbstractConstructorMetaData();
ArrayList<ParameterMetaData> constructor2 = new ArrayList<ParameterMetaData>();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -28,7 +28,6 @@
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
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.DemandMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
@@ -169,15 +168,16 @@
buildMetaData();
}
+ @SuppressWarnings("deprecation")
protected void buildMetaData()
{
- GenericBeanFactoryMetaData metaData1 = new GenericBeanFactoryMetaData("Name1", SimpleBeanImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData1 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name1", SimpleBeanImpl.class.getName());
metaData1.addBeanProperty(new AbstractPropertyMetaData("string", "String1"));
HashSet<SupplyMetaData> supplies = new HashSet<SupplyMetaData>();
supplies.add(new AbstractSupplyMetaData("WhatIWant"));
metaData1.setSupplies(supplies);
- GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimpleBeanImpl.class.getName());
metaData2.addBeanProperty(new AbstractPropertyMetaData("string", "String2"));
HashSet<DemandMetaData> demands = new HashSet<DemandMetaData>();
demands.add(new AbstractDemandMetaData("WhatIWant"));
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryField2PropertyDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryField2PropertyDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryField2PropertyDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -23,7 +23,6 @@
import junit.framework.Test;
import org.jboss.beans.info.spi.BeanAccessMode;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.test.kernel.dependency.support.SimplerBeanImpl2;
import org.jboss.test.AbstractTestDelegate;
@@ -32,6 +31,7 @@
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
+ at SuppressWarnings("deprecation")
public class GenericBeanFactoryField2PropertyDependencyTestCase extends GenericBeanFactoryPropertyDependencyTestCase
{
public static Test suite()
@@ -44,9 +44,9 @@
super(name);
}
- protected GenericBeanFactoryMetaData createBeanFactory()
+ protected org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData createBeanFactory()
{
- GenericBeanFactoryMetaData beanFactoryMetaData = new GenericBeanFactoryMetaData("Name2", SimplerBeanImpl2.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData beanFactoryMetaData = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimplerBeanImpl2.class.getName());
beanFactoryMetaData.setAccessMode(BeanAccessMode.ALL);
return beanFactoryMetaData;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryFieldPropertyDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryFieldPropertyDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryFieldPropertyDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -22,10 +22,10 @@
package org.jboss.test.kernel.dependency.test;
import junit.framework.Test;
+
import org.jboss.beans.info.spi.BeanAccessMode;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+import org.jboss.test.AbstractTestDelegate;
import org.jboss.test.kernel.dependency.support.SimplerBeanImpl;
-import org.jboss.test.AbstractTestDelegate;
/**
* Property Field Dependency Test Case.
@@ -45,9 +45,9 @@
}
@SuppressWarnings("deprecation")
- protected GenericBeanFactoryMetaData createBeanFactory()
+ protected org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData createBeanFactory()
{
- GenericBeanFactoryMetaData beanFactoryMetaData = new GenericBeanFactoryMetaData("Name2", SimplerBeanImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData beanFactoryMetaData = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimplerBeanImpl.class.getName());
beanFactoryMetaData.setAccessMode(BeanAccessMode.FIELDS);
return beanFactoryMetaData;
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryInstallDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryInstallDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryInstallDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -30,7 +30,6 @@
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
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.InstallMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
@@ -148,11 +147,12 @@
assertEquals(expected, bean1.getBeans());
}
+ @SuppressWarnings("deprecation")
protected void setupBeanMetaDatas() throws Throwable
{
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", GenericBeanFactoryRepository.class.getName());
- GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimpleBeanImpl.class.getName());
ArrayList<InstallMetaData> installs = new ArrayList<InstallMetaData>();
AbstractInstallMetaData install = new AbstractInstallMetaData();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryOnDemandDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -26,7 +26,6 @@
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
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.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerMode;
@@ -177,13 +176,14 @@
buildMetaData();
}
+ @SuppressWarnings("deprecation")
protected void buildMetaData()
{
- GenericBeanFactoryMetaData metaData1 = new GenericBeanFactoryMetaData("Name1", SimpleBeanImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData1 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name1", SimpleBeanImpl.class.getName());
metaData1.setMode(ControllerMode.ON_DEMAND);
metaData1.addBeanProperty(new AbstractPropertyMetaData("string", "String1"));
- GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanWithDependencyImpl.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimpleBeanWithDependencyImpl.class.getName());
metaData2.addBeanProperty(new AbstractPropertyMetaData("string", "String2"));
metaData2.addBeanProperty(new AbstractPropertyMetaData("factory", new AbstractDependencyValueMetaData("Name1")));
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -31,7 +31,6 @@
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
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.PropertyMetaData;
import org.jboss.dependency.spi.ControllerContext;
@@ -142,6 +141,7 @@
buildMetaData();
}
+ @SuppressWarnings("deprecation")
protected void buildMetaData()
{
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("simple", SimpleBeanImpl.class.getName());
@@ -149,7 +149,7 @@
attributes1.add(new AbstractPropertyMetaData("string", "String1"));
metaData1.setProperties(attributes1);
- GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("aspect");
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("aspect");
metaData2.addProperty(new AbstractPropertyMetaData("bean", SimpleBeanWithDependencyImpl.class.getName()));
metaData2.addProperty(new AbstractPropertyMetaData("constructor", new AbstractConstructorMetaData()));
metaData2.addBeanProperty(new AbstractPropertyMetaData("simpleBean", new AbstractDependencyValueMetaData("simple")));
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 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPlainLifecycleDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -28,7 +28,6 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyMetaData;
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;
@@ -167,11 +166,12 @@
buildMetaData();
}
+ @SuppressWarnings("deprecation")
protected void buildMetaData()
{
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanWithLifecycle.class.getName());
- GenericBeanFactoryMetaData metaData2 = new GenericBeanFactoryMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimpleBeanWithLifecycle.class.getName());
HashSet<DependencyMetaData> depends = new HashSet<DependencyMetaData>();
depends.add(new AbstractDependencyMetaData("Name1"));
metaData2.setDepends(depends);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPropertyDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPropertyDependencyTestCase.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryPropertyDependencyTestCase.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -26,7 +26,6 @@
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
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.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
@@ -39,6 +38,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at SuppressWarnings("deprecation")
public class GenericBeanFactoryPropertyDependencyTestCase extends OldAbstractKernelDependencyTest
{
public static Test suite()
@@ -166,14 +166,14 @@
AbstractBeanMetaData metaData1 = new AbstractBeanMetaData("Name1", SimpleBeanImpl.class.getName());
metaData1.addProperty(new AbstractPropertyMetaData("string", "String1"));
- GenericBeanFactoryMetaData metaData2 = createBeanFactory();
+ org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData metaData2 = createBeanFactory();
metaData2.addBeanProperty(new AbstractPropertyMetaData("string", new AbstractDependencyValueMetaData("Name1", "string")));
setBeanMetaDatas(new BeanMetaData[] { metaData1, metaData2 });
}
- protected GenericBeanFactoryMetaData createBeanFactory()
+ protected org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData createBeanFactory()
{
- return new GenericBeanFactoryMetaData("Name2", SimpleBeanImpl.class.getName());
+ return new org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData("Name2", SimpleBeanImpl.class.getName());
}
-}
\ No newline at end of file
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/FineGrainedBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/FineGrainedBean.java 2008-03-20 20:21:49 UTC (rev 71100)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/FineGrainedBean.java 2008-03-20 20:51:01 UTC (rev 71101)
@@ -21,13 +21,19 @@
*/
package org.jboss.test.kernel.deployment.support;
-import org.jboss.kernel.spi.dependency.*;
+import org.jboss.kernel.spi.dependency.ConfigureKernelControllerContextAware;
+import org.jboss.kernel.spi.dependency.CreateKernelControllerContextAware;
+import org.jboss.kernel.spi.dependency.InstallKernelControllerContextAware;
+import org.jboss.kernel.spi.dependency.InstantiateKernelControllerContextAware;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.StartKernelControllerContextAware;
/**
* @author <a href="mailto:ales.justin at gmail.com">Ales Justin</a>
*/
+ at SuppressWarnings("deprecation")
public class FineGrainedBean implements
- DescribeKernelControllerContextAware, InstantiateKernelControllerContextAware,
+ org.jboss.kernel.spi.dependency.DescribeKernelControllerContextAware, InstantiateKernelControllerContextAware,
ConfigureKernelControllerContextAware, CreateKernelControllerContextAware,
StartKernelControllerContextAware, InstallKernelControllerContextAware
{
More information about the jboss-cvs-commits
mailing list