Rename and move BeanImpl

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@256 1c488680-804c-0410-94cd-c6b725194a0e

webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java → webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java

@@ -1,20 +1,21 @@
-package org.jboss.webbeans;
+package org.jboss.webbeans.bean;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
 import javax.webbeans.manager.Bean;
 
+import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.model.bean.BeanModel;
 
-public abstract class BeanImpl<T> extends Bean<T>
+public abstract class AbstractBean<T> extends Bean<T>
 {
 
    public static final String LOGGER_NAME = "bean";
 
    protected ManagerImpl manager;
 
-   public BeanImpl(ManagerImpl manager)
+   public AbstractBean(ManagerImpl manager)
    {
       super(manager);
       this.manager = manager;

webbeans-ri/src/main/java/org/jboss/webbeans/BeanWrapper.java → webbeans-ri/src/main/java/org/jboss/webbeans/bean/BeanWrapper.java

@@ -1,4 +1,4 @@
-package org.jboss.webbeans;
+package org.jboss.webbeans.bean;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;

webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java

@@ -0,0 +1,31 @@
+package org.jboss.webbeans.bean;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.model.bean.BeanModel;
+
+public class ProducerBean<T> extends AbstractBean<T>
+{
+
+   public ProducerBean(ManagerImpl manager)
+   {
+      super(manager);
+      // TODO Auto-generated constructor stub
+   }
+
+   @Override
+   public BeanModel<T, ?> getModel()
+   {
+      // TODO Auto-generated method stub
+      return null;
+   }
+
+   @Override
+   public T create()
+   {
+      // TODO Auto-generated method stub
+      return null;
+   }
+
+
+
+}

webbeans-ri/src/main/java/org/jboss/webbeans/SimpleBeanImpl.java → webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java

@@ -1,15 +1,16 @@
-package org.jboss.webbeans;
+package org.jboss.webbeans.bean;
 
+import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.injectable.InjectableField;
 import org.jboss.webbeans.injectable.InjectableMethod;
 import org.jboss.webbeans.model.bean.SimpleBeanModel;
 
-public class SimpleBeanImpl<T> extends BeanImpl<T>
+public class SimpleBean<T> extends AbstractBean<T>
 {
 
    private SimpleBeanModel<T> model;
 
-   public SimpleBeanImpl(SimpleBeanModel<T> model, ManagerImpl manager)
+   public SimpleBean(SimpleBeanModel<T> model, ManagerImpl manager)
    {
       super(manager);
       this.model = model;

webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java

@@ -9,7 +9,7 @@
 import javax.webbeans.NullableDependencyException;
 import javax.webbeans.manager.Bean;
 
-import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.bean.SimpleBean;
 import org.jboss.webbeans.test.beans.Fox;
 import org.jboss.webbeans.test.beans.FoxRun;
 import org.jboss.webbeans.test.beans.Tuna;
@@ -64,7 +64,7 @@ public void testInvokeDependentScopeWhenContextNotActive()
    @Test(groups="injection", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6")
    public void testInjectingStaticField()
    {
-      SimpleBeanImpl<BeanWithStaticBoundField> bean = createSimpleWebBean(BeanWithStaticBoundField.class, manager);
+      SimpleBean<BeanWithStaticBoundField> bean = createSimpleWebBean(BeanWithStaticBoundField.class, manager);
       Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
       manager.addBean(tunaBean);
       BeanWithStaticBoundField instance = bean.create();
@@ -73,7 +73,7 @@ public void testInjectingStaticField()
    @Test(groups="injection",expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6")
    public void testInjectingFinalField()
    {
-      SimpleBeanImpl<BeanWithFinalBoundField> bean = createSimpleWebBean(BeanWithFinalBoundField.class, manager);
+      SimpleBean<BeanWithFinalBoundField> bean = createSimpleWebBean(BeanWithFinalBoundField.class, manager);
       Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
       manager.addBean(tunaBean);
       BeanWithFinalBoundField instance = bean.create();

webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java

@@ -4,7 +4,7 @@
 
 import javax.webbeans.manager.Bean;
 
-import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.bean.SimpleBean;
 import org.jboss.webbeans.test.beans.FishPond;
 import org.jboss.webbeans.test.beans.Goldfish;
 import org.jboss.webbeans.test.beans.RedSnapper;
@@ -74,7 +74,7 @@ public void testCreateInjectsResource()
    @Test(groups="injection") @SpecAssertion(section="5.3")
    public void testCreateInjectsFieldsDeclaredInJava()
    {
-      SimpleBeanImpl<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
+      SimpleBean<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
       Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
       manager.addBean(tunaBean);
       TunaFarm tunaFarm = tunaFarmBean.create();
@@ -90,7 +90,7 @@ public void testPostConstructMethodCalled()
    @Test(groups="injection") 
    public void testFieldMissingBindingAnnotationsAreNotInjected()
    {
-      SimpleBeanImpl<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
+      SimpleBean<TunaFarm> tunaFarmBean = createSimpleWebBean(TunaFarm.class, manager);
       Bean<Tuna> tunaBean = createSimpleWebBean(Tuna.class, manager);
       manager.addBean(tunaBean);
       TunaFarm tunaFarm = tunaFarmBean.create();

webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java

@@ -4,17 +4,17 @@
 import java.util.HashMap;
 
 import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.SimpleBeanImpl;
+import org.jboss.webbeans.bean.SimpleBean;
 import org.jboss.webbeans.introspector.AnnotatedClass;
 import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
 import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
 import org.jboss.webbeans.model.bean.SimpleBeanModel;
 
 public class Util
 {
-   public static <T> SimpleBeanImpl<T> createSimpleWebBean(Class<T> clazz, ManagerImpl manager)
+   public static <T> SimpleBean<T> createSimpleWebBean(Class<T> clazz, ManagerImpl manager)
    {
-      return new SimpleBeanImpl<T>(createSimpleModel(clazz, manager), manager);
+      return new SimpleBean<T>(createSimpleModel(clazz, manager), manager);
    }
 
    public static <T> SimpleBeanModel<T> createSimpleModel(Class<T> clazz, ManagerImpl manager)
@@ -36,6 +36,8 @@ public static <T> EnterpriseBeanModel<T> createEnterpriseBeanModel(Class<T> claz
    {
       return new EnterpriseBeanModel<T>(new SimpleAnnotatedClass<T>(clazz), xmlAnnotatedType, manager);
    }
+
+
 
    @Deprecated
    public static <T> AnnotatedClass<T> getEmptyAnnotatedType(Class<T> type)