openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1081750 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept: InterceptorHandler.java InterceptorUtil.java WebBeansInterceptorConfig.java
Date Tue, 15 Mar 2011 12:46:47 GMT
Author: struberg
Date: Tue Mar 15 12:46:47 2011
New Revision: 1081750

URL: http://svn.apache.org/viewvc?rev=1081750&view=rev
Log:
OWB-545 drop SecurityUtil from InterceptorUtil

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java

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=1081750&r1=1081749&r2=1081750&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
Tue Mar 15 12:46:47 2011
@@ -44,7 +44,6 @@ import org.apache.webbeans.decorator.Web
 import org.apache.webbeans.decorator.WebBeansDecoratorInterceptor;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.util.ClassUtil;
-import org.apache.webbeans.util.SecurityUtil;
 
 /**
  * Logic for how interceptors & decorators work in OWB.
@@ -238,7 +237,7 @@ public abstract class InterceptorHandler
                             WebBeansDecoratorInterceptor lastInterceptor = new WebBeansDecoratorInterceptor(delegateHandler,
instance);
                             decoratorInterceptorDataImpl = new InterceptorDataImpl(true,
lastInterceptor, webBeansContext);
                             decoratorInterceptorDataImpl.setDefinedInInterceptorClass(true);
-                            decoratorInterceptorDataImpl.setAroundInvoke(SecurityUtil.doPrivilegedGetDeclaredMethods(lastInterceptor.getClass())[0]);
+                            decoratorInterceptorDataImpl.setAroundInvoke(webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(lastInterceptor.getClass())[0]);
                         }
 
                         List<InterceptorData> interceptorMethods = this.interceptedMethodMap.get(method);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=1081750&r1=1081749&r2=1081750&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
Tue Mar 15 12:46:47 2011
@@ -53,7 +53,7 @@ import org.apache.webbeans.plugins.OpenW
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.ClassUtil;
-import org.apache.webbeans.util.SecurityUtil;
+
 
 public final class InterceptorUtil
 {
@@ -201,7 +201,7 @@ public final class InterceptorUtil
     public boolean isBusinessMethodInterceptor(Class<?> clazz)
     {
         Asserts.nullCheckForClass(clazz);
-        Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
+        Method[] methods = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(clazz);
         for (Method method : methods)
         {
             if (AnnotationUtil.hasMethodAnnotation(method, AroundInvoke.class))
@@ -233,7 +233,7 @@ public final class InterceptorUtil
     public boolean isLifecycleMethodInterceptor(Class<?> clazz)
     {
         Asserts.nullCheckForClass(clazz);
-        Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
+        Method[] methods = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(clazz);
         for (Method method : methods)
         {
             if (AnnotationUtil.hasMethodAnnotation(method, PostConstruct.class) || AnnotationUtil.hasMethodAnnotation(method,
PreDestroy.class)
@@ -339,7 +339,7 @@ public final class InterceptorUtil
     {
         Asserts.nullCheckForClass(clazz);
 
-        Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
+        Method[] methods = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(clazz);
         for(Method method : methods)
         {
             if(AnnotationUtil.hasMethodAnnotation(method, Produces.class))
@@ -433,7 +433,7 @@ public final class InterceptorUtil
             throw new WebBeansConfigurationException("Final Simple class with name : " +
clazz.getName() + " can not define any InterceptorBindings");
         }
 
-        Method[] methods = SecurityUtil.doPrivilegedGetDeclaredMethods(clazz);
+        Method[] methods = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(clazz);
 
         for (Method method : methods)
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=1081750&r1=1081749&r2=1081750&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
Tue Mar 15 12:46:47 2011
@@ -63,12 +63,14 @@ public final class WebBeansInterceptorCo
     /** Logger instance */
     private static WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansInterceptorConfig.class);
 
+    private WebBeansContext webBeansContext;
+
     /*
      * Private
      */
     public WebBeansInterceptorConfig(WebBeansContext webBeansContext)
     {
-
+        this.webBeansContext = webBeansContext;
     }
 
     /**



Mime
View raw message