Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 3803 invoked from network); 22 Feb 2010 17:51:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Feb 2010 17:51:34 -0000 Received: (qmail 29499 invoked by uid 500); 22 Feb 2010 17:51:34 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 29469 invoked by uid 500); 22 Feb 2010 17:51:33 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 29459 invoked by uid 99); 22 Feb 2010 17:51:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 17:51:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 17:51:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 05AA823889B9; Mon, 22 Feb 2010 17:51:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r914986 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ context/creational/ intercept/ util/ Date: Mon, 22 Feb 2010 17:51:12 -0000 To: commits@openwebbeans.apache.org From: gerdogdu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100222175113.05AA823889B9@eris.apache.org> Author: gerdogdu Date: Mon Feb 22 17:51:12 2010 New Revision: 914986 URL: http://svn.apache.org/viewvc?rev=914986&view=rev Log: Refactoring of recently committed changes. Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.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=914986&r1=914985&r2=914986&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 Mon Feb 22 17:51:12 2010 @@ -22,6 +22,7 @@ import java.util.List; import java.util.Set; +import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.spi.Bean; @@ -581,8 +582,9 @@ } @Override - public boolean isDependent() { - return false; + public boolean isDependent() + { + return getScope().equals(Dependent.class); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=914986&r1=914985&r2=914986&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Mon Feb 22 17:51:12 2010 @@ -17,7 +17,6 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; @@ -217,15 +216,5 @@ } return false; - } - - /** - * look at a Dependent scope annotation. - */ - @Override - public boolean isDependent() { - return getScope().equals(Dependent.class); - } - - -} \ No newline at end of file + } +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java?rev=914986&r1=914985&r2=914986&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java Mon Feb 22 17:51:12 2010 @@ -16,7 +16,6 @@ import javax.enterprise.context.Conversation; import javax.enterprise.context.spi.CreationalContext; -import org.apache.webbeans.annotation.ApplicationScopeLiteral; import org.apache.webbeans.conversation.ConversationImpl; import org.apache.webbeans.conversation.ConversationManager; import org.apache.webbeans.spi.ConversationService; @@ -35,7 +34,6 @@ public ConversationBean() { super(WebBeansType.CONVERSATION, Conversation.class); - setImplScopeType(new ApplicationScopeLiteral()); } /** Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=914986&r1=914985&r2=914986&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java Mon Feb 22 17:51:12 2010 @@ -16,7 +16,6 @@ import java.io.Serializable; import java.lang.reflect.Constructor; -import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.Decorator; @@ -114,13 +113,4 @@ return false; } - - /** - * look at a Dependent scope annotation. - */ - @Override - public boolean isDependent() { - return getScope().equals(Dependent.class); - } - } \ No newline at end of file Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=914986&r1=914985&r2=914986&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Mon Feb 22 17:51:12 2010 @@ -31,7 +31,7 @@ { private static final long serialVersionUID = -3416834742959340960L; - private transient Object incompleteInstance = null; + private Object incompleteInstance = null; private Object proxyInstance = null; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=914986&r1=914985&r2=914986&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Mon Feb 22 17:51:12 2010 @@ -340,6 +340,7 @@ { if (intData.isDefinedWithWebBeansInterceptor()) { + @SuppressWarnings("unchecked") WebBeansInterceptor interceptor = (WebBeansInterceptor)intData.getWebBeansInterceptor(); CreationalContext creationalContext = manager.createCreationalContext(interceptor); Object interceptorProxy = manager.getReference(interceptor,interceptor.getBeanClass(), creationalContext); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=914986&r1=914985&r2=914986&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Mon Feb 22 17:51:12 2010 @@ -2540,6 +2540,16 @@ public static boolean isDependent(Bean bean) { + if(!(bean instanceof OwbBean)) + { + if(bean.getScope().equals(Dependent.class)) + { + return true; + } + + return false; + } + return ((OwbBean) bean).isDependent(); }