You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/08/11 20:33:29 UTC
svn commit: r1156720 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/
core/impl/src/main/java/org/apache/myfaces/ext...
Author: struberg
Date: Thu Aug 11 18:33:29 2011
New Revision: 1156720
URL: http://svn.apache.org/viewvc?rev=1156720&view=rev
Log:
EXTCDI-212 improve logging for ProjectStageProducer and ActivationExtension
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java?rev=1156720&r1=1156719&r2=1156720&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/CodiDeactivatorExtension.java Thu Aug 11 18:33:29 2011
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
*/
public class CodiDeactivatorExtension implements Extension, Deactivatable
{
- //don't use a static logger
+ //don't use a static LOG
private Logger logger = Logger.getLogger(CodiDeactivatorExtension.class.getName());
/**
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java?rev=1156720&r1=1156719&r2=1156720&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java Thu Aug 11 18:33:29 2011
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.extensions.cdi.core.impl.activation;
+import java.util.logging.Logger;
+
import org.apache.myfaces.extensions.cdi.core.api.activation.Deactivatable;
import org.apache.myfaces.extensions.cdi.core.api.activation.ProjectStageActivated;
import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
@@ -43,6 +45,9 @@ import javax.enterprise.inject.spi.Proce
*/
public class ActivationExtension implements Extension, Deactivatable
{
+ private static final Logger LOG = Logger.getLogger(ActivationExtension.class.getName());
+
+
protected void initProjectStage(@Observes AfterDeploymentValidation afterDeploymentValidation)
{
//trigger initialization
@@ -81,6 +86,9 @@ public class ActivationExtension impleme
{
// this alternative shall not get used
processAnnotatedType.veto();
+
+ LOG.finer("ProjectState Veto for bean with type: "
+ + processAnnotatedType.getAnnotatedType().getJavaClass() );
}
}
}
@@ -92,6 +100,9 @@ public class ActivationExtension impleme
if(!ActivationUtils.isActivated(annotatedClass, PropertyExpressionInterpreter.class))
{
processAnnotatedType.veto();
+
+ LOG.finer("Expression Veto for bean with type: "
+ + processAnnotatedType.getAnnotatedType().getJavaClass() );
}
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java?rev=1156720&r1=1156719&r2=1156720&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java Thu Aug 11 18:33:29 2011
@@ -27,8 +27,6 @@ import javax.enterprise.context.Dependen
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.Produces;
-import java.io.IOException;
-import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.logging.Logger;
@@ -54,14 +52,13 @@ import java.util.logging.Logger;
* }
* </pre>
*
- * TODO move jsf specific parts
*/
@ApplicationScoped
public class ProjectStageProducer implements Serializable
{
private static final long serialVersionUID = -2987762608635612074L;
- protected transient Logger logger = Logger.getLogger(getClass().getName());
+ protected static final Logger LOG = Logger.getLogger(ProjectStageProducer.class.getName());
/**
* ProjectStageProducers must only be created by subclassing producers
@@ -195,13 +192,10 @@ public class ProjectStageProducer implem
{
projectStage = ProjectStage.Production;
}
+
+ LOG.info("Computed the following CODI ProjectStage: " + projectStage);
}
}
}
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
- {
- in.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.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/projectstage/JsfProjectStageProducer.java?rev=1156720&r1=1156719&r2=1156720&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.java Thu Aug 11 18:33:29 2011
@@ -67,9 +67,9 @@ public class JsfProjectStageProducer ext
{
Class jsfProjectStageClass = ClassUtils.tryToLoadClassForName("javax.faces.application.ProjectStage");
- if(jsfProjectStageClass == null && this.logger.isLoggable(Level.WARNING))
+ if(jsfProjectStageClass == null && this.LOG.isLoggable(Level.WARNING))
{
- this.logger.warning("a jsf2 project stage is used but jsf2 isn't in the classpath");
+ this.LOG.warning("a jsf2 project stage is used but jsf2 isn't in the classpath");
}
//check if the jsf project-stage should be ignored