myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1073561 - 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/ core/api/src/main/java...
Date Wed, 23 Feb 2011 00:36:46 GMT
Author: gpetracek
Date: Wed Feb 23 00:36:44 2011
New Revision: 1073561

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

Modified:
    myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.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/util/ClassDeactivatorAggregator.java
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/BeanValidationModuleStartupObserver.java
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/JpaModuleStartupObserver.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.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/ExtractedInlineViewConfigDefinitionEntry.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/message/JsfAwareMessageHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.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/DefaultFormatterFactory.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/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptingModuleStartupObserver.java
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ArgumentAwareScriptHelperMap.java

Modified: myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.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/TrinidadSupportModuleStartupObserver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/TrinidadSupportModuleStartupObserver.java Wed Feb 23 00:36:44 2011
@@ -24,6 +24,7 @@ import org.apache.myfaces.extensions.cdi
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
+import java.util.logging.Level;
 
 /**
  * @author Gerhard Petracek
@@ -54,10 +55,10 @@ public class TrinidadSupportModuleStartu
             this.logger.info(info.toString());
         }
         //avoid that this log harms the startup
-        catch (Exception t)
+        catch (Exception e)
         {
-            this.logger.warning("Trinidad-Support-Module couldn't log the current configuration." +
-                                "Startup will continue!");
+            this.logger.log(Level.WARNING, "Trinidad-Support-Module couldn't log the current configuration." +
+                                "Startup will continue!", e);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java Wed Feb 23 00:36:44 2011
@@ -28,7 +28,8 @@ import java.util.HashSet;
  */
 public abstract class AbstractClassDeactivator implements ClassDeactivator
 {
-    private Set<Class> deactivatedClasses;
+    //HashSet due to Serializable warning in checkstyle rules
+    private HashSet<Class> deactivatedClasses;
 
     /**
      * {@inheritDoc}

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.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/ManualView.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java Wed Feb 23 00:36:44 2011
@@ -25,4 +25,5 @@ package org.apache.myfaces.extensions.cd
  */
 public final class ManualView implements ViewConfig
 {
+    private static final long serialVersionUID = -2477132285461472286L;
 }

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java Wed Feb 23 00:36:44 2011
@@ -27,6 +27,8 @@ import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * @author Gerhard Petracek
@@ -80,4 +82,10 @@ public abstract class CodiStartupBroadca
 
         initialized.put(classLoader, Boolean.TRUE);
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java Wed Feb 23 00:36:44 2011
@@ -118,7 +118,7 @@ public class ClassUtils
         {
             return targetClass.newInstance();
         }
-        catch (Exception t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }
@@ -131,7 +131,7 @@ public class ClassUtils
         {
             return (T)targetClass.newInstance();
         }
-        catch (Exception t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }
@@ -152,7 +152,7 @@ public class ClassUtils
         {
             return instantiateClassForName(className);
         }
-        catch (Exception t)
+        catch (Exception e)
         {
             //do nothing - it was just a try
         }
@@ -174,7 +174,7 @@ public class ClassUtils
             return new Manifest(new URL(manifestFileLocation).openStream())
                     .getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
         }
-        catch (Exception t)
+        catch (Exception e)
         {
             return null;
         }
@@ -189,7 +189,7 @@ public class ClassUtils
             return new Manifest(new URL(manifestFileLocation).openStream())
                     .getMainAttributes().getValue("Revision");
         }
-        catch (Exception t)
+        catch (Exception e)
         {
             return null;
         }

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=1073561&r1=1073560&r2=1073561&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 Wed Feb 23 00:36:44 2011
@@ -30,6 +30,7 @@ import javax.enterprise.inject.spi.BeanM
 import javax.inject.Inject;
 import java.io.Serializable;
 import java.util.Map;
+import java.util.logging.Level;
 
 /**
  * @author Gerhard Petracek
@@ -101,10 +102,10 @@ public class CoreStartupObserver extends
             this.logger.info(info.toString());
         }
         //avoid that this log harms the startup
-        catch (Exception t)
+        catch (Exception e)
         {
-            this.logger.warning("Core-Module couldn't log the current configuration." +
-                                "Startup will continue!");
+            this.logger.log(Level.WARNING, "Core-Module couldn't log the current configuration." +
+                                "Startup will continue!", e);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ClassDeactivatorAggregator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ClassDeactivatorAggregator.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ClassDeactivatorAggregator.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/ClassDeactivatorAggregator.java Wed Feb 23 00:36:44 2011
@@ -33,7 +33,8 @@ class ClassDeactivatorAggregator impleme
 {
     private static final long serialVersionUID = 5996031456559606240L;
 
-    private Set<Class> deactivatedClasses = new HashSet<Class>();
+    //HashSet due to Serializable warning in checkstyle rules
+    private HashSet<Class> deactivatedClasses = new HashSet<Class>();
 
     private String deactivators = "";
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/BeanValidationModuleStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/BeanValidationModuleStartupObserver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/BeanValidationModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/BeanValidationModuleStartupObserver.java Wed Feb 23 00:36:44 2011
@@ -24,6 +24,7 @@ import org.apache.myfaces.extensions.cdi
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
+import java.util.logging.Level;
 
 /**
  * @author Gerhard Petracek
@@ -53,10 +54,10 @@ public class BeanValidationModuleStartup
             this.logger.info(info.toString());
         }
         //avoid that this log harms the startup
-        catch (Exception t)
+        catch (Exception e)
         {
-            this.logger.warning("Bean-Validation-Module couldn't log the current configuration." +
-                                "Startup will continue!");
+            this.logger.log(Level.WARNING, "Bean-Validation-Module couldn't log the current configuration." +
+                                "Startup will continue!", e);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java Wed Feb 23 00:36:44 2011
@@ -24,6 +24,8 @@ import org.apache.myfaces.extensions.cdi
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorFactory;
 import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * @author Gerhard Petracek
@@ -65,4 +67,10 @@ class InjectableConstraintValidatorFacto
     {
         return getWrapped().getInstance(tClass);
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java Wed Feb 23 00:36:44 2011
@@ -23,6 +23,8 @@ import org.apache.myfaces.extensions.cdi
 
 import javax.validation.MessageInterpolator;
 import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 import java.util.Locale;
 
 /**
@@ -70,4 +72,10 @@ class InjectableMessageInterpolator impl
     {
         return getWrapped().interpolate(s, context, locale);
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java Wed Feb 23 00:36:44 2011
@@ -25,6 +25,8 @@ import javax.validation.ConstraintViolat
 import javax.validation.Validator;
 import javax.validation.metadata.BeanDescriptor;
 import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 import java.util.Set;
 
 /**
@@ -86,4 +88,10 @@ class InjectableValidator implements Val
     {
         return getWrapped().unwrap(tClass);
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java Wed Feb 23 00:36:44 2011
@@ -28,6 +28,8 @@ import javax.validation.MessageInterpola
 import javax.validation.TraversableResolver;
 import javax.validation.ConstraintValidatorFactory;
 import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * @author Gerhard Petracek
@@ -93,4 +95,10 @@ class InjectableValidatorFactory impleme
     {
         return getWrapped().unwrap(tClass);
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java Wed Feb 23 00:36:44 2011
@@ -43,6 +43,8 @@ import java.util.Set;
 import java.util.HashSet;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * @author Mark Struberg
@@ -414,4 +416,10 @@ public class DefaultTransactionalInterce
                 "Hint: @Transactional just allows one qualifier -> using multiple Entity-Managers " +
                 "(-> different qualifiers) within ONE intercepted method isn't supported.");
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/JpaModuleStartupObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/JpaModuleStartupObserver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/JpaModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/JpaModuleStartupObserver.java Wed Feb 23 00:36:44 2011
@@ -24,6 +24,7 @@ import org.apache.myfaces.extensions.cdi
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
+import java.util.logging.Level;
 
 /**
  * @author Gerhard Petracek
@@ -54,10 +55,10 @@ public class JpaModuleStartupObserver ex
             this.logger.info(info.toString());
         }
         //avoid that this log harms the startup
-        catch (Exception t)
+        catch (Exception e)
         {
-            this.logger.warning("JPA-Module couldn't log the current configuration." +
-                                "Startup will continue!");
+            this.logger.log(Level.WARNING, "JPA-Module couldn't log the current configuration." +
+                                "Startup will continue!", e);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java Wed Feb 23 00:36:44 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.api.request;
 
+import java.io.Serializable;
+
 /**
  * Pluggable (internal) helper for resolving the type of the current request.
  * For JSF 1.2 it allows to call the functionality
@@ -26,7 +28,7 @@ package org.apache.myfaces.extensions.cd
  * 
  * @author Gerhard Petracek
  */
-public interface RequestTypeResolver
+public interface RequestTypeResolver extends Serializable
 {
     boolean isPartialRequest();
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.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/JsfModuleStartupObserver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/JsfModuleStartupObserver.java Wed Feb 23 00:36:44 2011
@@ -32,6 +32,7 @@ import javax.enterprise.event.Observes;
 import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyResolver;
 import javax.inject.Inject;
+import java.util.logging.Level;
 
 /**
  * @author Gerhard Petracek
@@ -90,10 +91,10 @@ public class JsfModuleStartupObserver ex
             this.logger.info(info.toString());
         }
         //avoid that this log harms the startup
-        catch (Exception t)
+        catch (Exception e)
         {
-            this.logger.warning("JSF-Module couldn't log the current configuration." +
-                                "Startup will continue!");
+            this.logger.log(Level.WARNING, "JSF-Module couldn't log the current configuration." +
+                                "Startup will continue!", e);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.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/bv/resolver/SerializableValidatorFactory.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java Wed Feb 23 00:36:44 2011
@@ -28,6 +28,8 @@ import javax.validation.MessageInterpola
 import javax.validation.TraversableResolver;
 import javax.validation.ConstraintValidatorFactory;
 import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -140,4 +142,10 @@ class SerializableValidatorFactory imple
 
         return this.currentValidatorFactory;
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

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=1073561&r1=1073560&r2=1073561&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 Wed Feb 23 00:36:44 2011
@@ -35,6 +35,8 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
 
@@ -340,4 +342,10 @@ public class DefaultViewConfigEntry impl
     {
         return viewId.hashCode();
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.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/ExtractedInlineViewConfigDefinitionEntry.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java Wed Feb 23 00:36:44 2011
@@ -68,7 +68,7 @@ class ExtractedInlineViewConfigDefinitio
         if(".".equals(viewConfigRoot.basePath()))
         {
             String packageName = viewConfigRootMarker.getPackage().getName();
-            this.basePath = "/" + packageName.substring(packageName.lastIndexOf(".") + 1) + "/" + this.basePath;
+            this.basePath = "/" + packageName.substring(packageName.lastIndexOf('.') + 1) + "/" + this.basePath;
         }
 
         if(DEFAULT_PAGE_NAME.equals(this.pageName))

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=1073561&r1=1073560&r2=1073561&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 Wed Feb 23 00:36:44 2011
@@ -172,16 +172,16 @@ class ExtractedViewConfigDefinitionEntry
             if(className.contains("$") && ".".equals(this.basePath))
             {
                 this.basePath = "";
-                className = className.substring(className.lastIndexOf(".") + 1);
+                className = className.substring(className.lastIndexOf('.') + 1);
                 className = convertToPathSyntax(className, this.simpleClassNameToPathMapping);
             }
             else if(className.contains("$"))
             {
-                className = className.substring(className.lastIndexOf("$") + 1);
+                className = className.substring(className.lastIndexOf('$') + 1);
             }
             else
             {
-                className = className.substring(className.lastIndexOf(".") + 1);
+                className = className.substring(className.lastIndexOf('.') + 1);
             }
             className = createPageName(className);
             viewId.append(className);
@@ -192,10 +192,10 @@ class ExtractedViewConfigDefinitionEntry
             String className = this.viewDefinitionClass.getName();
 
             this.basePath = "";
-            className = className.substring(className.lastIndexOf(".") + 1);
+            className = className.substring(className.lastIndexOf('.') + 1);
             className = convertToPathSyntax(className, this.simpleClassNameToPathMapping);
             className = createPageName(className);
-            className = className.substring(0, className.lastIndexOf("/") + 1);
+            className = className.substring(0, className.lastIndexOf('/') + 1);
             className += this.pageName;
             viewId.append(className);
         }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.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/message/JsfAwareMessageHandler.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java Wed Feb 23 00:36:44 2011
@@ -31,6 +31,8 @@ import javax.faces.context.FacesContext;
 import javax.faces.application.FacesMessage;
 import java.util.List;
 import java.util.logging.Logger;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * @author Gerhard Petracek
@@ -133,4 +135,10 @@ class JsfAwareMessageHandler extends Abs
     {
         throw new UnsupportedOperationException("not implemented");
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }
\ No newline at end of file

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.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/request/DefaultRequestTypeResolver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.java Wed Feb 23 00:36:44 2011
@@ -33,10 +33,14 @@ import javax.faces.render.RenderKitFacto
 @RequestScoped
 public class DefaultRequestTypeResolver extends AbstractRequestTypeResolver
 {
+    private static final long serialVersionUID = -3702446693324781260L;
+
     protected RequestTypeResolver createDefaultRequestTypeResolver()
     {
         return new RequestTypeResolver()
         {
+            private static final long serialVersionUID = 6038323522900519990L;
+
             private boolean postRequest;
 
             {

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.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/BeanStorage.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java Wed Feb 23 00:36:44 2011
@@ -28,6 +28,8 @@ import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
 import javax.inject.Named;
 import java.io.Serializable;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.lang.annotation.Annotation;
 
@@ -130,4 +132,10 @@ class BeanStorage implements Serializabl
 
         return result.toString();
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.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/InjectableConversation.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java Wed Feb 23 00:36:44 2011
@@ -28,6 +28,8 @@ import javax.enterprise.inject.Typed;
 import javax.enterprise.inject.spi.Bean;
 import java.lang.annotation.Annotation;
 import java.util.Set;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * @author Gerhard Petracek
@@ -95,4 +97,10 @@ public class InjectableConversation impl
         return this.editableWindowContext.getConversation(this.conversationGroup,
                                                           this.qualifiers.toArray(new Annotation[qualifiers.size()]));
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.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/request/DefaultRequestTypeResolver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/request/DefaultRequestTypeResolver.java Wed Feb 23 00:36:44 2011
@@ -32,11 +32,15 @@ import javax.faces.context.FacesContext;
 public class DefaultRequestTypeResolver
         extends org.apache.myfaces.extensions.cdi.jsf.impl.request.DefaultRequestTypeResolver
 {
+    private static final long serialVersionUID = 3341790605524604799L;
+
     @Override
     protected RequestTypeResolver createDefaultRequestTypeResolver()
     {
         return new RequestTypeResolver()
         {
+            private static final long serialVersionUID = -3715731669842746792L;
+
             private boolean postRequest;
             private boolean partialRequest;
 

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=1073561&r1=1073560&r2=1073561&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 Wed Feb 23 00:36:44 2011
@@ -38,7 +38,8 @@ class DefaultCompositeMessageHandler imp
 {
     private static final long serialVersionUID = 3553885372006874180L;
 
-    private List<MessageHandler> messageHandlers = new ArrayList<MessageHandler>();
+    //ArrayList due to Serializable warning in checkstyle rules
+    private ArrayList<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/DefaultFormatterFactory.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/DefaultFormatterFactory.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java Wed Feb 23 00:36:44 2011
@@ -29,6 +29,8 @@ import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Logger;
+import java.io.ObjectInputStream;
+import java.io.IOException;
 
 /**
  * TODO change to producer
@@ -40,7 +42,7 @@ public class DefaultFormatterFactory imp
 {
     private static final long serialVersionUID = -7462205386564870045L;
 
-    transient private Logger logger = getLogger();
+    private transient Logger logger = getLogger();
 
     private CopyOnWriteArrayList<Formatter> formatters = new CopyOnWriteArrayList<Formatter>();
     private ConcurrentHashMap<Class<?>, Formatter> formatterCache = null;
@@ -142,4 +144,10 @@ public class DefaultFormatterFactory imp
         }
         return this.logger;
     }
+
+    @SuppressWarnings({"UnusedDeclaration"})
+    private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
+    {
+        objectInputStream.defaultReadObject();
+    }
 }

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=1073561&r1=1073560&r2=1073561&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 Wed Feb 23 00:36:44 2011
@@ -40,7 +40,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author Gerhard Petracek
@@ -49,12 +48,15 @@ class DefaultMessageBuilder implements M
 {
     private static final long serialVersionUID = 892218539314030675L;
 
-    private List<Serializable> argumentList;
+    //ArrayList due to Serializable warning in checkstyle rules
+    private ArrayList<Serializable> argumentList;
 
-    private Set<NamedArgument> namedArguments;
+    //HashSet due to Serializable warning in checkstyle rules
+    private HashSet<NamedArgument> namedArguments;
     
     private MessageContext messageContext;
-    private Map<Class, MessagePayload> messagePayload;
+    //HashMap due to Serializable warning in checkstyle rules
+    private HashMap<Class, MessagePayload> messagePayload;
     private String messageDescriptor;
 
     private MessageFactory messageFactory;

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptingModuleStartupObserver.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/ScriptingModuleStartupObserver.java?rev=1073561&r1=1073560&r2=1073561&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptingModuleStartupObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptingModuleStartupObserver.java Wed Feb 23 00:36:44 2011
@@ -24,6 +24,7 @@ import org.apache.myfaces.extensions.cdi
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
+import java.util.logging.Level;
 
 /**
  * @author Gerhard Petracek
@@ -54,10 +55,10 @@ public class ScriptingModuleStartupObser
             this.logger.info(info.toString());
         }
         //avoid that this log harms the startup
-        catch (Exception t)
+        catch (Exception e)
         {
-            this.logger.warning("Scripting-Module couldn't log the current configuration." +
-                                "Startup will continue!");
+            this.logger.log(Level.WARNING, "Scripting-Module couldn't log the current configuration." +
+                                "Startup will continue!", e);
         }
     }
 

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=1073561&r1=1073560&r2=1073561&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 Wed Feb 23 00:36:44 2011
@@ -19,7 +19,6 @@
 package org.apache.myfaces.extensions.cdi.scripting.impl.util;
 
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Gerhard Petracek
@@ -29,7 +28,9 @@ class ArgumentAwareScriptHelperMap exten
     private static final long serialVersionUID = 393871900655666197L;
 
     private String language;
-    private Map<String, Object> arguments = new HashMap<String, Object>();
+
+    //HashMap due to Serializable warning in checkstyle rules
+    private HashMap<String, Object> arguments = new HashMap<String, Object>();
 
     public ArgumentAwareScriptHelperMap(String language, String arguments)
     {



Mime
View raw message