myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1073546 - in /myfaces/extensions/cdi/trunk: component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/ core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ core/impl/...
Date Tue, 22 Feb 2011 23:28:10 GMT
Author: gpetracek
Date: Tue Feb 22 23:28:08 2011
New Revision: 1073546

URL: http://svn.apache.org/viewvc?rev=1073546&view=rev
Log:
cleanup

Added:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java
Modified:
    myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapperFactory.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/UnmodifiableMap.java
    myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/bv/CodiNotNullConstraintValidator.java
    myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/MapHelper.java
    myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/converter/PojoBean.java
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowBeanProducers.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/SystemEventBroadcaster.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/InternalMessage.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java
    myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java

Modified: myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapperFactory.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadRenderKitWrapperFactory.java Tue Feb 22 23:28:08 2011
@@ -29,6 +29,8 @@ import javax.faces.render.RenderKit;
 @Singleton
 public class TrinidadRenderKitWrapperFactory implements RenderKitWrapperFactory
 {
+    private static final long serialVersionUID = -6001306384562596713L;
+
     public RenderKit create(RenderKit renderKit)
     {
         return new TrinidadRenderKitWrapper(renderKit);

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java Tue Feb 22 23:28:08 2011
@@ -18,11 +18,13 @@
  */
 package org.apache.myfaces.extensions.cdi.core.api.config.view;
 
+import java.io.Serializable;
+
 /**
  * Marker interface for type-safe view-config classes.
  *
  * @author Gerhard Petracek
  */
-public interface ViewConfig
+public interface ViewConfig extends Serializable
 {
 }

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CoreStartupObserver.java Tue Feb 22 23:28:08 2011
@@ -19,7 +19,6 @@
 package org.apache.myfaces.extensions.cdi.core.impl;
 
 import org.apache.myfaces.extensions.cdi.core.api.CodiInformation;
-import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
 import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
 import org.apache.myfaces.extensions.cdi.core.api.startup.event.StartupEvent;
@@ -39,9 +38,6 @@ import java.util.Map;
 public class CoreStartupObserver extends AbstractStartupObserver
 {
     @Inject
-    protected Logger logger;
-
-    @Inject
     protected ProjectStage projectStage;
 
     protected CoreStartupObserver()

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java Tue Feb 22 23:28:08 2011
@@ -332,28 +332,7 @@ public class DefaultLogger implements Lo
 
     public Factory getFactory()
     {
-        return new Factory()
-        {
-            public Logger getLogger(String s)
-            {
-                return new DefaultLogger(s);
-            }
-
-            public Logger getLogger(String s, String s1)
-            {
-                return new DefaultLogger(s, s1, false);
-            }
-
-            public Logger getAnonymousLogger()
-            {
-                return new DefaultLogger();
-            }
-
-            public Logger getAnonymousLogger(String s)
-            {
-                return new DefaultLogger(null, s, true);
-            }
-        };
+        return new DefaultLoggerFactory();
     }
 
     @SuppressWarnings({"UnusedDeclaration"})

Added: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java?rev=1073546&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java (added)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLoggerFactory.java Tue Feb 22 23:28:08 2011
@@ -0,0 +1,49 @@
+/*
+ * 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.myfaces.extensions.cdi.core.impl.logging;
+
+import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
+
+/**
+ * @author Gerhard Petracek
+ */
+class DefaultLoggerFactory implements Logger.Factory
+{
+    private static final long serialVersionUID = -4149574697548186019L;
+
+    public Logger getLogger(String s)
+    {
+        return new DefaultLogger(s);
+    }
+
+    public Logger getLogger(String s, String s1)
+    {
+        return new DefaultLogger(s, s1, false);
+    }
+
+    public Logger getAnonymousLogger()
+    {
+        return new DefaultLogger();
+    }
+
+    public Logger getAnonymousLogger(String s)
+    {
+        return new DefaultLogger(null, s, true);
+    }
+}

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java Tue Feb 22 23:28:08 2011
@@ -51,17 +51,17 @@ public abstract class AbstractGroupedCon
     {
         this.beanManager = beanManager;
 
-        boolean useFallback = true;
+        boolean useCreationFallback = true;
         for(StackTraceElement element : runtimeException.getStackTrace())
         {
             if(element.toString().contains("org.apache.webbeans."))
             {
-                useFallback = false;
+                useCreationFallback = false;
                 break;
             }
         }
 
-        this.useFallback = useFallback;
+        this.useFallback = useCreationFallback;
     }
 
     public <T> T create(Bean<T> bean, CreationalContext<T> creationalContext)

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java Tue Feb 22 23:28:08 2011
@@ -369,7 +369,11 @@ public class CodiUtils
         }
         catch (Exception e)
         {
-            throw new RuntimeException("Exception in method call : " + method.getName());
+            if(e instanceof RuntimeException)
+            {
+                throw (RuntimeException)e;
+            }
+            throw new RuntimeException("Exception in method call : " + method.getName(), e);
         }
         finally
         {

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/UnmodifiableMap.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/UnmodifiableMap.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/UnmodifiableMap.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/UnmodifiableMap.java Tue Feb 22 23:28:08 2011
@@ -30,27 +30,29 @@ public abstract class UnmodifiableMap<K,
 {
     private static final long serialVersionUID = -7117422976009229722L;
 
+    private static final String NOT_ALLOWED_MESSAGE = "It isn't allowed to modify this map!";
+
     @Override
     public final V put(K key, V value)
     {
-        throw new UnsupportedOperationException("It isn't allowed to modify this map!");
+        throw new UnsupportedOperationException(NOT_ALLOWED_MESSAGE);
     }
 
     @Override
     public final void putAll(Map<? extends K, ? extends V> m)
     {
-        throw new UnsupportedOperationException("It isn't allowed to modify this map!");
+        throw new UnsupportedOperationException(NOT_ALLOWED_MESSAGE);
     }
 
     @Override
     public final V remove(Object key)
     {
-        throw new UnsupportedOperationException("It isn't allowed to modify this map!");
+        throw new UnsupportedOperationException(NOT_ALLOWED_MESSAGE);
     }
 
     @Override
     public final void clear()
     {
-        throw new UnsupportedOperationException("It isn't allowed to modify this map!");
+        throw new UnsupportedOperationException(NOT_ALLOWED_MESSAGE);
     }
 }

Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/bv/CodiNotNullConstraintValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/bv/CodiNotNullConstraintValidator.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/bv/CodiNotNullConstraintValidator.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/bv/CodiNotNullConstraintValidator.java Tue Feb 22 23:28:08 2011
@@ -38,12 +38,6 @@ public class CodiNotNullConstraintValida
     //private ProjectStage projectStage;
 
     @Override
-    public void initialize(NotNull parameters)
-    {
-        super.initialize(parameters);
-    }
-
-    @Override
     public boolean isValid(Object object, ConstraintValidatorContext constraintValidatorContext)
     {
         boolean isValid = super.isValid(object, constraintValidatorContext);

Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/MapHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/MapHelper.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/MapHelper.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/message/client/MapHelper.java Tue Feb 22 23:28:08 2011
@@ -27,6 +27,8 @@ import java.util.Collection;
  */
 abstract class MapHelper<K, V> implements Map<K, V>
 {
+    private final String unsupportedMessage = "unsupported operation";
+
     protected abstract V getValue(K key);
 
     public final V get(Object key)
@@ -36,56 +38,56 @@ abstract class MapHelper<K, V> implement
 
     public final int size()
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final boolean isEmpty()
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final boolean containsKey(Object key)
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final boolean containsValue(Object value)
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final V put(K key, V value)
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final V remove(Object key)
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final void putAll(Map<? extends K, ? extends V> m)
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final void clear()
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final Set<K> keySet()
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final Collection<V> values()
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 
     public final Set<Entry<K, V>> entrySet()
     {
-        throw new UnsupportedOperationException("unsupported operation");
+        throw new UnsupportedOperationException(unsupportedMessage);
     }
 }

Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/converter/PojoBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/converter/PojoBean.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/converter/PojoBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/examples/jsf20/converter/PojoBean.java Tue Feb 22 23:28:08 2011
@@ -30,6 +30,7 @@ import java.io.Serializable;
 @ViewAccessScoped
 public class PojoBean implements Serializable
 {
+    private static final long serialVersionUID = 1324579045807079994L;
 
     private Pojo selectedPojo;
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java Tue Feb 22 23:28:08 2011
@@ -67,6 +67,10 @@ public abstract class ClassLevelValidato
         }
         catch (Exception e)
         {
+            if(e instanceof RuntimeException)
+            {
+                throw (RuntimeException)e;
+            }
             throw new RuntimeException(e);
         }
     }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageBeanConfigEntry.java Tue Feb 22 23:28:08 2011
@@ -43,6 +43,8 @@ import static org.apache.myfaces.extensi
  */
 class DefaultPageBeanConfigEntry implements PageBeanConfigEntry
 {
+    private static final long serialVersionUID = -6578882497923715372L;
+
     private final String beanName;
 
     private final Class beanClass;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultRequestLifecycleCallbackEntry.java Tue Feb 22 23:28:08 2011
@@ -29,6 +29,8 @@ import java.util.List;
  */
 public class DefaultRequestLifecycleCallbackEntry implements RequestLifecycleCallbackEntry
 {
+    private static final long serialVersionUID = -5230233565028268416L;
+
     private final List<Method> beforePhaseCallbacks;
 
     private final List<Method> afterPhaseCallbacks;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigEntry.java Tue Feb 22 23:28:08 2011
@@ -63,7 +63,7 @@ public class DefaultViewConfigEntry impl
 
     private boolean simpleEntryMode = false;
 
-    private BeanManager beanManager;
+    private transient BeanManager beanManager;
 
     public DefaultViewConfigEntry(String viewId,
                                   Class<? extends ViewConfig> viewDefinitionClass,

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java Tue Feb 22 23:28:08 2011
@@ -40,9 +40,11 @@ class ExtractedViewConfigDefinitionEntry
     private static final long serialVersionUID = -8387356240329549455L;
 
     final static String ROOT_PATH = "/";
-    protected final static String DEFAULT_PAGE_NAME = "";
     final static String DEFAULT_EXTENSION = Page.Extension.XHTML;
 
+    protected final static String DEFAULT_PAGE_NAME = "";
+    private static final String NOT_IMPLEMENTED_MESSAGE = "not implemented";
+
     private List<Class<? extends Annotation>> foundAndBlockedMetaDataTypes
             = new ArrayList<Class<? extends Annotation>>();
 
@@ -232,7 +234,7 @@ class ExtractedViewConfigDefinitionEntry
      */
     public Class<? extends ViewConfig> getViewDefinitionClass()
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     private String ensureValidViewIds(String result)
@@ -275,32 +277,32 @@ class ExtractedViewConfigDefinitionEntry
 
     public void addPageBean(Class pageBeanClass)
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     public void invokeInitViewMethods()
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     public void invokePrePageActionMethods()
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     public void invokePreRenderViewMethods()
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     public void invokePostRenderViewMethods()
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     public List<PageBeanConfigEntry> getPageBeanDefinitions()
     {
-        throw new IllegalStateException("not implemented");
+        throw new IllegalStateException(NOT_IMPLEMENTED_MESSAGE);
     }
 
     public void blockMetaData(Class<? extends Annotation> metaDataClass)

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java Tue Feb 22 23:28:08 2011
@@ -240,11 +240,11 @@ public class ViewConfigCache
     {
         if(DefaultErrorView.class.isAssignableFrom(viewDefinitionEntry.getViewDefinitionClass()))
         {
-            ViewConfigEntry defaultErrorView = getDefaultErrorView();
-            if(defaultErrorView != null)
+            ViewConfigEntry currentErrorView = getDefaultErrorView();
+            if(currentErrorView != null)
             {
                 throw ambiguousDefaultErrorViewDefinitionException(viewDefinitionEntry.getViewDefinitionClass(),
-                                                                   defaultErrorView.getViewDefinitionClass());
+                                                                   currentErrorView.getViewDefinitionClass());
             }
 
             setDefaultErrorView(viewDefinitionEntry);

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java Tue Feb 22 23:28:08 2011
@@ -202,7 +202,6 @@ public class ViewConfigExtension impleme
             this.logger.info(annotatedType.getJavaClass().getName() + " will be used as page-bean.");
         }
 
-        String viewId;
         for(Class<? extends ViewConfig> viewConfigClass : view.value())
         {
             ViewConfigEntry viewConfigEntry = ViewConfigCache.getViewDefinition(viewConfigClass);

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageBeanConfigEntry.java Tue Feb 22 23:28:08 2011
@@ -21,11 +21,12 @@ package org.apache.myfaces.extensions.cd
 import javax.faces.event.PhaseId;
 import java.lang.reflect.Method;
 import java.util.List;
+import java.io.Serializable;
 
 /**
  * @author Gerhard Petracek
  */
-public interface PageBeanConfigEntry
+public interface PageBeanConfigEntry extends Serializable
 {
     Class getBeanClass();
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/RequestLifecycleCallbackEntry.java Tue Feb 22 23:28:08 2011
@@ -20,11 +20,12 @@ package org.apache.myfaces.extensions.cd
 
 import java.lang.reflect.Method;
 import java.util.List;
+import java.io.Serializable;
 
 /**
  * @author Gerhard Petracek
  */
-public interface RequestLifecycleCallbackEntry
+public interface RequestLifecycleCallbackEntry extends Serializable
 {
     List<Method> getBeforePhaseCallbacks();
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Tue Feb 22 23:28:08 2011
@@ -71,7 +71,7 @@ public class RedirectedConversationAware
         sendRedirect(this.wrapped, url, this.windowHandler);
     }
 
-    private synchronized void lazyInit()
+    private void lazyInit()
     {
         if(this.windowHandler == null)
         {

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowBeanProducers.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowBeanProducers.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowBeanProducers.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowBeanProducers.java Tue Feb 22 23:28:08 2011
@@ -65,7 +65,7 @@ public class WindowBeanProducers
             @Override
             public Object get(Object key)
             {
-                if(key == null || !(key instanceof String))
+                if(!(key instanceof String))
                 {
                     return null;
                 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/SystemEventBroadcaster.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/SystemEventBroadcaster.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/SystemEventBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/SystemEventBroadcaster.java Tue Feb 22 23:28:08 2011
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf2.impl.listener.system;
 
-import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.faces.event.PostConstructApplicationEvent;
@@ -42,9 +40,6 @@ public class SystemEventBroadcaster
     @Inject
     private Event<PreDestroyApplicationEvent> preDestroyApplicationEvent;
 
-    @Inject
-    private ProjectStage projectStage;
-
     protected SystemEventBroadcaster()
     {
     }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Tue Feb 22 23:28:08 2011
@@ -78,7 +78,8 @@ public class RedirectedConversationAware
             sendRedirect(this.wrapped, url, this.windowHandler);
         }
     }
-    private synchronized void lazyInit()
+
+    private void lazyInit()
     {
         if(this.windowHandler == null)
         {

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/view/ViewScopedContext.java Tue Feb 22 23:28:08 2011
@@ -41,9 +41,9 @@ import javax.faces.event.SystemEventList
  */
 public class ViewScopedContext implements Context, SystemEventListener
 {
-
-    private final static String COMPONENT_MAP_NAME ="codi.componentInstanceMap";
-    private final static String CREATIONAL_MAP_NAME ="codi.creationalInstanceMap";
+    private static final String COMPONENT_MAP_NAME ="codi.componentInstanceMap";
+    private static final String CREATIONAL_MAP_NAME ="codi.creationalInstanceMap";
+    private static final String UNCHECKED = "unchecked";
 
     private boolean isJsfSubscribed = false;
 
@@ -61,7 +61,7 @@ public class ViewScopedContext implement
 
         Map<String, Object> viewMap = getViewMap();
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings(UNCHECKED)
         ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap
                 = (ConcurrentHashMap<Contextual<?>, Object>) viewMap.get(COMPONENT_MAP_NAME);
 
@@ -70,7 +70,7 @@ public class ViewScopedContext implement
             return null;
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings(UNCHECKED)
         T instance = (T) componentInstanceMap.get(component);
 
         return instance;
@@ -82,7 +82,7 @@ public class ViewScopedContext implement
 
         Map<String, Object> viewMap = getViewMap();
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings(UNCHECKED)
         ConcurrentHashMap<Contextual<?>, Object> componentInstanceMap
                 = (ConcurrentHashMap<Contextual<?>, Object>) viewMap.get(COMPONENT_MAP_NAME);
 
@@ -93,7 +93,7 @@ public class ViewScopedContext implement
             viewMap.put(COMPONENT_MAP_NAME, componentInstanceMap);
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings(UNCHECKED)
         ConcurrentHashMap<Contextual<?>, CreationalContext<?>> creationalContextMap
                 = (ConcurrentHashMap<Contextual<?>, CreationalContext<?>>) viewMap.get(CREATIONAL_MAP_NAME);
         if(creationalContextMap == null)
@@ -103,7 +103,7 @@ public class ViewScopedContext implement
             viewMap.put(CREATIONAL_MAP_NAME, creationalContextMap);
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings(UNCHECKED)
         T instance = (T) componentInstanceMap.get(component);
         if (instance != null)
         {
@@ -119,7 +119,7 @@ public class ViewScopedContext implement
         synchronized (componentInstanceMap)
         {
             // just to make sure...
-            @SuppressWarnings("unchecked")
+            @SuppressWarnings(UNCHECKED)
             T i = (T)componentInstanceMap.get(component);
             if (i != null)
             {
@@ -177,7 +177,7 @@ public class ViewScopedContext implement
      *
      * @see javax.faces.event.SystemEventListener#processEvent(javax.faces.event.SystemEvent)
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings(UNCHECKED)
     public void processEvent(SystemEvent event)
     {
         if (event instanceof PreDestroyViewMapEvent)

Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/AbstractMessageHandler.java Tue Feb 22 23:28:08 2011
@@ -40,12 +40,8 @@ public abstract class AbstractMessageHan
 
     protected abstract void processMessage(MessageContext messageContext, Message message);
 
-    public synchronized void addMessageFilter(MessageFilter... messageFilters)
+    public void addMessageFilter(MessageFilter... messageFilters)
     {
-        if (this.messageFilters == null)
-        {
-            this.messageFilters = new CopyOnWriteArraySet<MessageFilter>();
-        }
         this.messageFilters.addAll(Arrays.asList(messageFilters));
     }
 

Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/InternalMessage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/InternalMessage.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/InternalMessage.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/java/org/apache/myfaces/extensions/cdi/message/api/payload/InternalMessage.java Tue Feb 22 23:28:08 2011
@@ -23,7 +23,7 @@ package org.apache.myfaces.extensions.cd
  *
  * @author Gerhard Petracek
  */
-public class InternalMessage extends AbstractMessagePayload
+public final class InternalMessage extends AbstractMessagePayload
 {
     private static final long serialVersionUID = -1336393216007593320L;
 

Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultCompositeMessageHandler.java Tue Feb 22 23:28:08 2011
@@ -38,7 +38,7 @@ class DefaultCompositeMessageHandler imp
 {
     private static final long serialVersionUID = 3553885372006874180L;
 
-    private ArrayList<MessageHandler> messageHandlers = new ArrayList<MessageHandler>();
+    private List<MessageHandler> messageHandlers = new ArrayList<MessageHandler>();
 
     DefaultCompositeMessageHandler(Iterable<MessageHandler> messageHandlerIterable)
     {

Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageBuilder.java Tue Feb 22 23:28:08 2011
@@ -35,11 +35,12 @@ import org.apache.myfaces.extensions.cdi
 import org.apache.myfaces.extensions.cdi.message.api.payload.ArgumentDescriptor;
 
 import java.io.Serializable;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
 
 /**
  * @author Gerhard Petracek
@@ -48,12 +49,12 @@ class DefaultMessageBuilder implements M
 {
     private static final long serialVersionUID = 892218539314030675L;
 
-    private ArrayList<Serializable> argumentList;
+    private List<Serializable> argumentList;
 
-    private HashSet<NamedArgument> namedArguments;
+    private Set<NamedArgument> namedArguments;
     
     private MessageContext messageContext;
-    private HashMap<Class, MessagePayload> messagePayload;
+    private Map<Class, MessagePayload> messagePayload;
     private String messageDescriptor;
 
     private MessageFactory messageFactory;

Added: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java?rev=1073546&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java (added)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArgumentBuilder.java Tue Feb 22 23:28:08 2011
@@ -0,0 +1,48 @@
+/*
+ * 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.myfaces.extensions.cdi.message.impl;
+
+import org.apache.myfaces.extensions.cdi.message.api.NamedArgument;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.io.Serializable;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class NamedArgumentBuilder
+{
+    private List<NamedArgument> parameters = new ArrayList<NamedArgument>();
+
+    NamedArgumentBuilder()
+    {
+    }
+
+    public NamedArgumentBuilder add(String name, Serializable value)
+    {
+        this.parameters.add(new DefaultNamedArgument(name, value));
+        return this;
+    }
+
+    public NamedArgument[] create()
+    {
+        return this.parameters.toArray(new NamedArgument[this.parameters.size()]);
+    }
+}

Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NamedArguments.java Tue Feb 22 23:28:08 2011
@@ -18,11 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.message.impl;
 
-import org.apache.myfaces.extensions.cdi.message.api.NamedArgument;
-
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,7 +28,7 @@ import java.util.Map;
 /**
  * @author Gerhard Petracek
  */
-public class NamedArguments
+public final class NamedArguments
 {
     private NamedArgumentBuilder namedArgumentBuilder = new NamedArgumentBuilder();
 
@@ -47,7 +43,7 @@ public class NamedArguments
             return new Serializable[]{};
         }
 
-        NamedArguments.NamedArgumentBuilder namedArgumentBuilder = new NamedArguments().getNamedArgumentBuilder();
+        NamedArgumentBuilder namedArgumentBuilder = new NamedArguments().getNamedArgumentBuilder();
         for (Map.Entry<String, Serializable> entry : arguments.entrySet())
         {
             namedArgumentBuilder = namedArgumentBuilder.add(entry.getKey(), entry.getValue());
@@ -65,24 +61,4 @@ public class NamedArguments
     {
         return namedArgumentBuilder;
     }
-
-    public class NamedArgumentBuilder
-    {
-        private List<NamedArgument> parameters = new ArrayList<NamedArgument>();
-
-        private NamedArgumentBuilder()
-        {
-        }
-
-        public NamedArgumentBuilder add(String name, Serializable value)
-        {
-            this.parameters.add(new DefaultNamedArgument(name, value));
-            return this;
-        }
-
-        public NamedArgument[] create()
-        {
-            return this.parameters.toArray(new NamedArgument[this.parameters.size()]);
-        }
-    }
 }

Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/NumberedArgumentAwareMessageInterpolator.java Tue Feb 22 23:28:08 2011
@@ -74,7 +74,7 @@ public class NumberedArgumentAwareMessag
             argument = arguments[i];
             localizedArgument = formatAsString(messageContext, argument);
 
-            if (localizedArgument != argument)
+            if (argument != null)
             {
                 if (localizedArguments == null)
                 {

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/DefaultLanguageManager.java Tue Feb 22 23:28:08 2011
@@ -29,12 +29,15 @@ import org.apache.myfaces.extensions.cdi
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.context.ApplicationScoped;
+import javax.annotation.PostConstruct;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Gerhard Petracek
  */
+@ApplicationScoped
 public class DefaultLanguageManager implements LanguageManager
 {
     private ConcurrentHashMap<Class<? extends Language>, Language> languageCache;
@@ -45,8 +48,6 @@ public class DefaultLanguageManager impl
 
     public String getLanguageName(Class<? extends Language> languageType)
     {
-        lazyInitCache();
-
         Language language = this.languageCache.get(languageType);
 
         if(language == null)
@@ -56,7 +57,8 @@ public class DefaultLanguageManager impl
         return language.getName();
     }
 
-    private synchronized void lazyInitCache()
+    @PostConstruct
+    protected void init()
     {
         if(languageCache != null)
         {
@@ -82,6 +84,12 @@ public class DefaultLanguageManager impl
 
             currentBean = languageBean.create(creationalContext);
 
+            if(currentBean == null)
+            {
+                //TODO
+                continue;
+            }
+
             if(this.languageCache.containsKey(currentBean.getId()))
             {
                 throw ambiguousLanguageDefinition(

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java Tue Feb 22 23:28:08 2011
@@ -19,6 +19,7 @@
 package org.apache.myfaces.extensions.cdi.scripting.impl.util;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Gerhard Petracek
@@ -28,7 +29,7 @@ class ArgumentAwareScriptHelperMap exten
     private static final long serialVersionUID = 393871900655666197L;
 
     private String language;
-    private HashMap<String, Object> arguments = new HashMap<String, Object>();
+    private Map<String, Object> arguments = new HashMap<String, Object>();
 
     public ArgumentAwareScriptHelperMap(String language, String arguments)
     {

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/ContainerNotStartedException.java Tue Feb 22 23:28:08 2011
@@ -18,10 +18,17 @@
  */
 package org.apache.myfaces.extensions.cdi.test.cargo;
 
+import java.io.IOException;
+
 /**
  * @author Gerhard Petracek
  */
 public class ContainerNotStartedException extends RuntimeException
 {
     private static final long serialVersionUID = -2362433864481560645L;
+
+    public ContainerNotStartedException(IOException e)
+    {
+        super(e);
+    }
 }

Modified: myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java?rev=1073546&r1=1073545&r2=1073546&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java (original)
+++ myfaces/extensions/cdi/trunk/test-modules/base-test-infrastructure-module/src/main/java/org/apache/myfaces/extensions/cdi/test/cargo/SimplePageInteraction.java Tue Feb 22 23:28:08 2011
@@ -252,7 +252,7 @@ public class SimplePageInteraction
         {
             if(e instanceof HttpHostConnectException)
             {
-                throw new ContainerNotStartedException();
+                throw new ContainerNotStartedException(e);
             }
             else
             {



Mime
View raw message