|
 |
1cd9bc |
From 1d2f89cb3e954b943751fa8dd587fdb404eb9338 Mon Sep 17 00:00:00 2001
|
|
|
1cd9bc |
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
|
1cd9bc |
Date: Mon, 21 Feb 2011 15:53:34 +0100
|
|
|
1cd9bc |
Subject: [PATCH 1/3] Remove avalon-logkit
|
|
|
1cd9bc |
|
|
|
1cd9bc |
we don't have it packaged so change defaults and remove it from pom.xml
|
|
|
1cd9bc |
---
|
|
|
1cd9bc |
pom.xml | 6 ------
|
|
|
1cd9bc |
.../velocity/runtime/defaults/velocity.properties | 4 ++--
|
|
|
1cd9bc |
.../apache/velocity/runtime/log/LogManager.java | 2 +-
|
|
|
1cd9bc |
3 files changed, 3 insertions(+), 9 deletions(-)
|
|
|
1cd9bc |
|
|
|
1cd9bc |
diff --git a/pom.xml b/pom.xml
|
|
|
1cd9bc |
index 77a8e38..f453208 100644
|
|
|
1cd9bc |
--- a/pom.xml
|
|
|
1cd9bc |
+++ b/pom.xml
|
|
|
1cd9bc |
@@ -197,12 +197,6 @@
|
|
|
1cd9bc |
<scope>provided</scope>
|
|
|
1cd9bc |
</dependency>
|
|
|
1cd9bc |
<dependency>
|
|
|
1cd9bc |
- <groupId>logkit</groupId>
|
|
|
1cd9bc |
- <artifactId>logkit</artifactId>
|
|
|
1cd9bc |
- <version>2.0</version>
|
|
|
1cd9bc |
- <scope>provided</scope>
|
|
|
1cd9bc |
- </dependency>
|
|
|
1cd9bc |
- <dependency>
|
|
|
1cd9bc |
<groupId>ant</groupId>
|
|
|
1cd9bc |
<artifactId>ant</artifactId>
|
|
|
1cd9bc |
<version>1.6</version>
|
|
|
1cd9bc |
diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
|
|
|
1cd9bc |
index 750a59a..7fac119 100644
|
|
|
1cd9bc |
--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties
|
|
|
1cd9bc |
+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
|
|
|
1cd9bc |
@@ -20,10 +20,10 @@
|
|
|
1cd9bc |
# ----------------------------------------------------------------------------
|
|
|
1cd9bc |
|
|
|
1cd9bc |
# ----------------------------------------------------------------------------
|
|
|
1cd9bc |
-# default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
|
|
|
1cd9bc |
+# default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
|
|
|
1cd9bc |
# ----------------------------------------------------------------------------
|
|
|
1cd9bc |
|
|
|
1cd9bc |
-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
|
|
|
1cd9bc |
+runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
|
|
|
1cd9bc |
|
|
|
1cd9bc |
# ---------------------------------------------------------------------------
|
|
|
1cd9bc |
# This is the location of the Velocity Runtime log.
|
|
|
1cd9bc |
diff --git a/src/java/org/apache/velocity/runtime/log/LogManager.java b/src/java/org/apache/velocity/runtime/log/LogManager.java
|
|
|
1cd9bc |
index 19d1016..97dceef 100644
|
|
|
1cd9bc |
--- a/src/java/org/apache/velocity/runtime/log/LogManager.java
|
|
|
1cd9bc |
+++ b/src/java/org/apache/velocity/runtime/log/LogManager.java
|
|
|
1cd9bc |
@@ -119,7 +119,7 @@ public class LogManager
|
|
|
1cd9bc |
* classes, and we use the first one we find.
|
|
|
1cd9bc |
*
|
|
|
1cd9bc |
* Note that the default value of this property contains the
|
|
|
1cd9bc |
- * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute,
|
|
|
1cd9bc |
+ * Log4JLogChute, CommonsLogLogChute,
|
|
|
1cd9bc |
* ServletLogChute, and the JdkLogChute for
|
|
|
1cd9bc |
* convenience - so we use whichever we works first.
|
|
|
1cd9bc |
*/
|
|
|
1cd9bc |
--
|
|
|
1cd9bc |
1.7.4
|
|
|
1cd9bc |
|