ceki 2004/03/31 05:13:15
Modified: tests/src/java/org/apache/log4j/pattern
PatternParserTest.java
src/java/org/apache/joran/action ParamAction.java
NestComponentIA.java NewRuleAction.java Action.java
tests/src/java/org/apache/joran/action
StackCounterAction.java HelloAction.java
src/java/org/apache/log4j/joran/action LevelAction.java
ConversionRuleAction.java LoggerAction.java
AppenderRefAction.java AppenderAction.java
RootLoggerAction.java LayoutAction.java
src/java/org/apache/joran JoranParser.java
tests/src/java/org/apache/log4j/defaultInit TestCase3.java
tests/src/java/org/apache/joran SimpleStoreTest.java
Log:
The Locator object can be retreived through the ExecutionContext. No need
to carry it along in the Action.begin method
Revision Changes Path
1.4 +0 -2
logging-log4j/tests/src/java/org/apache/log4j/pattern/PatternParserTest.java
Index: PatternParserTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/pattern/PatternParserTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PatternParserTest.java 27 Feb 2004 16:47:36 -0000 1.3
+++ PatternParserTest.java 31 Mar 2004 13:13:15 -0000 1.4
@@ -16,9 +16,7 @@
package org.apache.log4j.pattern;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
1.6 +1 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ParamAction.java 30 Mar 2004 17:42:41 -0000 1.5
+++ ParamAction.java 31 Mar 2004 13:13:15 -0000 1.6
@@ -6,8 +6,6 @@
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
public class ParamAction extends Action {
@@ -16,7 +14,7 @@
static String NO_NAME = "No name attribute in <param> element";
static String NO_VALUE = "No name attribute in <param> element";
- public void begin(ExecutionContext ec, String localName, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String localName, Attributes attributes) {
String name = attributes.getValue(NAME_ATTRIBUTE);
String value = attributes.getValue(VALUE_ATTRIBUTE);
1.6 +1 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NestComponentIA.java 30 Mar 2004 17:42:41 -0000 1.5
+++ NestComponentIA.java 31 Mar 2004 13:13:15 -0000 1.6
@@ -25,8 +25,6 @@
import org.apache.log4j.spi.OptionHandler;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
/**
* @author Ceki Gülcü
@@ -63,7 +61,7 @@
}
}
- public void begin(ExecutionContext ec, String localName, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String localName, Attributes attributes) {
// inError was reset in isApplicable. It should not be touched here
String className = attributes.getValue(CLASS_ATTRIBUTE);
1.6 +1 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NewRuleAction.java 30 Mar 2004 17:42:41 -0000 1.5
+++ NewRuleAction.java 31 Mar 2004 13:13:15 -0000 1.6
@@ -23,7 +23,6 @@
import org.apache.log4j.Layout;
import org.apache.log4j.Logger;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
public class NewRuleAction extends Action {
@@ -34,7 +33,7 @@
* Instantiates an layout of the given class and sets its name.
*
*/
- public void begin(ExecutionContext ec, String localName, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String localName, Attributes attributes) {
// Let us forget about previous errors (in this object)
inError = false;
String errorMsg;
1.8 +20 -1 logging-log4j/src/java/org/apache/joran/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/action/Action.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Action.java 30 Mar 2004 17:42:41 -0000 1.7
+++ Action.java 31 Mar 2004 13:13:15 -0000 1.8
@@ -17,6 +17,7 @@
package org.apache.joran.action;
import org.apache.joran.ExecutionContext;
+import org.apache.joran.JoranParser;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -54,7 +55,7 @@
* the returned value is 'false', then child elements are ignored.
*/
public abstract void begin(
- ExecutionContext ec, String name, Attributes attributes, Locator locator);
+ ExecutionContext ec, String name, Attributes attributes);
public abstract void end(ExecutionContext ec, String name);
@@ -62,5 +63,23 @@
public String toString() {
return this.getClass().getName();
+ }
+
+ protected int getColumnNumber(ExecutionContext ec) {
+ JoranParser jp = ec.getJoranParser();
+ Locator locator = jp.getDocumentLocator();
+ if(locator != null) {
+ return locator.getColumnNumber();
+ }
+ return -1;
+ }
+
+ protected int getLineNumber(ExecutionContext ec) {
+ JoranParser jp = ec.getJoranParser();
+ Locator locator = jp.getDocumentLocator();
+ if(locator != null) {
+ return locator.getLineNumber();
+ }
+ return -1;
}
}
1.3 +1 -2
logging-log4j/tests/src/java/org/apache/joran/action/StackCounterAction.java
Index: StackCounterAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/joran/action/StackCounterAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StackCounterAction.java 30 Mar 2004 17:42:41 -0000 1.2
+++ StackCounterAction.java 31 Mar 2004 13:13:15 -0000 1.3
@@ -21,7 +21,6 @@
import org.apache.log4j.Logger;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
public class StackCounterAction extends Action {
@@ -35,7 +34,7 @@
* Instantiates an layout of the given class and sets its name.
*
*/
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
String str = "Pushing "+name+"-begin";
ec.pushObject(name+"-begin");
}
1.5 +1 -2
logging-log4j/tests/src/java/org/apache/joran/action/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/joran/action/HelloAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HelloAction.java 30 Mar 2004 17:42:41 -0000 1.4
+++ HelloAction.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -21,7 +21,6 @@
import org.apache.log4j.Logger;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
public class HelloAction extends Action {
@@ -35,7 +34,7 @@
* Instantiates an layout of the given class and sets its name.
*
*/
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
String str = "Hello "+name+".";
ec.getObjectMap().put("hello", str);
}
1.4 +1 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LevelAction.java 30 Mar 2004 17:42:41 -0000 1.3
+++ LevelAction.java 31 Mar 2004 13:13:15 -0000 1.4
@@ -8,8 +8,6 @@
import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.OptionConverter;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
import java.lang.reflect.Method;
public class LevelAction extends Action {
@@ -24,7 +22,7 @@
static final Class[] ONE_STRING_PARAM = new Class[] { String.class };
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
Object o = ec.peekObject();
1.5 +1 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConversionRuleAction.java 30 Mar 2004 17:42:41 -0000 1.4
+++ ConversionRuleAction.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -26,7 +26,6 @@
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
public class ConversionRuleAction extends Action {
@@ -37,7 +36,7 @@
* Instantiates an layout of the given class and sets its name.
*
*/
- public void begin(ExecutionContext ec, String localName, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String localName, Attributes attributes) {
// Let us forget about previous errors (in this object)
inError = false;
1.4 +6 -7
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoggerAction.java 30 Mar 2004 17:42:41 -0000 1.3
+++ LoggerAction.java 31 Mar 2004 13:13:15 -0000 1.4
@@ -26,7 +26,6 @@
import org.apache.log4j.spi.LoggerRepository;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
import java.lang.reflect.Method;
@@ -34,7 +33,7 @@
public class LoggerAction extends Action {
Logger logger = Logger.getLogger(LoggerAction.class);
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
// Let us forget about previous errors (in this object)
inError = false;
@@ -46,12 +45,12 @@
if (Option.isEmpty(loggerName)) {
inError = true;
- String line = null;
- if(locator != null) {
- line = ", around line "+locator.getLineNumber()+" column
"+locator.getColumnNumber();
- }
+ String line =
+ ", around line " + getLineNumber(ec) + " column "
+ + getColumnNumber(ec);
+
String errorMsg = "No 'name' attribute in element " + name + line;
-
+
logger.warn(errorMsg);
ec.addError(errorMsg);
1.5 +1 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AppenderRefAction.java 30 Mar 2004 17:42:41 -0000 1.4
+++ AppenderRefAction.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -25,8 +25,6 @@
import org.apache.log4j.spi.AppenderAttachable;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
import java.util.HashMap;
@@ -34,7 +32,7 @@
static final Logger logger = Logger.getLogger(AppenderRefAction.class);
public void begin(
- ExecutionContext ec, String localName, Attributes attributes, Locator locator) {
+ ExecutionContext ec, String localName, Attributes attributes) {
// Let us forget about previous errors (in this object)
inError = false;
1.5 +1 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AppenderAction.java 30 Mar 2004 17:42:41 -0000 1.4
+++ AppenderAction.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -26,8 +26,6 @@
import org.apache.log4j.spi.OptionHandler;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
import java.util.HashMap;
@@ -40,7 +38,7 @@
*
* The appender thus generated is placed in the ExecutionContext appender bag.
*/
- public void begin(ExecutionContext ec, String localName, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String localName, Attributes attributes) {
String className =
attributes.getValue(CLASS_ATTRIBUTE);
1.5 +1 -3
logging-log4j/src/java/org/apache/log4j/joran/action/RootLoggerAction.java
Index: RootLoggerAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/action/RootLoggerAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RootLoggerAction.java 30 Mar 2004 17:42:41 -0000 1.4
+++ RootLoggerAction.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -23,8 +23,6 @@
import org.apache.log4j.spi.LoggerRepository;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
public class RootLoggerAction extends Action {
static final String NAME_ATTR = "name";
@@ -35,7 +33,7 @@
Logger logger = Logger.getLogger(RootLoggerAction.class);
Logger root;
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
inError = false;
logger.debug("In begin method");
1.5 +1 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LayoutAction.java 30 Mar 2004 17:42:41 -0000 1.4
+++ LayoutAction.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -26,7 +26,6 @@
import org.apache.log4j.spi.OptionHandler;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
public class LayoutAction extends Action {
@@ -37,7 +36,7 @@
* Instantiates an layout of the given class and sets its name.
*
*/
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
// Let us forget about previous errors (in this object)
inError = false;
1.10 +4 -1 logging-log4j/src/java/org/apache/joran/JoranParser.java
Index: JoranParser.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/JoranParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JoranParser.java 30 Mar 2004 17:42:41 -0000 1.9
+++ JoranParser.java 31 Mar 2004 13:13:15 -0000 1.10
@@ -71,6 +71,9 @@
}
}
+ public Locator getDocumentLocator() {
+ return locator;
+ }
public void setDocumentLocator(Locator l) {
locator = l;
}
@@ -145,7 +148,7 @@
while (i.hasNext()) {
Action action = (Action) i.next();
- action.begin(ec, tagName, atts, locator);
+ action.begin(ec, tagName, atts);
}
}
1.5 +0 -2
logging-log4j/tests/src/java/org/apache/log4j/defaultInit/TestCase3.java
Index: TestCase3.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/defaultInit/TestCase3.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestCase3.java 9 Dec 2003 21:28:28 -0000 1.4
+++ TestCase3.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -8,8 +8,6 @@
package org.apache.log4j.defaultInit;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.framework.Test;
import java.util.Enumeration;
1.5 +3 -5
logging-log4j/tests/src/java/org/apache/joran/SimpleStoreTest.java
Index: SimpleStoreTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/joran/SimpleStoreTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleStoreTest.java 30 Mar 2004 17:42:41 -0000 1.4
+++ SimpleStoreTest.java 31 Mar 2004 13:13:15 -0000 1.5
@@ -27,8 +27,6 @@
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
import java.util.List;
import javax.xml.parsers.DocumentBuilder;
@@ -155,7 +153,7 @@
}
class XAction extends Action {
- public void begin(ExecutionContext ec, String name, Attributes attributes,
Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes attributes) {
}
public void end(ExecutionContext ec, String name) {
@@ -166,7 +164,7 @@
}
class YAction extends Action {
- public void begin(ExecutionContext ec, String name, Attributes
attributes, Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes
attributes) {
}
public void end(ExecutionContext ec, String name) {
@@ -176,7 +174,7 @@
} }
class ZAction extends Action {
- public void begin(ExecutionContext ec, String name, Attributes
attributes, Locator locator) {
+ public void begin(ExecutionContext ec, String name, Attributes
attributes) {
}
public void end(ExecutionContext ec, String name) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
