ceki 2004/05/28 07:49:38
Modified: src/java/org/apache/joran/helper SimpleRuleStore.java
src/java/org/apache/joran Interpreter.java Pattern.java
Log:
Cosmetic changes only
Revision Changes Path
1.2 +1 -0
logging-log4j/src/java/org/apache/joran/helper/SimpleRuleStore.java
Index: SimpleRuleStore.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/joran/helper/SimpleRuleStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleRuleStore.java 3 Apr 2004 14:05:15 -0000 1.1
+++ SimpleRuleStore.java 28 May 2004 14:49:38 -0000 1.2
@@ -32,6 +32,7 @@
public class SimpleRuleStore implements RuleStore {
final static Logger logger = Logger.getLogger(SimpleRuleStore.class);
+ // key: Pattern instance, value: ArrayList containing actions
HashMap rules = new HashMap();
public void addRule(Pattern pattern, Action action) {
1.13 +4 -3 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Interpreter.java 27 May 2004 08:45:06 -0000 1.12
+++ Interpreter.java 28 May 2004 14:49:38 -0000 1.13
@@ -17,6 +17,7 @@
package org.apache.joran;
import org.apache.joran.action.*;
+import org.apache.log4j.helpers.LogLog;
//import org.apache.log4j.Logger;
//mport org.apache.log4j.helpers.LogLog;
@@ -100,7 +101,7 @@
}
public void startDocument() {
- System.out.println(" in JP startDocument");
+ LogLog.info(" in JP startDocument");
}
public void startElement(
@@ -109,7 +110,7 @@
String tagName = getTagName(localName, qName);
- //logger.debug("in startElement <" + tagName + ">");
+ LogLog.debug("in startElement <" + tagName + ">");
pattern.push(tagName);
@@ -124,7 +125,7 @@
String errMsg =
"no applicable action for <" + tagName + ">, current pattern is ["
+ pattern+"]";
- //LogLog.error(errMsg);
+ LogLog.warn(errMsg);
ec.addError(new ErrorItem(errMsg));
}
}
1.8 +3 -2 logging-log4j/src/java/org/apache/joran/Pattern.java
Index: Pattern.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/joran/Pattern.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Pattern.java 9 Apr 2004 16:03:19 -0000 1.7
+++ Pattern.java 28 May 2004 14:49:38 -0000 1.8
@@ -20,7 +20,8 @@
public class Pattern {
- //String patternStr;
+
+ // contains String instances
ArrayList components;
public Pattern() {
@@ -30,7 +31,7 @@
/**
* Build a pattern from a string.
*
- * Note that "/x" is equivalent to "x" and to "x/"
+ * Note that "/x" is considered equivalent to "x" and to "x/"
*
*/
public Pattern(String p) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
