You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/12/22 03:37:18 UTC
svn commit: r1051737 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/logging/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/
examples/jsf-examples/hello_myfaces-codi_js...
Author: gpetracek
Date: Wed Dec 22 02:37:17 2010
New Revision: 1051737
URL: http://svn.apache.org/viewvc?rev=1051737&view=rev
Log:
EXTCDI-103 Logger.Factory
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/logging/Logger.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/logging/InstanceProducer.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/logging/Logger.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/logging/Logger.java?rev=1051737&r1=1051736&r2=1051737&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/logging/Logger.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/logging/Logger.java Wed Dec 22 02:37:17 2010
@@ -120,15 +120,20 @@ public interface Logger extends Serializ
*/
java.util.logging.Logger getWrapped();
+ Factory getFactory();
+
/*
* alternative to the static methods - usually they aren't needed - maybe for constructor injection
*/
- Logger getLogger(String s);
+ interface Factory extends Serializable
+ {
+ Logger getLogger(String s);
- Logger getLogger(String s, String s1);
+ Logger getLogger(String s, String s1);
- Logger getAnonymousLogger();
+ Logger getAnonymousLogger();
- Logger getAnonymousLogger(String s);
+ Logger getAnonymousLogger(String s);
+ }
}
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=1051737&r1=1051736&r2=1051737&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 Wed Dec 22 02:37:17 2010
@@ -290,24 +290,30 @@ public class DefaultLogger implements Lo
getWrapped().setParent(logger);
}
- public Logger getLogger(String s)
+ public Factory getFactory()
{
- return new DefaultLogger(s);
- }
+ 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 getLogger(String s, String s1)
+ {
+ return new DefaultLogger(s, s1, false);
+ }
- public Logger getAnonymousLogger()
- {
- return new DefaultLogger();
- }
+ public Logger getAnonymousLogger()
+ {
+ return new DefaultLogger();
+ }
- public Logger getAnonymousLogger(String s)
- {
- return new DefaultLogger(null, s, true);
+ public Logger getAnonymousLogger(String s)
+ {
+ return new DefaultLogger(null, s, true);
+ }
+ };
}
@SuppressWarnings({"UnusedDeclaration"})
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java?rev=1051737&r1=1051736&r2=1051737&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/InstanceProducer.java Wed Dec 22 02:37:17 2010
@@ -39,6 +39,12 @@ final class InstanceProducer
}
@Produces
+ public Logger.Factory getLoggerFactory(InjectionPoint injectionPoint)
+ {
+ return new DefaultLogger(injectionPoint.getBean().getBeanClass().getName()).getFactory();
+ }
+
+ @Produces
@LoggerDetails
public Logger getLoggerForDetails(InjectionPoint injectionPoint)
{
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java?rev=1051737&r1=1051736&r2=1051737&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java Wed Dec 22 02:37:17 2010
@@ -58,12 +58,17 @@ public class ConversationDemoBean1 imple
@LoggerDetails(name = "logger2")
private Logger logger2;
+ @Inject
+ private Logger.Factory loggerFactory;
+
@PostConstruct
public void init()
{
this.createdAt = new Date();
- this.logger1.info(getClass().getName() + " created at " + this.createdAt);
- this.logger2.info(getClass().getName() + " created at " + this.createdAt);
+ String message = getClass().getName() + " created at " + this.createdAt;
+ this.logger1.info(message);
+ this.logger2.info(message);
+ this.loggerFactory.getLogger("logger3").info(message);
}
public String next()