openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r954221 - in /openwebbeans/trunk: webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/ webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/ webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/ webbea...
Date Sun, 13 Jun 2010 13:28:19 GMT
Author: struberg
Date: Sun Jun 13 13:28:19 2010
New Revision: 954221

URL: http://svn.apache.org/viewvc?rev=954221&view=rev
Log:
OWB-275 code cleanup

Modified:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbDefinitionUtility.java
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
    openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ContextListener.java
    openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java
    openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ValueExpression.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/OwbElContextListener.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
(original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
Sun Jun 13 13:28:19 2010
@@ -158,9 +158,9 @@ public class OpenWebBeansEjbInterceptor
         
         try
         {
-            int result = 1000;
+            int result = activateContexts(RequestScoped.class);
             //Context activities
-            if( (result = activateContexts(RequestScoped.class)) == 1)
+            if(result == 1)
             {
                 requestCreated = true;
             }
@@ -168,8 +168,9 @@ public class OpenWebBeansEjbInterceptor
             {
                 requestAlreadyActive = true;
             }
-            
-            if((result = activateContexts(ApplicationScoped.class)) == 1)
+
+            result = activateContexts(ApplicationScoped.class);
+            if(result == 1)
             {
                 applicationCreated = true;
             }
@@ -189,7 +190,8 @@ public class OpenWebBeansEjbInterceptor
                 rv = callInterceptorsForNonContextuals(ejbContext.getMethod(), ejbContext.getTarget(),
ejbContext.getParameters(), ejbContext);
             }
             
-        }finally
+        }
+        finally
         {
             if(!requestAlreadyActive)
             {
@@ -388,7 +390,8 @@ public class OpenWebBeansEjbInterceptor
     private BaseEjbBean<?> findTargetBean(Object instance) 
     {
         BeanManagerImpl manager = BeanManagerImpl.getManager();
-        if (instance == null) { 
+        if (instance == null)
+        {
             logger.debug("findTargetBean was passed a null instance.");
             return null;
         }
@@ -462,7 +465,8 @@ public class OpenWebBeansEjbInterceptor
             { 
                 return runInterceptorStack(ejbBean.getInterceptorStack(), method, instance,
arguments, ejbBean, cc, ejbContext);
             }
-            finally { 
+            finally
+            { 
                 cc.release();
             }
         }
@@ -508,7 +512,8 @@ public class OpenWebBeansEjbInterceptor
                 ((ProxyObject)delegate).setHandler(delegateHandler);
 
                 // Gets component decorator stack
-                decorators = WebBeansDecoratorConfig.getDecoratorStack(injectionTarget, instance,
delegate, (CreationalContextImpl<?>)threadLocalCreationalContext.get());           
            
+                decorators = WebBeansDecoratorConfig.getDecoratorStack(injectionTarget, instance,
delegate,
+                                                                       (CreationalContextImpl<?>)threadLocalCreationalContext.get());
                       
                 //Sets decorator stack of delegate
                 delegateHandler.setDecorators(decorators);
                 
@@ -617,7 +622,8 @@ public class OpenWebBeansEjbInterceptor
         Object instance = ejbContext.getTarget();
         
         BaseEjbBean<?> bean = findTargetBean(instance);
-        if (bean == null) { 
+        if (bean == null)
+        { 
             logger.debug("No bean for instance [{0}]", instance);
             return;
         }
@@ -657,7 +663,10 @@ public class OpenWebBeansEjbInterceptor
         }
         finally 
         { 
-          if (localcc != null) localcc.release();
+          if (localcc != null)
+          {
+              localcc.release();
+          }
         }
     } 
     

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
(original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
Sun Jun 13 13:28:19 2010
@@ -100,7 +100,8 @@ public class EjbBeanProxyHandler impleme
             {
                 return proceed.invoke(instance, arguments);
                 
-            }finally
+            }
+            finally
             {
                 SecurityUtil.doPrivilegedSetAccessible(method, access);
             }            
@@ -135,7 +136,8 @@ public class EjbBeanProxyHandler impleme
                 {
                     return method.invoke(webbeansInstance, arguments);
                     
-                }finally
+                }
+                finally
                 {
                     SecurityUtil.doPrivilegedSetAccessible(method, access);
                 }            
@@ -153,12 +155,14 @@ public class EjbBeanProxyHandler impleme
             {
                 result = method.invoke(webbeansInstance, arguments);
                 
-            }finally
+            }
+            finally
             {
                 SecurityUtil.doPrivilegedSetAccessible(method, access);
             }            
             
-        }finally
+        }
+        finally
         {
             OpenWebBeansEjbInterceptor.unsetThreadLocal();   
         }                

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbDefinitionUtility.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbDefinitionUtility.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbDefinitionUtility.java
(original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbDefinitionUtility.java
Sun Jun 13 13:28:19 2010
@@ -67,7 +67,8 @@ public final class EjbDefinitionUtility
          
             return (T)(JavassistProxyFactory.defineEjbBeanProxyClass(bean, factory).newInstance());
             
-        }catch(Exception e)
+        }
+        catch(Exception e)
         {
             throw new WebBeansException(e);
         }

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
(original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbValidator.java
Sun Jun 13 13:28:19 2010
@@ -82,7 +82,8 @@ public final class EjbValidator
         {
             if (!ejbBean.getScope().equals(Dependent.class) && !ejbBean.getScope().equals(ApplicationScoped.class))
             {
-                throw new WebBeansConfigurationException("Singleton Session Bean class :
" + ejbBean.getReturnType() + " " + "can not define scope other than @Dependent or @ApplicationScoped");
+                throw new WebBeansConfigurationException("Singleton Session Bean class :
" + ejbBean.getReturnType() + " "
+                                                         + "can not define scope other than
@Dependent or @ApplicationScoped");
             }
         }
     }

Modified: openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ContextListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ContextListener.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ContextListener.java
(original)
+++ openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ContextListener.java
Sun Jun 13 13:28:19 2010
@@ -30,6 +30,6 @@ public class EL10ContextListener impleme
     public void contextCreated(ELContextEvent event)
     {
         ELContextStore store = new ELContextStore();        
-        ELContextStore.LOCAL_CONTEXT.set(store);
+        ELContextStore.localContext.set(store);
     }
 }

Modified: openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java
(original)
+++ openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Resolver.java
Sun Jun 13 13:28:19 2010
@@ -75,7 +75,7 @@ public class EL10Resolver extends ELReso
         CreationalContext<Object> creationalContext = null;
         
         //Local store, set by the OwbELContextListener
-        ELContextStore store = ELContextStore.LOCAL_CONTEXT.get();        
+        ELContextStore store = ELContextStore.localContext.get();
         if (obj == null)
         {                      
             //Name of the bean

Modified: openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ValueExpression.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ValueExpression.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ValueExpression.java
(original)
+++ openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10ValueExpression.java
Sun Jun 13 13:28:19 2010
@@ -62,7 +62,7 @@ public class EL10ValueExpression extends
         finally
         {
             //Destroy dependent store
-            ELContextStore store = ELContextStore.LOCAL_CONTEXT.get();
+            ELContextStore store = ELContextStore.localContext.get();
             if(store != null)
             {
                 store.destroy();

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=954221&r1=954220&r2=954221&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
Sun Jun 13 13:28:19 2010
@@ -28,7 +28,8 @@ import javax.enterprise.inject.spi.Bean;
 
 public class ELContextStore
 {
-    public static ThreadLocal<ELContextStore> LOCAL_CONTEXT = new ThreadLocal<ELContextStore>();
+    //X TODO MUST NOT BE PUBLIC!
+    public static ThreadLocal<ELContextStore> localContext = new ThreadLocal<ELContextStore>();
 
     private Map<Bean<?>, CreationalStore> dependentObjects = new HashMap<Bean<?>,
CreationalStore>();
     

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/OwbElContextListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/OwbElContextListener.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/OwbElContextListener.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/OwbElContextListener.java
Sun Jun 13 13:28:19 2010
@@ -28,7 +28,7 @@ public class OwbElContextListener implem
     public void contextCreated(ELContextEvent event)
     {
         ELContextStore store = new ELContextStore();        
-        ELContextStore.LOCAL_CONTEXT.set(store);
+        ELContextStore.localContext.set(store);
     }
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
Sun Jun 13 13:28:19 2010
@@ -105,7 +105,7 @@ public class WebBeansELResolver extends 
         CreationalContext<Object> creationalContext = null;
         
         //Local store, set by the OwbELContextListener
-        ELContextStore store = ELContextStore.LOCAL_CONTEXT.get();        
+        ELContextStore store = ELContextStore.localContext.get();
         if (obj == null)
         {                      
             //Name of the bean

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java
Sun Jun 13 13:28:19 2010
@@ -71,7 +71,7 @@ public class WrappedValueExpression exte
         finally
         {
             //Destroy dependent store
-            ELContextStore store = ELContextStore.LOCAL_CONTEXT.get();
+            ELContextStore store = ELContextStore.localContext.get();
             if(store != null)
             {
                 store.destroy();

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=954221&r1=954220&r2=954221&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
Sun Jun 13 13:28:19 2010
@@ -1877,14 +1877,16 @@ public final class WebBeansUtil
                 break;
             }
 
-            pLeft = pRight = pbean;
+            pRight = pbean;
+            pLeft = pRight;
             boolean pLeftContinue = true;
             boolean pRightContinue = true;
 
             // find all pbean's super beans and sub sub beans
             while(pLeftContinue || pRightContinue)
             {
-                pLeftContinue = pRightContinue = false;
+                pRightContinue = false;
+                pLeftContinue = false;
                 for(ProducerMethodBean pb : producerBeans)
                 {
                     //left

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Sun Jun 13 13:28:19 2010
@@ -48,7 +48,7 @@ public class WebBeansConfigurationListen
     /**Logger instance*/
     private static final WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansConfigurationListener.class);
     
-	/**Manages the container lifecycle*/
+    /**Manages the container lifecycle*/
     private ContainerLifecycle lifeCycle = null;
 
     /**
@@ -58,10 +58,10 @@ public class WebBeansConfigurationListen
     {
         
     }
-    
-	/**
-	 * {@inheritDoc}
-	 */
+
+    /**
+     * {@inheritDoc}
+     */
     public void contextInitialized(ServletContextEvent event)
     {
         this.lifeCycle = LifecycleFactory.getInstance().getLifecycle();
@@ -86,9 +86,9 @@ public class WebBeansConfigurationListen
         this.lifeCycle = null;
     }
 
-	/**
-	 * {@inheritDoc}
-	 */
+    /**
+     * {@inheritDoc}
+     */
     public void requestDestroyed(ServletRequestEvent event)
     {
         if (logger.wblWillLogDebug())
@@ -98,9 +98,9 @@ public class WebBeansConfigurationListen
         this.lifeCycle.getContextService().endContext(RequestScoped.class, event);      
 
     }
 
-	/**
-	 * {@inheritDoc}
-	 */
+    /**
+     * {@inheritDoc}
+     */
     public void requestInitialized(ServletRequestEvent event)
     {
         try
@@ -125,7 +125,8 @@ public class WebBeansConfigurationListen
                     {
                         httpRequest.getSession();
                     }
-                    catch(Exception e) {
+                    catch(Exception e)
+                    {
                         logger.error(OWBLogConst.ERROR_0013, e);
                     }
                 }
@@ -139,9 +140,9 @@ public class WebBeansConfigurationListen
         }
     }
 
-	/**
-	 * {@inheritDoc}
-	 */
+    /**
+     * {@inheritDoc}
+     */
     public void sessionCreated(HttpSessionEvent event)
     {
         try
@@ -159,9 +160,9 @@ public class WebBeansConfigurationListen
         }
     }
 
-	/**
-	 * {@inheritDoc}
-	 */
+    /**
+     * {@inheritDoc}
+     */
     public void sessionDestroyed(HttpSessionEvent event)
     {
         if (logger.wblWillLogDebug())
@@ -174,22 +175,22 @@ public class WebBeansConfigurationListen
         conversationManager.destroyConversationContextWithSessionId(event.getSession().getId());
     }
 
-	/**
-	 * {@inheritDoc}
-	 */    
-	@Override
-	public void sessionDidActivate(HttpSessionEvent event) 
-	{
-	    //TODO activation
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void sessionWillPassivate(HttpSessionEvent event) 
-	{
-	    //TODO Passivation
-	}
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sessionDidActivate(HttpSessionEvent event)
+    {
+        //TODO activation
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void sessionWillPassivate(HttpSessionEvent event)
+    {
+        //TODO Passivation
+    }
 
 }

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=954221&r1=954220&r2=954221&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
Sun Jun 13 13:28:19 2010
@@ -45,10 +45,9 @@ import org.apache.webbeans.context.Sessi
 import org.apache.webbeans.context.SingletonContext;
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.el.ELContextStore;
-import org.apache.webbeans.spi.ContextsService;
 
 /**
- * Web container {@link ContextsService}
+ * Web container {@link org.apache.webbeans.spi.ContextsService}
  * implementation.
  */
 public class WebContextsService extends AbstractContextsService
@@ -335,8 +334,8 @@ public class WebContextsService extends 
         }
         
         //Remove ELContext store
-        ELContextStore.LOCAL_CONTEXT.set(null);
-        ELContextStore.LOCAL_CONTEXT.remove();
+        ELContextStore.localContext.set(null);
+        ELContextStore.localContext.remove();
         
         //Clear thread locals
         requestContext.set(null);

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
Sun Jun 13 13:28:19 2010
@@ -1,22 +1,21 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.webbeans.web.lifecycle.test;
 
 import java.util.Properties;

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java?rev=954221&r1=954220&r2=954221&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/MockServletContext.java
Sun Jun 13 13:28:19 2010
@@ -174,96 +174,95 @@ public class MockServletContext implemen
     }
 
     /*--- NEW SERVLET 3.0 FUNCTIONS! -- */
-    /*
-	public Dynamic addFilter(String arg0, String arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Dynamic addFilter(String arg0, Filter arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-			String arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-			Servlet arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
-			Class<? extends Servlet> arg1) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public <T extends Filter> T createFilter(Class<T> arg0)
-			throws ServletException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public <T extends Servlet> T createServlet(Class<T> arg0)
-			throws ServletException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public FilterRegistration getFilterRegistration(String arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Map<String, FilterRegistration> getFilterRegistrations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public ServletRegistration getServletRegistration(String arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Map<String, ServletRegistration> getServletRegistrations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public SessionCookieConfig getSessionCookieConfig() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean setInitParameter(String arg0, String arg1) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-    */
+    /*X
+    public Dynamic addFilter(String arg0, String arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Dynamic addFilter(String arg0, Filter arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Dynamic addFilter(String arg0, Class<? extends Filter> arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+                                                                String arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+                                                                Servlet arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0,
+                                                                Class<? extends Servlet>
arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public <T extends Filter> T createFilter(Class<T> arg0)
+            throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public <T extends Servlet> T createServlet(Class<T> arg0)
+            throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public FilterRegistration getFilterRegistration(String arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Map<String, FilterRegistration> getFilterRegistrations() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public ServletRegistration getServletRegistration(String arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Map<String, ServletRegistration> getServletRegistrations() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public SessionCookieConfig getSessionCookieConfig() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public boolean setInitParameter(String arg0, String arg1) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
+        // TODO Auto-generated method stub
+
+    }
+    */
 }



Mime
View raw message