- Revision
- 374
- Author
- mward
- Date
- 2007-11-14 20:12:24 -0600 (Wed, 14 Nov 2007)
Log Message
updated CommonsLoggingMonitor to prefix message with '[WAFFLE]: '
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/ComponentRegistry.java
- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java
- trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java
- trunk/core/src/main/java/org/codehaus/waffle/monitor/Monitor.java
- trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java
- trunk/examples/simple-example/pom.xml
- trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/ComponentRegistry.java (373 => 374)
--- trunk/core/src/main/java/org/codehaus/waffle/ComponentRegistry.java 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/core/src/main/java/org/codehaus/waffle/ComponentRegistry.java 2007-11-15 02:12:24 UTC (rev 374) @@ -11,7 +11,6 @@ package org.codehaus.waffle; import ognl.TypeConverter; - import org.codehaus.waffle.action.ActionMethodExecutor; import org.codehaus.waffle.action.ActionMethodResponseHandler; import org.codehaus.waffle.action.ArgumentResolver; @@ -46,30 +45,32 @@ ActionMethodResponseHandler getActionMethodResponseHandler(); - ArgumentResolver getArgumentResolver(); - - MethodDefinitionFinder getMethodDefinitionFinder(); - - MethodNameResolver getMethodNameResolver(); - ActionMonitor getActionMonitor(); + ArgumentResolver getArgumentResolver(); + BindErrorMessageResolver getBindErrorMessageResolver(); - DataBinder getDataBinder(); - - RequestAttributeBinder getRequestAttributeBinder(); - BindMonitor getBindMonitor(); ContextContainerFactory getContextContainerFactory(); + ControllerDefinitionFactory getControllerDefinitionFactory(); + ControllerNameResolver getControllerNameResolver(); - ControllerDefinitionFactory getControllerDefinitionFactory(); + DataBinder getDataBinder(); MessageResources getMessageResources(); + MethodDefinitionFinder getMethodDefinitionFinder(); + + MethodNameResolver getMethodNameResolver(); + + RequestAttributeBinder getRequestAttributeBinder(); + + ServletMonitor getServletMonitor(); + TypeConverter getTypeConverter(); Validator getValidator(); @@ -78,6 +79,4 @@ ViewResolver getViewResolver(); - ServletMonitor getServletMonitor(); - }
Modified: trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java (373 => 374)
--- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java 2007-11-15 02:12:24 UTC (rev 374) @@ -80,17 +80,17 @@ register(ActionMonitor.class, SilentMonitor.class, servletContext); register(ArgumentResolver.class, HierarchicalArgumentResolver.class, servletContext); register(BindErrorMessageResolver.class, DefaultBindErrorMessageResolver.class, servletContext); + register(BindMonitor.class, SilentMonitor.class, servletContext); register(DataBinder.class, OgnlDataBinder.class, servletContext); - register(RequestAttributeBinder.class, IntrospectingRequestAttributeBinder.class, servletContext); - register(BindMonitor.class, SilentMonitor.class, servletContext); register(ContextContainerFactory.class, PicoContextContainerFactory.class, servletContext); register(ControllerDefinitionFactory.class, ContextControllerDefinitionFactory.class, servletContext); register(ControllerNameResolver.class, ContextPathControllerNameResolver.class, servletContext); register(MessageResources.class, DefaultMessageResources.class, servletContext); register(MethodDefinitionFinder.class, AnnotatedMethodDefinitionFinder.class, servletContext); register(MethodNameResolver.class, RequestParameterMethodNameResolver.class, servletContext); + register(RequestAttributeBinder.class, IntrospectingRequestAttributeBinder.class, servletContext); + register(ServletMonitor.class, SilentMonitor.class, servletContext); register(TypeConverter.class, OgnlTypeConverter.class, servletContext); - register(ServletMonitor.class, SilentMonitor.class, servletContext); register(Validator.class, DefaultValidator.class, servletContext); register(ViewDispatcher.class, DefaultViewDispatcher.class, servletContext); register(ViewResolver.class, DefaultViewResolver.class, servletContext); @@ -209,6 +209,10 @@ return locateByType(BindErrorMessageResolver.class); } + public BindMonitor getBindMonitor() { + return locateByType(BindMonitor.class); + } + public ContextContainerFactory getContextContainerFactory() { return locateByType(ContextContainerFactory.class); } @@ -245,8 +249,8 @@ return locateByType(RequestAttributeBinder.class); } - public BindMonitor getBindMonitor() { - return locateByType(BindMonitor.class); + public ServletMonitor getServletMonitor() { + return locateByType(ServletMonitor.class); } public TypeConverter getTypeConverter() { @@ -265,8 +269,4 @@ return locateByType(ViewResolver.class); } - public ServletMonitor getServletMonitor() { - return locateByType(ServletMonitor.class); - } - }
Modified: trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java (373 => 374)
--- trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/core/src/main/java/org/codehaus/waffle/monitor/CommonsLoggingMonitor.java 2007-11-15 02:12:24 UTC (rev 374) @@ -50,6 +50,8 @@ @Override protected void write(Level level, String message) { + message = "[WAFFLE]: " + message; + switch (level) { case ERROR: if (log.isErrorEnabled()) { @@ -77,7 +79,7 @@ @Override protected void trace(Throwable exception) { if (log.isErrorEnabled()) { - log.error(exception.getMessage(), exception); + log.error("[WAFFLE]:" + exception.getMessage(), exception); } }
Modified: trunk/core/src/main/java/org/codehaus/waffle/monitor/Monitor.java (373 => 374)
--- trunk/core/src/main/java/org/codehaus/waffle/monitor/Monitor.java 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/core/src/main/java/org/codehaus/waffle/monitor/Monitor.java 2007-11-15 02:12:24 UTC (rev 374) @@ -22,6 +22,6 @@ */ public interface Monitor { enum Level { - ERROR, INFO, WARN, DEBUG; + ERROR, INFO, WARN, DEBUG } }
Modified: trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java (373 => 374)
--- trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java 2007-11-15 02:12:24 UTC (rev 374) @@ -38,20 +38,21 @@ @Test public void canWriteWhenLoggingEnabled() { final Log log = mockery.mock(Log.class); - final String message = "message"; + final String expectedMessage = "[WAFFLE]: message"; mockery.checking(new Expectations() { { one(log).isDebugEnabled(); will(returnValue(true)); - one(log).debug(message); + one(log).debug(expectedMessage); one(log).isErrorEnabled(); will(returnValue(true)); - one(log).error(message); + one(log).error(expectedMessage); one(log).isInfoEnabled(); will(returnValue(true)); - one(log).info(message); + one(log).info(expectedMessage); one(log).isWarnEnabled(); will(returnValue(true)); - one(log).warn(message); + one(log).warn(expectedMessage); } }); + String message = "message"; final CommonsLoggingMonitor monitor = new CommonsLoggingMonitor(log); monitor.write(Level.DEBUG, message); monitor.write(Level.ERROR, message);
Modified: trunk/examples/simple-example/pom.xml (373 => 374)
--- trunk/examples/simple-example/pom.xml 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/examples/simple-example/pom.xml 2007-11-15 02:12:24 UTC (rev 374) @@ -16,6 +16,11 @@ <artifactId>xstream</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> </project>
Modified: trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml (373 => 374)
--- trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml 2007-11-14 14:23:18 UTC (rev 373) +++ trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml 2007-11-15 02:12:24 UTC (rev 374) @@ -17,6 +17,10 @@ <param-name>register:DateConverter</param-name> <param-value>org.codehaus.waffle.example.simple.DateTypeConverter</param-value> </context-param> + <context-param> + <param-name>org.codehaus.waffle.monitor.ActionMonitor</param-name> + <param-value>org.codehaus.waffle.monitor.CommonsLoggingMonitor</param-value> + </context-param> <!-- 3. Waffle context listener (ServletContext and HttpSession) --> <listener>
To unsubscribe from this list please visit:
