You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/02/05 21:55:27 UTC

svn commit: r1442741 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/AbstractOwbBean.java intercept/InterceptorResolutionService.java portable/events/ExtensionLoader.java proxy/SubclassProxyFactory.java

Author: struberg
Date: Tue Feb  5 20:55:27 2013
New Revision: 1442741

URL: http://svn.apache.org/viewvc?rev=1442741&view=rev
Log:
OWB-344 remove old TODOs and cleanup unused code

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=1442741&r1=1442740&r2=1442741&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java Tue Feb  5 20:55:27 2013
@@ -228,10 +228,7 @@ public abstract class AbstractOwbBean<T>
 
         return passivatingId;
     }
-    
-    /**
-     * TODO this must be performed at bean-build time!
-     */
+
     public boolean isPassivationCapable()
     {
         if (isPassivationCapable != null)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1442741&r1=1442740&r2=1442741&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java Tue Feb  5 20:55:27 2013
@@ -46,7 +46,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import org.apache.webbeans.annotation.AnnotationManager;
 import org.apache.webbeans.component.BeanAttributesImpl;
@@ -56,8 +55,6 @@ import org.apache.webbeans.component.cre
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.logger.WebBeansLoggerFacade;
-import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.ClassUtil;
@@ -68,15 +65,8 @@ import org.apache.webbeans.util.ClassUti
  */
 public class InterceptorResolutionService
 {
-    private static final Logger logger = WebBeansLoggerFacade.getLogger(InterceptorResolutionService.class);
-
     private final WebBeansContext webBeansContext;
 
-    private final OpenWebBeansEjbLCAPlugin ejbPlugin;
-    private final Class<? extends Annotation> prePassivateClass;
-    private final Class<? extends Annotation> postActivateClass;
-    private final Class<? extends Annotation> aroundTimeoutClass;
-
     /**
      * Enforcing that interceptor callbacks should not be
      * able to throw checked exceptions is configurable
@@ -87,19 +77,6 @@ public class InterceptorResolutionServic
     public InterceptorResolutionService(WebBeansContext webBeansContext)
     {
         this.webBeansContext = webBeansContext;
-        ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
-        if (ejbPlugin != null)
-        {
-            prePassivateClass = ejbPlugin.getPrePassivateClass();
-            postActivateClass = ejbPlugin.getPostActivateClass();
-            aroundTimeoutClass = ejbPlugin.getAroundTimeoutClass();
-        }
-        else
-        {
-            prePassivateClass = null;
-            postActivateClass = null;
-            aroundTimeoutClass = null;
-        }
     }
 
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java?rev=1442741&r1=1442740&r2=1442741&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java Tue Feb  5 20:55:27 2013
@@ -126,7 +126,6 @@ public class ExtensionLoader
 
     /**
      * Clear service list.
-     * TODO since this doesn't remove the beans from the BeanManager it's unlikely to allow you to call loadExtensionServices again
      */
     public void clear()
     {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java?rev=1442741&r1=1442740&r2=1442741&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java Tue Feb  5 20:55:27 2013
@@ -33,7 +33,7 @@ import org.apache.xbean.asm.Type;
 
 /**
  * This factory creates subclasses for abstract classes.
- * TODO this is not used/nor finished yet.
+ * This is being used for Abstract Decorators.
  */
 public class SubclassProxyFactory extends AbstractProxyFactory
 {