You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/02/04 21:15:59 UTC

svn commit: r906638 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ container/

Author: gerdogdu
Date: Thu Feb  4 20:15:59 2010
New Revision: 906638

URL: http://svn.apache.org/viewvc?rev=906638&view=rev
Log:
Refactoring, adding property, remove unused methods etc

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java   (contents, props changed)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java?rev=906638&r1=906637&r2=906638&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java Thu Feb  4 20:15:59 2010
@@ -102,10 +102,7 @@
     
     /**Bean inherited meta data*/
     protected IBeanInheritedMetaData inheritedMetaData;
-    
-    /**Tracks dependent injection point owner, can be null*/
-    protected InjectionPoint dependentOwnerInjectionPoint;
-    
+        
     /**
      * Constructor definiton. Each subclass redefines its own constructor with
      * calling this.
@@ -206,9 +203,6 @@
             //Destory dependent instances
             creationalContext.release();
                         
-            //Reset it
-            this.dependentOwnerInjectionPoint = null;  
-            
         }catch(Exception e)
         {
             logger.fatal(OWBLogConst.FATAL_0001, new Object[]{toString()});
@@ -490,22 +484,6 @@
     }
     
     /**
-     * @return the dependentOwnerInjectionPoint
-     */
-    public InjectionPoint getDependentOwnerInjectionPoint()
-    {
-        return dependentOwnerInjectionPoint;
-    }
-
-    /**
-     * @param dependentOwnerInjectionPoint the dependentOwnerInjectionPoint to set
-     */
-    public void setDependentOwnerInjectionPoint(InjectionPoint dependentOwnerInjectionPoint)
-    {
-        this.dependentOwnerInjectionPoint = dependentOwnerInjectionPoint;
-    }
-    
-    /**
      * {@inheritDoc}
      */    
     public void setSpecializedBean(boolean specialized)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=906638&r1=906637&r2=906638&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Thu Feb  4 20:15:59 2010
@@ -409,24 +409,6 @@
     }
 
     /**
-     * @return the fromRealizes
-     * @deprecated
-     */
-    public boolean isFromRealizes()
-    {
-        return fromRealizes;
-    }
-
-    /**
-     * @param fromRealizes the fromRealizes to set
-     * @deprecated
-     */
-    public void setFromRealizes(boolean fromRealizes)
-    {
-        this.fromRealizes = fromRealizes;
-    }
-
-    /**
      * Gets injected fields.
      * 
      * @return injected fields

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java?rev=906638&r1=906637&r2=906638&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java Thu Feb  4 20:15:59 2010
@@ -13,7 +13,6 @@
  */
 package org.apache.webbeans.component;
 
-import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.util.List;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=906638&r1=906637&r2=906638&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java Thu Feb  4 20:15:59 2010
@@ -95,22 +95,5 @@
      * 
      * @param instance bean instance
      */
-    public void preDestroy(T instance);
-        
-    
-    /**
-     * Returns true if coming from <pre>@Realization</pre>.
-     * 
-     * @return true if coming from <pre>@Realization</pre>
-     */
-    @Deprecated //Removed from specification
-    public boolean isFromRealizes();
-    
-    /**
-     * Set its realized.
-     * 
-     * @param realized is realized
-     */
-    @Deprecated //Removed from specification
-    public void setFromRealizes(boolean realized);
-}
\ No newline at end of file
+    public void preDestroy(T instance);    
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=906638&r1=906637&r2=906638&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Thu Feb  4 20:15:59 2010
@@ -69,7 +69,6 @@
 import org.apache.webbeans.intercept.InterceptorComparator;
 import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
-import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.plugins.OpenWebBeansEjbPlugin;
 import org.apache.webbeans.plugins.OpenWebBeansJmsPlugin;
 import org.apache.webbeans.plugins.PluginLoader;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java?rev=906638&r1=906637&r2=906638&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java Thu Feb  4 20:15:59 2010
@@ -38,7 +38,7 @@
  * {@link javax.enterprise.inject.spi.BeanManager#getPassivationCapableBean(String)}
  * for serialisation and deserialisation.
  *
- * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Rev$ $Date$
  */
 public final class SerializableBean<T> implements Bean<T>, PassivationCapable, Serializable {
 

Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date