Author: ekoneil
Date: Thu Aug 11 16:13:46 2005
New Revision: 231542
URL: http://svn.apache.org/viewcvs?rev=231542&view=rev
Log:
Fixup some log4j dependencies.
Most of these build files don't need to compile with log4j in the classpath.
BB: self
DRT: Beehive pass
Modified:
beehive/trunk/netui/src/core/build.xml
beehive/trunk/netui/src/pageflow/build.xml
beehive/trunk/netui/src/scoping/build.xml
beehive/trunk/netui/src/tags-databinding/build.xml
beehive/trunk/netui/src/tags-html/build.xml
beehive/trunk/netui/src/tags-template/build.xml
beehive/trunk/netui/src/testRecorder/build.xml
beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
beehive/trunk/system-controls/src/ejb/build.xml
beehive/trunk/system-controls/src/jms/build.xml
Modified: beehive/trunk/netui/src/core/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/core/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/build.xml (original)
+++ beehive/trunk/netui/src/core/build.xml Thu Aug 11 16:13:46 2005
@@ -10,7 +10,6 @@
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="commons-codec.dependency.path"/>
<path refid="commons-logging.dependency.path"/>
<pathelement path="${classes.dir}/util"/>
Modified: beehive/trunk/netui/src/pageflow/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/build.xml (original)
+++ beehive/trunk/netui/src/pageflow/build.xml Thu Aug 11 16:13:46 2005
@@ -13,7 +13,6 @@
<path refid="commons-el.dependency.path"/>
<path refid="servlet.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="controls.dependency.path"/>
<path refid="${struts.dependency.path.ref}"/>
<path refid="jsf.dependency.path"/>
Modified: beehive/trunk/netui/src/scoping/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/scoping/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/scoping/build.xml (original)
+++ beehive/trunk/netui/src/scoping/build.xml Thu Aug 11 16:13:46 2005
@@ -9,7 +9,6 @@
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="commons-codec.dependency.path"/>
<pathelement path="${classes.dir}/util"/>
</path>
Modified: beehive/trunk/netui/src/tags-databinding/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/build.xml (original)
+++ beehive/trunk/netui/src/tags-databinding/build.xml Thu Aug 11 16:13:46 2005
@@ -10,7 +10,6 @@
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="${struts.dependency.path.ref}"/>
<pathelement path="${classes.dir}/util"/>
<pathelement path="${classes.dir}/tags-html"/>
Modified: beehive/trunk/netui/src/tags-html/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/build.xml (original)
+++ beehive/trunk/netui/src/tags-html/build.xml Thu Aug 11 16:13:46 2005
@@ -9,7 +9,6 @@
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="${struts.dependency.path.ref}"/>
<pathelement path="${classes.dir}/util"/>
<pathelement path="${classes.dir}/tags-html"/>
Modified: beehive/trunk/netui/src/tags-template/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-template/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-template/build.xml (original)
+++ beehive/trunk/netui/src/tags-template/build.xml Thu Aug 11 16:13:46 2005
@@ -9,7 +9,6 @@
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="${struts.dependency.path.ref}"/>
<pathelement path="${classes.dir}/util"/>
<pathelement path="${classes.dir}/core"/>
Modified: beehive/trunk/netui/src/testRecorder/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/build.xml (original)
+++ beehive/trunk/netui/src/testRecorder/build.xml Thu Aug 11 16:13:46 2005
@@ -11,8 +11,8 @@
<property name="module.jar"
location="${testRecorder.dir}/lib/${module.jar.name}"/>
<path id="module.classpath">
- <path refid="log4j.dependency.path"/>
<path refid="servlet.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
<path refid="junit.dependency.path"/>
<path refid="xbean.dependency.path"/>
<path refid="testrecorder.build.dependency.path"/>
Modified:
beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
---
beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
(original)
+++
beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
Thu Aug 11 16:13:46 2005
@@ -21,23 +21,13 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.apache.log4j.*;
import org.apache.commons.logging.Log;
+import org.apache.log4j.Level;
-public class Logger implements Log {
+public class Logger
+ implements Log {
private static final String STRUTS_APPENDER = "commons-logging";
-
- static {
- // Need to get rid of the appender that Struts adds so
- // that we don't spam the console with all messages
- Category root = Category.getRoot();
-
- if ( root.getAppender( STRUTS_APPENDER ) != null ) {
- root.removeAppender( STRUTS_APPENDER );
- }
- }
-
public static Logger getInstance( Class clazz ) {
return new Logger( clazz );
Modified: beehive/trunk/system-controls/src/ejb/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/ejb/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/ejb/build.xml (original)
+++ beehive/trunk/system-controls/src/ejb/build.xml Thu Aug 11 16:13:46 2005
@@ -11,7 +11,6 @@
<path refid="controls.dependency.path"/>
<path refid="ejb.dependency.path"/>
<path refid="velocity.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="xbean.dependency.path"/>
<path refid="tools.dependency.path"/>
</path>
Modified: beehive/trunk/system-controls/src/jms/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/jms/build.xml?rev=231542&r1=231541&r2=231542&view=diff
==============================================================================
--- beehive/trunk/system-controls/src/jms/build.xml (original)
+++ beehive/trunk/system-controls/src/jms/build.xml Thu Aug 11 16:13:46 2005
@@ -11,7 +11,6 @@
<path refid="ejb.dependency.path"/>
<path refid="controls.dependency.path"/>
<path refid="velocity.dependency.path"/>
- <path refid="log4j.dependency.path"/>
<path refid="xbean.dependency.path"/>
</path>
