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/01/03 22:00:35 UTC
svn commit: r1428594 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/el/
webbeans-impl/src/main/java/org/apache/webbeans/intercept/
webbeans-impl/src/main/java/org/apache/webbeans/proxy/
webbeans-impl/src/main/resources/META-I...
Author: struberg
Date: Thu Jan 3 21:00:34 2013
New Revision: 1428594
URL: http://svn.apache.org/viewvc?rev=1428594&view=rev
Log:
OWB-344 mark old InterceptorHandler as to be removed
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java
- copied, changed from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java (contents, props changed)
- copied, changed from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java (contents, props changed)
- copied, changed from r1427506, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java (contents, props changed)
- copied, changed from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandlerRemove.java
- copied, changed from r1426803, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java
- copied, changed from r1426803, openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java
openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java Thu Jan 3 21:00:34 2013
@@ -40,7 +40,7 @@ import javax.enterprise.inject.spi.Bean;
* </li>
* <li>
* Store the Contextual Reference for each name per request thread. This is a performance
- * tuning strategy, because creating a {@link org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler}
+ * tuning strategy, because creating a {@link org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove}
* for each and every EL call is very expensive. This needs to be cleaned up with
* {@link #destroyELContextStore()} at the end of each request.
* </li>
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java (from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java&r1=1426803&r2=1428594&rev=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ApplicationScopedBeanInterceptorHandlerRemove.java Thu Jan 3 21:00:34 2013
@@ -31,7 +31,7 @@ import org.apache.webbeans.component.Owb
* we can simply cache this instance inside our bean. We only need to reload this instance
* if it is null. This happens at the first usage and after the MethodHandler got deserialized</p>
*/
-public class ApplicationScopedBeanInterceptorHandler extends NormalScopedBeanInterceptorHandler
+public class ApplicationScopedBeanInterceptorHandlerRemove extends NormalScopedBeanInterceptorHandlerRemove
{
/**default serial id*/
private static final long serialVersionUID = 1L;
@@ -55,7 +55,7 @@ public class ApplicationScopedBeanInterc
* @param bean bean
* @param creationalContext creaitonal context
*/
- public ApplicationScopedBeanInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
+ public ApplicationScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, CreationalContext<?> creationalContext)
{
super(bean, creationalContext);
}
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java (from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java&r1=1426803&r2=1428594&rev=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java Thu Jan 3 21:00:34 2013
@@ -32,7 +32,7 @@ import org.apache.webbeans.context.creat
* @version $Rev$ $Date$
*
*/
-public class DependentScopedBeanInterceptorHandler extends InterceptorHandler
+public class DependentScopedBeanInterceptorHandlerRemove extends InterceptorHandlerPleaseRemove
{
/**default servial id*/
private static final long serialVersionUID = 1L;
@@ -49,7 +49,7 @@ public class DependentScopedBeanIntercep
* @param instance bean instance
* @param creationalContext creational context
*/
- public DependentScopedBeanInterceptorHandler(OwbBean<?> bean, Object instance, CreationalContext<?> creationalContext)
+ public DependentScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, Object instance, CreationalContext<?> creationalContext)
{
super(bean);
actualInstance = instance;
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java (from r1427506, 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/InterceptorHandlerPleaseRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java&r1=1427506&r2=1428594&rev=1428594&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/InterceptorHandlerPleaseRemove.java Thu Jan 3 21:00:34 2013
@@ -139,13 +139,15 @@ import org.apache.webbeans.util.ClassUti
* @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean
* @see org.apache.webbeans.decorator.WebBeansDecorator
* @see org.apache.webbeans.intercept.ejb.EJBInterceptorConfig
+ *
+ * @deprecated the whole interceptor stack will be changed to the new ASM based proxying.
*/
-public abstract class InterceptorHandler implements InvocationHandler, MethodHandler, Serializable
+public abstract class InterceptorHandlerPleaseRemove implements InvocationHandler, MethodHandler, Serializable
{
/**Default serial id*/
private static final long serialVersionUID = 1L;
- private final static Logger logger = WebBeansLoggerFacade.getLogger(InterceptorHandler.class);
+ private final static Logger logger = WebBeansLoggerFacade.getLogger(InterceptorHandlerPleaseRemove.class);
/**Proxied bean*/
protected OwbBean<?> bean = null;
@@ -161,7 +163,7 @@ public abstract class InterceptorHandler
* Creates a new handler.
* @param bean proxied bean
*/
- protected InterceptorHandler(OwbBean<?> bean)
+ protected InterceptorHandlerPleaseRemove(OwbBean<?> bean)
{
this.bean = bean;
webBeansContext = bean.getWebBeansContext();
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan 3 21:00:34 2013
@@ -0,0 +1 @@
+/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java:936384
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolution.java Thu Jan 3 21:00:34 2013
@@ -56,9 +56,9 @@ public class InterceptorResolution
}
- public ClassInterceptorInfo calculateInterceptorInfo(AnnotatedType annotatedType)
+ public BeanInterceptorInfo calculateInterceptorInfo(AnnotatedType annotatedType)
{
- ClassInterceptorInfo interceptorInfo = new ClassInterceptorInfo();
+ BeanInterceptorInfo interceptorInfo = new BeanInterceptorInfo();
List<AnnotatedMethod> interceptableAnnotatedMethods = getInterceptableAnnotatedMethods(annotatedType);
@@ -124,7 +124,7 @@ public class InterceptorResolution
* static information about interceptors and decorators for a
* single bean.
*/
- public static class ClassInterceptorInfo
+ public static class BeanInterceptorInfo
{
/**
* All the Interceptor Beans which are active on this class somewhere.
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java (from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java&r1=1426803&r2=1428594&rev=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java Thu Jan 3 21:00:34 2013
@@ -41,7 +41,7 @@ import org.apache.webbeans.context.creat
*
*/
@SuppressWarnings("unchecked")
-public class NormalScopedBeanInterceptorHandler extends InterceptorHandler
+public class NormalScopedBeanInterceptorHandlerRemove extends InterceptorHandlerPleaseRemove
{
/**Serial id*/
private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@ public class NormalScopedBeanInterceptor
* @param bean bean
* @param creationalContext creational context
*/
- public NormalScopedBeanInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
+ public NormalScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, CreationalContext<?> creationalContext)
{
super(bean);
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java?rev=1428594&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorHandler.java Thu Jan 3 21:00:34 2013
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.proxy;
+
+/**
+ */
+public interface InterceptorHandler
+{
+
+ /**
+ *
+ * @param instance
+ * @param methodIndex index to find the Method
+ * @param args
+ * @return
+ * @throws Throwable
+ */
+ public Object invoke(Object instance, int methodIndex, Object[] args) throws Throwable;
+}
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=1428594&r1=1428593&r2=1428594&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 3 21:00:34 2013
@@ -43,10 +43,10 @@ import org.apache.webbeans.context.creat
import org.apache.webbeans.decorator.DelegateHandler;
import org.apache.webbeans.decorator.WebBeansDecorator;
import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.intercept.DependentScopedBeanInterceptorHandler;
+import org.apache.webbeans.intercept.DependentScopedBeanInterceptorHandlerRemove;
import org.apache.webbeans.intercept.InterceptorData;
-import org.apache.webbeans.intercept.InterceptorHandler;
-import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
+import org.apache.webbeans.intercept.InterceptorHandlerPleaseRemove;
+import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove;
import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
import org.apache.webbeans.proxy.javassist.JavassistFactory;
import org.apache.webbeans.util.ClassUtil;
@@ -78,10 +78,10 @@ public final class ProxyFactory
/**
* This map contains all configured special Scope->InterceptorHandler mappings.
- * If no mapping is configured, a {@link org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler} will get created.
+ * If no mapping is configured, a {@link org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove} will get created.
*/
- private Map<String, Class<? extends InterceptorHandler>> interceptorHandlerClasses =
- new ConcurrentHashMap<String, Class<? extends InterceptorHandler>>();
+ private Map<String, Class<? extends InterceptorHandlerPleaseRemove>> interceptorHandlerClasses =
+ new ConcurrentHashMap<String, Class<? extends InterceptorHandlerPleaseRemove>>();
public void setHandler(Object proxy, MethodHandler handler)
{
@@ -225,7 +225,7 @@ public final class ProxyFactory
if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof WebBeansInterceptorBean<?>))
{
- InterceptorHandler interceptorHandler = createInterceptorHandler(bean, creationalContext);
+ InterceptorHandlerPleaseRemove interceptorHandler = createInterceptorHandler(bean, creationalContext);
setHandler(result, interceptorHandler);
}
@@ -244,10 +244,10 @@ public final class ProxyFactory
return factory.createProxy(proxyClass);
}
- private InterceptorHandler createInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
+ private InterceptorHandlerPleaseRemove createInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
{
String scopeClassName = bean.getScope().getName();
- Class<? extends InterceptorHandler> interceptorHandlerClass = null;
+ Class<? extends InterceptorHandlerPleaseRemove> interceptorHandlerClass = null;
if (!interceptorHandlerClasses.containsKey(scopeClassName))
{
String proxyMappingConfigKey = OpenWebBeansConfiguration.PROXY_MAPPING_PREFIX + scopeClassName;
@@ -256,7 +256,7 @@ public final class ProxyFactory
{
try
{
- interceptorHandlerClass = (Class<? extends InterceptorHandler>) Class.forName(className, true, WebBeansUtil.getCurrentClassLoader());
+ interceptorHandlerClass = (Class<? extends InterceptorHandlerPleaseRemove>) Class.forName(className, true, WebBeansUtil.getCurrentClassLoader());
}
catch (ClassNotFoundException e)
{
@@ -269,7 +269,7 @@ public final class ProxyFactory
else
{
// we need to explicitely store a class because ConcurrentHashMap will throw a NPE if value == null
- interceptorHandlerClass = NormalScopedBeanInterceptorHandler.class;
+ interceptorHandlerClass = NormalScopedBeanInterceptorHandlerRemove.class;
}
interceptorHandlerClasses.put(scopeClassName, interceptorHandlerClass);
@@ -279,17 +279,17 @@ public final class ProxyFactory
interceptorHandlerClass = interceptorHandlerClasses.get(scopeClassName);
}
- if (interceptorHandlerClass.equals(NormalScopedBeanInterceptorHandler.class))
+ if (interceptorHandlerClass.equals(NormalScopedBeanInterceptorHandlerRemove.class))
{
// this is faster that way...
- return new NormalScopedBeanInterceptorHandler(bean, creationalContext);
+ return new NormalScopedBeanInterceptorHandlerRemove(bean, creationalContext);
}
else
{
try
{
Constructor ct = interceptorHandlerClass.getConstructor(OwbBean.class, CreationalContext.class);
- return (InterceptorHandler) ct.newInstance(bean, creationalContext);
+ return (InterceptorHandlerPleaseRemove) ct.newInstance(bean, creationalContext);
}
catch (NoSuchMethodException e)
{
@@ -415,7 +415,7 @@ public final class ProxyFactory
Object result = createProxy(proxyClass);
if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof WebBeansInterceptorBean<?>))
{
- setHandler(result, new DependentScopedBeanInterceptorHandler(bean, actualInstance, creastionalContext));
+ setHandler(result, new DependentScopedBeanInterceptorHandlerRemove(bean, actualInstance, creastionalContext));
}
return result;
Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 3 21:00:34 2013
@@ -115,5 +115,5 @@ org.apache.webbeans.javassist.useClassLo
# typically sub classes of NormalScopedBeanInterceptorHandler
#
# org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandlerRemove
################################################################################################
Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandlerRemove.java (from r1426803, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandler.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandlerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandlerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandler.java&r1=1426803&r2=1428594&rev=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/DummyScopedBeanInterceptorHandlerRemove.java Thu Jan 3 21:00:34 2013
@@ -19,7 +19,7 @@
package org.apache.webbeans.newtests.proxy;
import org.apache.webbeans.component.OwbBean;
-import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
+import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove;
import javax.enterprise.context.spi.CreationalContext;
@@ -27,9 +27,9 @@ import javax.enterprise.context.spi.Crea
* We don't do anything special. This is just for testing the
* configuration of our scope->proxyMethodHandler mapping.
*/
-public class DummyScopedBeanInterceptorHandler extends NormalScopedBeanInterceptorHandler
+public class DummyScopedBeanInterceptorHandlerRemove extends NormalScopedBeanInterceptorHandlerRemove
{
- public DummyScopedBeanInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
+ public DummyScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, CreationalContext<?> creationalContext)
{
super(bean, creationalContext);
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/proxy/ProxyMappingTest.java Thu Jan 3 21:00:34 2013
@@ -20,8 +20,8 @@ package org.apache.webbeans.newtests.pro
import javassist.util.proxy.ProxyObject;
-import org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler;
-import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
+import org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandlerRemove;
+import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.newtests.proxy.beans.ApplicationBean;
import org.apache.webbeans.newtests.proxy.beans.ConversationBean;
@@ -52,14 +52,14 @@ public class ProxyMappingTest extends Ab
Assert.assertNotNull(conversationBean);
Assert.assertTrue(conversationBean instanceof ProxyObject);
Assert.assertNotNull(((ProxyObject) conversationBean).getHandler());
- Assert.assertEquals(((ProxyObject) conversationBean).getHandler().getClass(), NormalScopedBeanInterceptorHandler.class);
+ Assert.assertEquals(((ProxyObject) conversationBean).getHandler().getClass(), NormalScopedBeanInterceptorHandlerRemove.class);
ApplicationBean applicationBean = getInstance(ApplicationBean.class);
Assert.assertNotNull(applicationBean);
Assert.assertTrue(applicationBean instanceof ProxyObject);
Assert.assertNotNull(((ProxyObject) applicationBean).getHandler());
- Assert.assertEquals(((ProxyObject) applicationBean).getHandler().getClass(), ApplicationScopedBeanInterceptorHandler.class);
+ Assert.assertEquals(((ProxyObject) applicationBean).getHandler().getClass(), ApplicationScopedBeanInterceptorHandlerRemove.class);
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 3 21:00:34 2013
@@ -30,5 +30,5 @@ org.apache.webbeans.spi.deployer.MetaDat
# specific proxy mapping which should get tested
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandler
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.ApplicationScopedBeanInterceptorHandlerRemove
Modified: openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-test/cditest-owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 3 21:00:34 2013
@@ -29,5 +29,5 @@ org.apache.webbeans.spi.ContainerLifecyc
org.apache.webbeans.spi.ContextsService=org.apache.webbeans.corespi.se.DefaultContextsService
# To avoid any contextual instance caching issues, we also reset the configured proxies
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove
Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java Thu Jan 3 21:00:34 2013
@@ -32,7 +32,7 @@ import org.apache.webbeans.conversation.
import org.apache.webbeans.el.ELContextStore;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.spi.FailOverService;
-import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler;
+import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandlerRemove;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.ContextException;
@@ -127,7 +127,7 @@ public class WebContextsService extends
applicationContexts.remove();
conversationContexts.remove();
singletonContexts.remove();
- RequestScopedBeanInterceptorHandler.removeThreadLocals();
+ RequestScopedBeanInterceptorHandlerRemove.removeThreadLocals();
}
/**
@@ -395,7 +395,7 @@ public class WebContextsService extends
requestContexts.set(null);
requestContexts.remove();
- RequestScopedBeanInterceptorHandler.removeThreadLocals();
+ RequestScopedBeanInterceptorHandlerRemove.removeThreadLocals();
}
private void cleanupConversations()
Copied: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java (from r1426803, openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java?p2=openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java&p1=openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java&r1=1426803&r2=1428594&rev=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandlerRemove.java Thu Jan 3 21:00:34 2013
@@ -19,7 +19,7 @@
package org.apache.webbeans.web.intercept;
import org.apache.webbeans.component.OwbBean;
-import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
+import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove;
import javax.enterprise.context.spi.CreationalContext;
import java.util.HashMap;
@@ -33,7 +33,7 @@ import java.util.HashMap;
* we can simply cache this instance inside our bean. We only need to reload this instance
* if it is null or if the thread ends.</p>
*/
-public class RequestScopedBeanInterceptorHandler extends NormalScopedBeanInterceptorHandler
+public class RequestScopedBeanInterceptorHandlerRemove extends NormalScopedBeanInterceptorHandlerRemove
{
/**default serial id*/
private static final long serialVersionUID = 1L;
@@ -55,7 +55,7 @@ public class RequestScopedBeanIntercepto
* @param bean bean
* @param creationalContext creaitonal context
*/
- public RequestScopedBeanInterceptorHandler(OwbBean<?> bean, CreationalContext<?> creationalContext)
+ public RequestScopedBeanInterceptorHandlerRemove(OwbBean<?> bean, CreationalContext<?> creationalContext)
{
super(bean, creationalContext);
}
Modified: openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 3 21:00:34 2013
@@ -52,5 +52,5 @@ org.apache.webbeans.application.jsp=fals
# This allows mapping a Scope Annotation class to a specific InterceptorProxy which are
# typically sub classes of NormalScopedBeanInterceptorHandler
#
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandlerRemove
################################################################################################
Modified: openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1428594&r1=1428593&r2=1428594&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-web/src/test/resources/META-INF/openwebbeans/openwebbeans.properties Thu Jan 3 21:00:34 2013
@@ -29,5 +29,5 @@ configuration.ordinal=15
# typically sub classes of NormalScopedBeanInterceptorHandler
# We need to register this with a higher ordinal again, since webbeans-impl/tests have ordinal 11 too!
#
-org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler
+org.apache.webbeans.proxy.mapping.javax.enterprise.context.RequestScoped=org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandlerRemove
################################################################################################