Author: rahul
Date: Sat Mar 25 14:19:21 2006
New Revision: 388846
URL: http://svn.apache.org/viewcvs?rev=388846&view=rev
Log:
Long overdue:
* Rename BuiltinFunctionWrapper to BuiltinFunctionMapper (it is a function
mapper, not a wrapper, that was just a typo)
* Remove static logs
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleContext.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/URLResolver.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Sat Mar 25 14:19:21 2006
@@ -47,7 +47,7 @@
/**
* The Logger for the SCXMLExecutor.
*/
- private static Log log = LogFactory.getLog(SCXMLExecutor.class);
+ private Log log = LogFactory.getLog(SCXMLExecutor.class);
/**
* The stateMachine being executed.
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleContext.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleContext.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleContext.java
Sat Mar 25 14:19:21 2006
@@ -31,7 +31,7 @@
public class SimpleContext implements Context {
/** Implementation independent log category. */
- protected static final Log LOG = LogFactory.getLog(Context.class);
+ protected Log log = LogFactory.getLog(Context.class);
/** The parent Context to this Context. */
private Context parent;
/** The Map of variables and their values in this Context. */
@@ -159,8 +159,8 @@
*/
public void setLocal(final String name, final Object value) {
vars.put(name, value);
- if (LOG.isDebugEnabled() && !name.equals("_ALL_STATES")) {
- LOG.debug(name + " = " + String.valueOf(value));
+ if (log.isDebugEnabled() && !name.equals("_ALL_STATES")) {
+ log.debug(name + " = " + String.valueOf(value));
}
}
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
Sat Mar 25 14:19:21 2006
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
public final class SimpleDispatcher implements EventDispatcher {
/** Implementation independent log category. */
- private static Log log = LogFactory.getLog(EventDispatcher.class);
+ private Log log = LogFactory.getLog(EventDispatcher.class);
/**
* Constructor.
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/URLResolver.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/URLResolver.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/URLResolver.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/URLResolver.java
Sat Mar 25 14:19:21 2006
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
public class URLResolver implements PathResolver {
/** Implementation independent log category. */
- private static Log log = LogFactory.getLog(PathResolver.class);
+ private Log log = LogFactory.getLog(PathResolver.class);
/** The base URL to resolve against. */
private URL baseURL = null;
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
Sat Mar 25 14:19:21 2006
@@ -43,9 +43,9 @@
public class ELEvaluator implements Evaluator {
/** Implementation independent log category. */
- protected static final Log LOG = LogFactory.getLog(Evaluator.class);
+ protected Log log = LogFactory.getLog(Evaluator.class);
/** Function Mapper for SCXML expressions. */
- private FunctionMapper functionMapper = new BuiltinFunctionWrapper();
+ private FunctionMapper functionMapper = new BuiltinFunctionMapper();
/** Pattern for recognizing the SCXML In() special predicate. */
private static Pattern inFct = Pattern.compile("In\\(");
/** Pattern for recognizing the Commons SCXML Data() builtin function. */
@@ -83,8 +83,8 @@
replaceAll("In(_ALL_STATES, ");
Object rslt = ee.evaluate(evalExpr, Object.class, vr,
functionMapper);
- if (LOG.isTraceEnabled()) {
- LOG.trace(expr + " = " + String.valueOf(rslt));
+ if (log.isTraceEnabled()) {
+ log.trace(expr + " = " + String.valueOf(rslt));
}
return rslt;
} catch (ELException e) {
@@ -108,8 +108,8 @@
replaceAll("In(_ALL_STATES, ");
Boolean rslt = (Boolean) ee.evaluate(evalExpr, Boolean.class,
vr, functionMapper);
- if (LOG.isDebugEnabled()) {
- LOG.debug(expr + " = " + String.valueOf(rslt));
+ if (log.isDebugEnabled()) {
+ log.debug(expr + " = " + String.valueOf(rslt));
}
return rslt;
} catch (ELException e) {
@@ -135,8 +135,8 @@
replaceFirst("LData(");
Node rslt = (Node) ee.evaluate(evalExpr, Node.class,
vr, functionMapper);
- if (LOG.isDebugEnabled()) {
- LOG.debug(expr + " = " + String.valueOf(rslt));
+ if (log.isDebugEnabled()) {
+ log.debug(expr + " = " + String.valueOf(rslt));
}
return rslt;
} catch (ELException e) {
@@ -161,6 +161,8 @@
static class ContextWrapper implements VariableResolver {
/** Context to be wrapped. */
private Context ctx = null;
+ /** The log. */
+ private Log log = LogFactory.getLog(ContextWrapper.class);
/**
* Constructor.
* @param ctx The Context to be wrapped.
@@ -172,7 +174,7 @@
public Object resolveVariable(final String pName) throws ELException {
Object rslt = ctx.get(pName);
if (rslt == null) {
- LOG.info("Variable \"" + pName + "\" does not exist!");
+ log.info("Variable \"" + pName + "\" does not exist!");
}
return rslt;
}
@@ -181,8 +183,9 @@
/**
* A simple function mapper for SCXML defined functions.
*/
- static class BuiltinFunctionWrapper implements FunctionMapper {
-
+ static class BuiltinFunctionMapper implements FunctionMapper {
+ /** The log. */
+ private Log log = LogFactory.getLog(BuiltinFunctionMapper.class);
/**
* @see FunctionMapper#resolveFunction(String, String)
*/
@@ -193,9 +196,9 @@
try {
return Builtin.class.getMethod("isMember", attrs);
} catch (SecurityException e) {
- LOG.error("resolving isMember(Set, String)", e);
+ log.error("resolving isMember(Set, String)", e);
} catch (NoSuchMethodException e) {
- LOG.error("resolving isMember(Set, String)", e);
+ log.error("resolving isMember(Set, String)", e);
}
} else if (localName.equals("Data")) {
// rvalue in expressions, coerce to String
@@ -203,9 +206,9 @@
try {
return Builtin.class.getMethod("data", attrs);
} catch (SecurityException e) {
- LOG.error("resolving data(Node, String)", e);
+ log.error("resolving data(Node, String)", e);
} catch (NoSuchMethodException e) {
- LOG.error("resolving data(Node, String)", e);
+ log.error("resolving data(Node, String)", e);
}
} else if (localName.equals("LData")) {
// lvalue in expressions, retain as Node
@@ -213,9 +216,9 @@
try {
return Builtin.class.getMethod("dataNode", attrs);
} catch (SecurityException e) {
- LOG.error("resolving data(Node, String)", e);
+ log.error("resolving data(Node, String)", e);
} catch (NoSuchMethodException e) {
- LOG.error("resolving data(Node, String)", e);
+ log.error("resolving data(Node, String)", e);
}
}
return null;
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/env/jsp/RootContext.java
Sat Mar 25 14:19:21 2006
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
public RootContext(final JspContext ctx) {
super();
if (ctx == null) {
- LOG.error(ERR_HOST_JSP_CTX_NULL);
+ log.error(ERR_HOST_JSP_CTX_NULL);
throw new IllegalArgumentException(ERR_HOST_JSP_CTX_NULL);
} else {
// only retain the VariableResolver
@@ -63,7 +63,7 @@
try {
value = variableResolver.resolveVariable(name);
} catch (ELException ele) {
- LOG.error(ele.getMessage(), ele);
+ log.error(ele.getMessage(), ele);
}
}
return value;
@@ -83,7 +83,7 @@
try {
value = variableResolver.resolveVariable(name);
} catch (ELException ele) {
- LOG.error(ele.getMessage(), ele);
+ log.error(ele.getMessage(), ele);
}
if (value != null) {
exists = true;
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
Sat Mar 25 14:19:21 2006
@@ -129,6 +129,8 @@
String errMsg = msgFormat.format(new Object[] {
String.valueOf(scxmlURL), rte.getMessage()
});
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error(errMsg, rte);
throw rte;
}
@@ -178,6 +180,8 @@
String errMsg = msgFormat.format(new Object[] {
documentRealPath, rte.getMessage()
});
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error(errMsg, rte);
throw rte;
}
@@ -226,6 +230,8 @@
} catch (RuntimeException rte) {
// Intercept runtime exceptions, only to log them with a
// sensible error message about failure in document parsing
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error("Could not parse SCXML InputSource", rte);
throw rte;
}
@@ -434,12 +440,6 @@
private static final String XPF_ELS = "/else";
//// Other constants
- /**
- * Logger for SCXMLDigester.
- */
- private static org.apache.commons.logging.Log log = LogFactory
- .getLog(SCXMLDigester.class);
-
// Error messages
/**
* Parsing SCXML document has failed.
@@ -646,6 +646,8 @@
try {
scxmlRules.add(xp + XPF_DATA, new ParseDataRule(pr));
} catch (ParserConfigurationException pce) {
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error("Error registering rule for parsing <data>"
+ " element content", pce);
}
@@ -812,6 +814,8 @@
try {
scxmlRules.add(xp, new ParseExternalContentRule());
} catch (ParserConfigurationException pce) {
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error("Error registering rule for parsing <send>"
+ " element content", pce);
}
@@ -862,6 +866,8 @@
try {
scxmlRules.add(xp, new ParseExternalContentRule());
} catch (ParserConfigurationException pce) {
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error("Error instantiating body content parsing rule for"
+ " custom action", pce);
}
@@ -1029,6 +1035,8 @@
tt = (TransitionTarget) targets.get(next);
if (tt == null) {
// Could move Digester warnings to errors
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.warn("WARNING: SCXMLDigester - Transition "
+ "target \"" + next + "\" not found");
}
@@ -1046,6 +1054,8 @@
final Object[] msgArgs) {
MessageFormat msgFormat = new MessageFormat(errType);
String errMsg = msgFormat.format(msgArgs);
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error(errMsg);
}
@@ -1228,6 +1238,8 @@
DocumentBuilder db = dbFactory.newDocumentBuilder();
attrNode = db.parse(path);
} catch (Throwable t) { // you read that correctly
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error(t.getMessage(), t);
}
return;
@@ -1300,6 +1312,8 @@
try {
externalSCXML = (SCXML) externalSrcDigester.parse(path);
} catch (Exception e) {
+ org.apache.commons.logging.Log log = LogFactory.
+ getLog(SCXMLDigester.class);
log.error(e.getMessage(), e);
}
// 2) Adopt the children and datamodel
Modified:
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=388846&r1=388845&r2=388846&view=diff
==============================================================================
---
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
(original)
+++
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Sat Mar 25 14:19:21 2006
@@ -63,7 +63,7 @@
/**
* SCXML Logger for the application.
*/
- protected static final org.apache.commons.logging.Log APP_LOG = LogFactory
+ protected org.apache.commons.logging.Log appLog = LogFactory
.getLog("scxml.app.log");
/**
@@ -155,7 +155,7 @@
for (Iterator onExitIter = oe.getActions().iterator();
onExitIter.hasNext();) {
((Action) onExitIter.next()).execute(evtDispatcher,
- errRep, scInstance, APP_LOG, internalEvents);
+ errRep, scInstance, appLog, internalEvents);
}
} catch (SCXMLExpressionException e) {
errRep.onError(ErrorReporter.EXPRESSION_ERROR, e.getMessage(),
@@ -174,7 +174,7 @@
for (Iterator transitIter = t.getActions().iterator();
transitIter.hasNext();) {
((Action) transitIter.next()).execute(evtDispatcher,
- errRep, scInstance, APP_LOG, internalEvents);
+ errRep, scInstance, appLog, internalEvents);
}
} catch (SCXMLExpressionException e) {
errRep.onError(ErrorReporter.EXPRESSION_ERROR,
@@ -192,7 +192,7 @@
for (Iterator onEntryIter = oe.getActions().iterator();
onEntryIter.hasNext();) {
((Action) onEntryIter.next()).execute(evtDispatcher,
- errRep, scInstance, APP_LOG, internalEvents);
+ errRep, scInstance, appLog, internalEvents);
}
} catch (SCXMLExpressionException e) {
errRep.onError(ErrorReporter.EXPRESSION_ERROR, e.getMessage(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
