Author: nbubna
Date: Mon Oct 10 09:44:07 2005
New Revision: 312681
URL: http://svn.apache.org/viewcvs?rev=312681&view=rev
Log:
remove hardly-used, half-implemented, and obsolete stacktrace logging controls
(finishes JIRA issue VELOCITY-403)
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeConstants.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java
jakarta/velocity/core/trunk/xdocs/docs/developer-guide.xml
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeConstants.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeConstants.java?rev=312681&r1=312680&r2=312681&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeConstants.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/RuntimeConstants.java
Mon Oct 10 09:44:07 2005
@@ -61,19 +61,20 @@
"runtime.log.logsystem.class";
/**
- * Stack trace output for error messages.
+ * @deprecated This appears to have always been meaningless.
*/
public static final String RUNTIME_LOG_ERROR_STACKTRACE =
"runtime.log.error.stacktrace";
/**
- * Stack trace output for warning messages.
+ * @deprecated The functionality this controlled is
+ * confusing and no longer necessary.
*/
public static final String RUNTIME_LOG_WARN_STACKTRACE =
"runtime.log.warn.stacktrace";
/**
- * Stack trace output for info messages.
+ * @deprecated This appears to have always been meaningless.
*/
public static final String RUNTIME_LOG_INFO_STACKTRACE =
"runtime.log.info.stacktrace";
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties?rev=312681&r1=312680&r2=312681&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/defaults/velocity.properties
Mon Oct 10 09:44:07 2005
@@ -22,14 +22,9 @@
runtime.log = velocity.log
#----------------------------------------------------------------------------
-# This controls if Runtime.error(), info() and warn() messages include the
-# whole stack trace. The last property controls whether invalid references
-# are logged.
+# This controls whether invalid references are logged.
#----------------------------------------------------------------------------
-runtime.log.error.stacktrace = false
-runtime.log.warn.stacktrace = false
-runtime.log.info.stacktrace = false
runtime.log.invalid.references = true
#----------------------------------------------------------------------------
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java?rev=312681&r1=312680&r2=312681&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java
Mon Oct 10 09:44:07 2005
@@ -30,7 +30,6 @@
{
private LogChute chute;
- private boolean showStacks;
/**
* Creates a new Log that wraps a HoldingLogChute.
@@ -68,40 +67,9 @@
return this.chute;
}
- /**
- * Sets whether or not Throwables passed as messages
- * (not to be confused with passing them as Throwables)
- * will have their whole stack traces printed or not.
- */
- protected void setShowStackTraces(boolean showStacks)
- {
- this.showStacks = showStacks;
- }
-
- /**
- * Tells whether or not Throwables passed as messages
- * (not to be confused with passing them as Throwables)
- * will have their whole stack traces printed or not.
- */
- public boolean getShowStackTraces()
- {
- return this.showStacks;
- }
-
private void log(int level, Object message)
{
- String out;
- /* now, see if the logging stacktrace is on
- * and modify the message to suit */
- if (showStacks && message instanceof Throwable)
- {
- out = StringUtils.stackTrace((Throwable)message);
- }
- else
- {
- out = String.valueOf(message);
- }
- chute.log(level, out);
+ chute.log(level, String.valueOf(message));
}
private void log(int level, Object message, Throwable t)
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java?rev=312681&r1=312680&r2=312681&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/LogManager.java
Mon Oct 10 09:44:07 2005
@@ -210,12 +210,6 @@
hlc.transferTo(newLogChute);
}
- // check whether or not we should print the stack traces of
- // Throwables passed *as* messages (rather than as Throwables).
- boolean showStacks =
- rsvc.getBoolean(RuntimeConstants.RUNTIME_LOG_WARN_STACKTRACE,
false);
- log.setShowStackTraces(showStacks);
-
// pass the new LogChute to the log
log.setLogChute(newLogChute);
}
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java?rev=312681&r1=312680&r2=312681&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java
Mon Oct 10 09:44:07 2005
@@ -46,10 +46,6 @@
Velocity.setProperty(
Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
- Velocity.setProperty(Velocity.RUNTIME_LOG_ERROR_STACKTRACE,
"true");
- Velocity.setProperty(Velocity.RUNTIME_LOG_WARN_STACKTRACE, "true");
- Velocity.setProperty(Velocity.RUNTIME_LOG_INFO_STACKTRACE, "true");
-
Velocity.init();
testProperties = new Properties();
Modified: jakarta/velocity/core/trunk/xdocs/docs/developer-guide.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/xdocs/docs/developer-guide.xml?rev=312681&r1=312680&r2=312681&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/xdocs/docs/developer-guide.xml (original)
+++ jakarta/velocity/core/trunk/xdocs/docs/developer-guide.xml Mon Oct 10
09:44:07 2005
@@ -1453,15 +1453,6 @@
Class to be used for the Velocity-instantiated log system.
</p>
-
-<p>
-<code>runtime.log.error.stacktrace = false</code><br/>
-<code>runtime.log.warn.stacktrace = false</code><br/>
-<code>runtime.log.info.stacktrace = false</code><br/>
-Turns on stacktracing for the three error categories.
-These produce a large amount of log output.
-</p>
-
<p>
<code>runtime.log.invalid.references = true </code><br/>
Property to turn off the log output when a reference isn't valid.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
