ceki 2004/11/19 07:20:07
Modified: src/java/org/apache/log4j/db DBReceiver.java
src/java/org/apache/log4j PropertyConfigurator.java
AppenderSkeleton.java
src/java/org/apache/log4j/joran/action LevelAction.java
ConversionRuleAction.java LoggerAction.java
AppenderRefAction.java AppenderAction.java
PropertyAction.java LayoutAction.java
PluginAction.java RepositoryPropertyAction.java
tests/src/java/org/apache/log4j/xml DOMTestCase.java
examples/src/joran/calculator AddAction.java
LiteralAction.java MultiplyAction.java
src/java/org/apache/joran ExecutionContext.java
Interpreter.java
src/java/org/apache/joran/action NewRuleAction.java
ParamAction.java NestComponentIA.java
src/java/org/apache/log4j/config ConfiguratorBase.java
tests/src/java/org/apache/joran InterpreterTest.java
src/java/org/apache/log4j/joran JoranConfigurator.java
tests/src/java/org/apache/log4j/db
BindDataSourceToJNDIAction.java
Log:
- Moved o.a.l.config.ErrorItem to o.a.l.spi.ErrorItem
Revision Changes Path
1.12 +1 -0
logging-log4j/src/java/org/apache/log4j/db/DBReceiver.java
Index: DBReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/db/DBReceiver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DBReceiver.java 19 Nov 2004 14:50:51 -0000 1.11
+++ DBReceiver.java 19 Nov 2004 15:20:06 -0000 1.12
@@ -17,6 +17,7 @@
package org.apache.log4j.db;
import org.apache.log4j.LogManager;
+import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.plugins.Pauseable;
import org.apache.log4j.plugins.Receiver;
import org.apache.log4j.scheduler.Scheduler;
1.70 +1 -1
logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- PropertyConfigurator.java 17 Nov 2004 21:25:23 -0000 1.69
+++ PropertyConfigurator.java 19 Nov 2004 15:20:06 -0000 1.70
@@ -22,10 +22,10 @@
import org.apache.log4j.DefaultCategoryFactory;
import org.apache.log4j.config.ConfiguratorBase;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.or.RendererMap;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggerRepository;
1.29 +2 -1
logging-log4j/src/java/org/apache/log4j/AppenderSkeleton.java
Index: AppenderSkeleton.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/AppenderSkeleton.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AppenderSkeleton.java 18 Nov 2004 22:48:03 -0000 1.28
+++ AppenderSkeleton.java 19 Nov 2004 15:20:06 -0000 1.29
@@ -36,7 +36,8 @@
public abstract class AppenderSkeleton implements Appender, OptionHandler {
/*
- * An insttance specific logger.
+ * An instance specific logger which must be accessed through the
getLogger()
+ * method.
*/
private Logger logger;
1.10 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/LevelAction.java
Index: LevelAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/LevelAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LevelAction.java 17 Nov 2004 21:25:24 -0000 1.9
+++ LevelAction.java 19 Nov 2004 15:20:06 -0000 1.10
@@ -5,9 +5,9 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.10 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java
Index: ConversionRuleAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/ConversionRuleAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConversionRuleAction.java 17 Nov 2004 21:25:24 -0000 1.9
+++ ConversionRuleAction.java 19 Nov 2004 15:20:06 -0000 1.10
@@ -23,7 +23,7 @@
import org.apache.log4j.Layout;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.9 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/LoggerAction.java
Index: LoggerAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/LoggerAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LoggerAction.java 17 Nov 2004 21:25:24 -0000 1.8
+++ LoggerAction.java 19 Nov 2004 15:20:06 -0000 1.9
@@ -21,9 +21,9 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
import org.xml.sax.Attributes;
1.12 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/AppenderRefAction.java
Index: AppenderRefAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/AppenderRefAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AppenderRefAction.java 17 Nov 2004 21:25:24 -0000 1.11
+++ AppenderRefAction.java 19 Nov 2004 15:20:06 -0000 1.12
@@ -22,9 +22,9 @@
import org.apache.log4j.Appender;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.AppenderAttachable;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.12 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/AppenderAction.java
Index: AppenderAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/AppenderAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AppenderAction.java 17 Nov 2004 21:25:24 -0000 1.11
+++ AppenderAction.java 19 Nov 2004 15:20:06 -0000 1.12
@@ -21,8 +21,8 @@
import org.apache.log4j.Appender;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.OptionHandler;
import org.xml.sax.Attributes;
1.6 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/PropertyAction.java
Index: PropertyAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/PropertyAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertyAction.java 17 Nov 2004 21:25:24 -0000 1.5
+++ PropertyAction.java 19 Nov 2004 15:20:06 -0000 1.6
@@ -21,9 +21,9 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.11 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/LayoutAction.java
Index: LayoutAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/LayoutAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LayoutAction.java 17 Nov 2004 21:25:24 -0000 1.10
+++ LayoutAction.java 19 Nov 2004 15:20:06 -0000 1.11
@@ -22,8 +22,8 @@
import org.apache.log4j.Appender;
import org.apache.log4j.Layout;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.OptionHandler;
import org.xml.sax.Attributes;
1.4 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/PluginAction.java
Index: PluginAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/PluginAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PluginAction.java 17 Nov 2004 21:25:24 -0000 1.3
+++ PluginAction.java 19 Nov 2004 15:20:06 -0000 1.4
@@ -20,9 +20,9 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.plugins.Plugin;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.OptionHandler;
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/action/RepositoryPropertyAction.java
Index: RepositoryPropertyAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/RepositoryPropertyAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryPropertyAction.java 17 Nov 2004 21:25:24 -0000 1.2
+++ RepositoryPropertyAction.java 19 Nov 2004 15:20:06 -0000 1.3
@@ -18,7 +18,7 @@
import java.util.Properties;
import org.apache.joran.ExecutionContext;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
/**
1.11 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
Index: DOMTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMTestCase.java 18 Nov 2004 20:00:28 -0000 1.10
+++ DOMTestCase.java 19 Nov 2004 15:20:06 -0000 1.11
@@ -8,8 +8,8 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.Level;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.joran.JoranConfigurator;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.JunitTestRunnerFilter;
import org.apache.log4j.util.LineNumberFilter;
1.4 +1 -1
logging-log4j/examples/src/joran/calculator/AddAction.java
Index: AddAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/examples/src/joran/calculator/AddAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddAction.java 17 Nov 2004 21:25:25 -0000 1.3
+++ AddAction.java 19 Nov 2004 15:20:06 -0000 1.4
@@ -18,7 +18,7 @@
import org.apache.joran.ExecutionContext;
import org.apache.joran.action.Action;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.4 +1 -1
logging-log4j/examples/src/joran/calculator/LiteralAction.java
Index: LiteralAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/examples/src/joran/calculator/LiteralAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LiteralAction.java 17 Nov 2004 21:25:25 -0000 1.3
+++ LiteralAction.java 19 Nov 2004 15:20:06 -0000 1.4
@@ -19,7 +19,7 @@
import org.apache.joran.ExecutionContext;
import org.apache.joran.action.Action;
import org.apache.joran.helper.Option;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.4 +1 -1
logging-log4j/examples/src/joran/calculator/MultiplyAction.java
Index: MultiplyAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/examples/src/joran/calculator/MultiplyAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiplyAction.java 17 Nov 2004 21:25:25 -0000 1.3
+++ MultiplyAction.java 19 Nov 2004 15:20:06 -0000 1.4
@@ -18,7 +18,7 @@
import org.apache.joran.ExecutionContext;
import org.apache.joran.action.Action;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.13 +1 -1
logging-log4j/src/java/org/apache/joran/ExecutionContext.java
Index: ExecutionContext.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/joran/ExecutionContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ExecutionContext.java 17 Nov 2004 21:25:25 -0000 1.12
+++ ExecutionContext.java 19 Nov 2004 15:20:06 -0000 1.13
@@ -18,8 +18,8 @@
//import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Locator;
import java.util.HashMap;
1.18 +1 -1 logging-log4j/src/java/org/apache/joran/Interpreter.java
Index: Interpreter.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/Interpreter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Interpreter.java 18 Nov 2004 22:48:03 -0000 1.17
+++ Interpreter.java 19 Nov 2004 15:20:06 -0000 1.18
@@ -17,7 +17,7 @@
package org.apache.joran;
import org.apache.joran.action.*;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
1.12 +1 -1
logging-log4j/src/java/org/apache/joran/action/NewRuleAction.java
Index: NewRuleAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/joran/action/NewRuleAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NewRuleAction.java 17 Nov 2004 21:25:25 -0000 1.11
+++ NewRuleAction.java 19 Nov 2004 15:20:06 -0000 1.12
@@ -21,7 +21,7 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.14 +1 -1
logging-log4j/src/java/org/apache/joran/action/ParamAction.java
Index: ParamAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/joran/action/ParamAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ParamAction.java 17 Nov 2004 21:25:25 -0000 1.13
+++ ParamAction.java 19 Nov 2004 15:20:06 -0000 1.14
@@ -19,9 +19,9 @@
import org.apache.joran.ExecutionContext;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
1.14 +1 -1
logging-log4j/src/java/org/apache/joran/action/NestComponentIA.java
Index: NestComponentIA.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/joran/action/NestComponentIA.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NestComponentIA.java 17 Nov 2004 21:25:25 -0000 1.13
+++ NestComponentIA.java 19 Nov 2004 15:20:06 -0000 1.14
@@ -21,9 +21,9 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.Loader;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.OptionHandler;
import org.xml.sax.Attributes;
1.3 +1 -0
logging-log4j/src/java/org/apache/log4j/config/ConfiguratorBase.java
Index: ConfiguratorBase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/config/ConfiguratorBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfiguratorBase.java 18 Nov 2004 22:35:52 -0000 1.2
+++ ConfiguratorBase.java 19 Nov 2004 15:20:06 -0000 1.3
@@ -14,6 +14,7 @@
import org.apache.log4j.PatternLayout;
import org.apache.log4j.helpers.Constants;
import org.apache.log4j.spi.Configurator;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.varia.ListAppender;
1.8 +1 -1
logging-log4j/tests/src/java/org/apache/joran/InterpreterTest.java
Index: InterpreterTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/joran/InterpreterTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InterpreterTest.java 17 Nov 2004 21:25:25 -0000 1.7
+++ InterpreterTest.java 19 Nov 2004 15:20:06 -0000 1.8
@@ -40,7 +40,6 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.joran.action.ActionConst;
import org.apache.log4j.joran.action.AppenderAction;
import org.apache.log4j.joran.action.AppenderRefAction;
@@ -52,6 +51,7 @@
import org.apache.log4j.rolling.RollingFileAppender;
import org.apache.log4j.rolling.SizeBasedTriggeringPolicy;
import org.apache.log4j.rolling.SlidingWindowRollingPolicy;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.SAXParseException;
import java.util.HashMap;
1.19 +1 -1
logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java
Index: JoranConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JoranConfigurator.java 18 Nov 2004 22:48:03 -0000 1.18
+++ JoranConfigurator.java 19 Nov 2004 15:20:06 -0000 1.19
@@ -36,7 +36,6 @@
import org.apache.joran.helper.SimpleRuleStore;
//import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.config.ConfiguratorBase;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.joran.action.ActionConst;
import org.apache.log4j.joran.action.AppenderAction;
import org.apache.log4j.joran.action.AppenderRefAction;
@@ -50,6 +49,7 @@
import org.apache.log4j.joran.action.RepositoryPropertyAction;
import org.apache.log4j.joran.action.RootLoggerAction;
import org.apache.log4j.joran.action.SubstitutionPropertyAction;
+import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.xml.Log4jEntityResolver;
import org.xml.sax.InputSource;
1.5 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/db/BindDataSourceToJNDIAction.java
Index: BindDataSourceToJNDIAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/db/BindDataSourceToJNDIAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BindDataSourceToJNDIAction.java 18 Nov 2004 20:00:28 -0000 1.4
+++ BindDataSourceToJNDIAction.java 19 Nov 2004 15:20:07 -0000 1.5
@@ -21,9 +21,9 @@
import org.apache.joran.helper.Option;
import org.apache.log4j.Logger;
-import org.apache.log4j.config.ErrorItem;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
+import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.Attributes;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
