nbubna 2003/02/12 16:22:55
Modified: struts/src/java/org/apache/velocity/tools/struts
ErrorsTool.java LinkTool.java
Log:
use Velocity's log system instead of logging directly to the servlet context
Revision Changes Path
1.6 +4 -11
jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java
Index: ErrorsTool.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/ErrorsTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ErrorsTool.java 10 May 2002 05:42:17 -0000 1.5
+++ ErrorsTool.java 13 Feb 2003 00:22:55 -0000 1.6
@@ -65,6 +65,7 @@
import org.apache.struts.util.MessageResources;
import org.apache.struts.action.*;
+import org.apache.velocity.app.Velocity;
import org.apache.velocity.tools.view.context.ViewContext;
import org.apache.velocity.tools.view.tools.ViewTool;
@@ -159,14 +160,6 @@
locale = StrutsUtils.getLocale(request, session);
errors = StrutsUtils.getActionErrors(request);
}
-
-
- /**
- * Log messages are sent to the servlet context
- */
- private void log(String s) {
- application.log(s);
- }
// --------------------------------------------- View Helpers -------------
@@ -264,7 +257,7 @@
if (resources == null)
{
- log("[ERROR] Message resources are not available.");
+ Velocity.error("Message resources are not available.");
//FIXME? should we return the list of error keys instead?
return null;
}
@@ -299,7 +292,7 @@
else
{
// if error message cannot be found for a key, return key instead
- log("[WARN] Message for key " + errormsg.getKey() + " could not be
found in message resources.");
+ Velocity.warn("Message for key " + errormsg.getKey() + " could not
be found in message resources.");
list.add(errormsg.getKey());
}
}
1.8 +3 -10
jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/LinkTool.java
Index: LinkTool.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity-tools/struts/src/java/org/apache/velocity/tools/struts/LinkTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LinkTool.java 10 May 2002 05:42:17 -0000 1.7
+++ LinkTool.java 13 Feb 2003 00:22:55 -0000 1.8
@@ -66,6 +66,7 @@
import org.apache.struts.util.MessageResources;
import org.apache.struts.action.*;
+import org.apache.velocity.app.Velocity;
import org.apache.velocity.tools.view.context.ViewContext;
import org.apache.velocity.tools.view.tools.ViewTool;
@@ -152,14 +153,6 @@
this.response = context.getResponse();
this.application = context.getServletContext();
}
-
-
- /**
- * Log messages are sent to the servlet context
- */
- private void log(String s) {
- application.log(s);
- }
/**
@@ -273,7 +266,7 @@
if (mapping == null)
{
- log("[Warn] In method setForward(" + forward + "): Parameter does not
map to a valid forward.");
+ Velocity.warn("In method setForward(" + forward + "): Parameter does
not map to a valid forward.");
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
