7:14 p.m.
Author: rhauch
Date: 2008-08-20 13:14:49 -0400 (Wed, 20 Aug 2008)
New Revision: 457
Modified:
trunk/dna-spi/src/test/java/org/jboss/dna/spi/connector/SimpleRepository.java
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatedRepositorySource.java
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/Projection.java
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/ProjectionParser.java
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java
trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java
Log:
DNA-210 - Change repository connectors to use the new ExecutionContext logger
http://jira.jboss.com/jira/browse/DNA-210
Changed the connector implementations to use the new "getLogger(...)" methods on
the ExecutionContext.
Modified: trunk/dna-spi/src/test/java/org/jboss/dna/spi/connector/SimpleRepository.java
===================================================================
---
trunk/dna-spi/src/test/java/org/jboss/dna/spi/connector/SimpleRepository.java 2008-08-20
16:57:23 UTC (rev 456)
+++
trunk/dna-spi/src/test/java/org/jboss/dna/spi/connector/SimpleRepository.java 2008-08-20
17:14:49 UTC (rev 457)
@@ -29,6 +29,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import net.jcip.annotations.ThreadSafe;
+import org.jboss.dna.common.util.Logger;
+import org.jboss.dna.common.util.StringUtil;
import org.jboss.dna.spi.DnaLexicon;
import org.jboss.dna.spi.ExecutionContext;
import org.jboss.dna.spi.graph.Name;
@@ -128,6 +130,10 @@
String path,
String propertyName,
Object... values ) {
+ Logger logger = context.getLogger(getClass());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Setting property {0} on {1} to {2}", propertyName,
path, StringUtil.readableString(values));
+ }
PathFactory pathFactory = context.getValueFactories().getPathFactory();
NameFactory nameFactory = context.getValueFactories().getNameFactory();
PropertyFactory propertyFactory = context.getPropertyFactory();
@@ -152,6 +158,7 @@
*/
public SimpleRepository create( ExecutionContext context,
String path ) {
+ context.getLogger(getClass()).trace("Creating node {0}", path);
PathFactory pathFactory = context.getValueFactories().getPathFactory();
Path pathObj = pathFactory.create(path);
Path ancestorPath = pathObj;
@@ -175,6 +182,7 @@
*/
public SimpleRepository delete( ExecutionContext context,
String path ) {
+ context.getLogger(getClass()).trace("Deleting node {0}", path);
PathFactory pathFactory = context.getValueFactories().getPathFactory();
Path pathObj = pathFactory.create(path);
List<Path> pathsToRemove = new LinkedList<Path>();
Modified:
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatedRepositorySource.java
===================================================================
---
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatedRepositorySource.java 2008-08-20
16:57:23 UTC (rev 456)
+++
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/FederatedRepositorySource.java 2008-08-20
17:14:49 UTC (rev 457)
@@ -756,7 +756,7 @@
executor = new FederatingCommandExecutor(context, configurationSourceName,
projections, connectionFactory);
}
// Wrap the executor with a logging executor ...
- executor = new LoggingCommandExecutor(executor, Logger.getLogger(getClass()),
Logger.Level.INFO);
+ executor = new LoggingCommandExecutor(executor, context.getLogger(getClass()),
Logger.Level.INFO);
// The configuration projection (via "executor") will convert this path
into a path that exists in the configuration
// repository
Modified:
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/Projection.java
===================================================================
---
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/Projection.java 2008-08-20
16:57:23 UTC (rev 456)
+++
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/Projection.java 2008-08-20
17:14:49 UTC (rev 457)
@@ -162,7 +162,7 @@
if (rule != null) return rule;
} catch (Throwable err) {
String msg = "Error while parsing project rule definition
\"{0}\" using {1}";
- Logger.getLogger(Projection.class).trace(err, msg, definition, method);
+ context.getLogger(Projection.class).trace(err, msg, definition, method);
}
}
return null;
Modified:
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/ProjectionParser.java
===================================================================
---
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/ProjectionParser.java 2008-08-20
16:57:23 UTC (rev 456)
+++
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/ProjectionParser.java 2008-08-20
17:14:49 UTC (rev 457)
@@ -62,10 +62,8 @@
}
private final List<Method> parserMethods = new
CopyOnWriteArrayList<Method>();
- protected final Logger logger;
public ProjectionParser() {
- this.logger = Logger.getLogger(this.getClass());
}
/**
@@ -184,6 +182,7 @@
ArgCheck.isNotNull(context, "env");
definition = definition != null ? definition.trim() : "";
if (definition.length() == 0) return null;
+ Logger logger = context.getLogger(getClass());
for (Method method : parserMethods) {
try {
Rule rule = (Rule)method.invoke(null, definition, context);
@@ -199,7 +198,7 @@
}
} catch (Throwable err) {
String msg = "Error while parsing project rule definition
\"{0}\" using {1}";
- Logger.getLogger(Projection.class).trace(err, msg, definition, method);
+ logger.trace(err, msg, definition, method);
}
}
return null;
Modified:
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java
===================================================================
---
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java 2008-08-20
16:57:23 UTC (rev 456)
+++
trunk/extensions/dna-connector-federation/src/main/java/org/jboss/dna/connector/federation/executor/FederatingCommandExecutor.java 2008-08-20
17:14:49 UTC (rev 457)
@@ -134,6 +134,7 @@
this.defaultCachePolicy = defaultCachePolicy;
this.sourceProjections = sourceProjections;
this.connectionFactory = connectionFactory;
+ this.logger = context.getLogger(getClass());
this.connectionsBySourceName = new HashMap<String,
RepositoryConnection>();
this.uuidPropertyName =
context.getValueFactories().getNameFactory().create(DnaLexicon.UUID);
this.mergePlanPropertyName =
context.getValueFactories().getNameFactory().create(DnaLexicon.MERGE_PLAN);
@@ -141,18 +142,10 @@
for (Projection projection : this.sourceProjections) {
this.sourceNames.add(projection.getSourceName());
}
- setLogger(null);
setMergingStrategy(null);
}
/**
- * @param logger Sets logger to the specified value.
- */
- public void setLogger( Logger logger ) {
- this.logger = logger != null ? logger : Logger.getLogger(getClass());
- }
-
- /**
* @param mergingStrategy Sets mergingStrategy to the specified value.
*/
public void setMergingStrategy( MergeStrategy mergingStrategy ) {
@@ -202,7 +195,7 @@
try {
connection.close();
} catch (Throwable t) {
- Logger.getLogger(getClass()).debug("Error while closing
connection to {0}", connection.getSourceName());
+ logger.debug("Error while closing connection to {0}",
connection.getSourceName());
}
}
connectionsBySourceName.clear();
Modified:
trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java
===================================================================
---
trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java 2008-08-20
16:57:23 UTC (rev 456)
+++
trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheConnection.java 2008-08-20
17:14:49 UTC (rev 457)
@@ -33,7 +33,6 @@
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
-import org.jboss.dna.common.util.Logger;
import org.jboss.dna.common.util.StringUtil;
import org.jboss.dna.spi.ExecutionContext;
import org.jboss.dna.spi.cache.CachePolicy;
@@ -352,9 +351,9 @@
// Record the list of children as a property on the parent ...
// (Do this last, as it doesn't need to be done if there's an exception
in the above logic)
- Logger.getLogger(getClass()).trace("Updating child list of {0} to:
{1}",
- parent.getFqn(),
- StringUtil.readableString(childNames));
+ context.getLogger(getClass()).trace("Updating child list of {0} to:
{1}",
+ parent.getFqn(),
+ StringUtil.readableString(childNames));
parent.put(JBossCacheLexicon.CHILD_PATH_SEGMENT_LIST, childNames); // replaces
any existing value
if (addChildWithName) {
@@ -421,7 +420,7 @@
assert context != null;
if (existing.equals(newSegment)) return;
- Logger.getLogger(getClass()).trace("Renaming {0} to {1} under {2}",
existing, newSegment, parent.getFqn());
+ context.getLogger(getClass()).trace("Renaming {0} to {1} under {2}",
existing, newSegment, parent.getFqn());
Node<Name, Object> existingChild = parent.getChild(existing);
assert existingChild != null;