Author: struberg
Date: Thu Jan 17 15:39:39 2013
New Revision: 1434734
URL: http://svn.apache.org/viewvc?rev=1434734&view=rev
Log:
OWB-344 mark WebBeansDecorator as to be Remvoed
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorRemove.java
(contents, props changed)
- copied, changed from r1434726,
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
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=1434734&r1=1434733&r2=1434734&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 Jan 17 15:39:39 2013
@@ -33,7 +33,7 @@ import javax.enterprise.inject.spi.Decor
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.decorator.WebBeansDecorator;
+import org.apache.webbeans.decorator.WebBeansDecoratorRemove;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.intercept.InterceptorData;
@@ -194,7 +194,7 @@ public abstract class InjectionTargetBea
for(int i = 0, size = decorators.size(); i < size; i++)
{
Decorator<?> dec = decorators.get(i);
- WebBeansDecorator<?> decorator = (WebBeansDecorator<?>)dec;
+ WebBeansDecoratorRemove<?> decorator =
(WebBeansDecoratorRemove<?>)dec;
if(!decorator.isPassivationCapable())
{
throw new WebBeansConfigurationException(MessageFormat.format(
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=1434734&r1=1434733&r2=1434734&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
Thu Jan 17 15:39:39 2013
@@ -77,7 +77,7 @@ public final class WebBeansDecoratorConf
logger.log(Level.FINE, "Configuring decorator class : [{0}]",
delegate.getReturnType());
}
//X TODO no more delegation!
- WebBeansDecorator<T> decorator = new WebBeansDecorator<T>(delegate);
+ WebBeansDecoratorRemove<T> decorator = new
WebBeansDecoratorRemove<T>(delegate);
delegate.getWebBeansContext().getDecoratorsManager().addDecorator(decorator);
}
@@ -146,7 +146,7 @@ public final class WebBeansDecoratorConf
while (itList.hasNext())
{
Object decoratorInstance ;
- WebBeansDecorator<Object> decorator =
(WebBeansDecorator<Object>) itList.next();
+ WebBeansDecoratorRemove<Object> decorator =
(WebBeansDecoratorRemove<Object>) itList.next();
decoratorInstance =
ownerCreationalContext.getDependentDecorator(instance, decorator);
if(decoratorInstance == null)
{
Copied:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorRemove.java
(from r1434726,
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java&r1=1434726&r2=1434734&rev=1434734&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorRemove.java
Thu Jan 17 15:39:39 2013
@@ -60,7 +60,7 @@ import java.util.logging.Level;
*
* @deprecated replaced by DecoratorBean
*/
-public class WebBeansDecorator<T> extends InjectionTargetBean<T> implements
Decorator<T>
+public class WebBeansDecoratorRemove<T> extends InjectionTargetBean<T>
implements Decorator<T>
{
/** Decorator class */
private Class<?> clazz;
@@ -92,7 +92,7 @@ public class WebBeansDecorator<T> extend
* @param wrappedBean wrapped bean instance
* @param customDecorator custom decorator
*/
- public WebBeansDecorator(InjectionTargetBean<T> wrappedBean, Decorator<T>
customDecorator)
+ public WebBeansDecoratorRemove(InjectionTargetBean<T> wrappedBean,
Decorator<T> customDecorator)
{
super(wrappedBean.getWebBeansContext(),
WebBeansType.DECORATOR,
@@ -112,7 +112,7 @@ public class WebBeansDecorator<T> extend
* Creates a new decorator bean instance with the given wrapped bean.
* @param wrappedBean wrapped bean instance
*/
- public WebBeansDecorator(InjectionTargetBean<T> wrappedBean)
+ public WebBeansDecoratorRemove(InjectionTargetBean<T> wrappedBean)
{
super(wrappedBean.getWebBeansContext(),
WebBeansType.DECORATOR,
Propchange:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1434734&r1=1434733&r2=1434734&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
Thu Jan 17 15:39:39 2013
@@ -33,7 +33,7 @@ import org.apache.webbeans.component.Man
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.decorator.WebBeansDecorator;
+import org.apache.webbeans.decorator.WebBeansDecoratorRemove;
import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.portable.events.generics.GProcessBean;
@@ -142,7 +142,7 @@ public class AfterBeanDiscoveryImpl impl
}
- webBeansContext.getDecoratorsManager().addDecorator(new
WebBeansDecorator(managedBean, (Decorator) bean));
+ webBeansContext.getDecoratorsManager().addDecorator(new
WebBeansDecoratorRemove(managedBean, (Decorator) bean));
webBeansContext.getDecoratorsManager().addCustomDecoratorClass(bean.getBeanClass());
}
else
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java?rev=1434734&r1=1434733&r2=1434734&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
Thu Jan 17 15:39:39 2013
@@ -38,7 +38,7 @@ import org.apache.webbeans.component.Res
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.decorator.DelegateHandler;
-import org.apache.webbeans.decorator.WebBeansDecorator;
+import org.apache.webbeans.decorator.WebBeansDecoratorRemove;
import
org.apache.webbeans.intercept.DependentScopedBeanInterceptorHandlerRemove;
import org.apache.webbeans.intercept.InterceptorData;
import
org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
@@ -239,7 +239,7 @@ public final class ProxyFactory
}
Object result = createProxyRemove(proxyClass);
- if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof
WebBeansInterceptorBeanPleaseRemove<?>))
+ if (!(bean instanceof WebBeansDecoratorRemove<?>) && !(bean
instanceof WebBeansInterceptorBeanPleaseRemove<?>))
{
setHandler(result, new
DependentScopedBeanInterceptorHandlerRemove(bean, actualInstance,
creastionalContext));
}
