remm 01/10/03 14:27:45
Modified: src/share/org/apache/slide/common Namespace.java
XMLUnmarshaller.java
Log:
- Log the base data loading to the namespace application logger.
- If no namespace application logger has been set, log to the namespace
logger.
Revision Changes Path
1.40 +6 -4 jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Namespace.java 2001/10/03 20:48:41 1.39
+++ Namespace.java 2001/10/03 21:27:45 1.40
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.39
2001/10/03 20:48:41 remm Exp $
- * $Revision: 1.39 $
- * $Date: 2001/10/03 20:48:41 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.40
2001/10/03 21:27:45 remm Exp $
+ * $Revision: 1.40 $
+ * $Date: 2001/10/03 21:27:45 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.39 $
+ * @version $Revision: 1.40 $
*/
public final class Namespace {
@@ -272,6 +272,8 @@
public Logger getApplicationLogger() {
if (applicationLogger != null)
return applicationLogger;
+ else if (logger != null)
+ return logger;
else
return Domain.getLogger();
}
1.19 +33 -20
jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java
Index: XMLUnmarshaller.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLUnmarshaller.java 2001/08/31 21:34:10 1.18
+++ XMLUnmarshaller.java 2001/10/03 21:27:45 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v 1.18
2001/08/31 21:34:10 dirkv Exp $
- * $Revision: 1.18 $
- * $Date: 2001/08/31 21:34:10 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v 1.19
2001/10/03 21:27:45 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/10/03 21:27:45 $
*
* ====================================================================
*
@@ -83,7 +83,7 @@
* XMLUnmarshaller class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public final class XMLUnmarshaller {
@@ -137,7 +137,8 @@
String className = objectDefinition.getAttribute("classname");
String uri = objectDefinition.getAttribute("uri");
- Domain.info("Loading object " + uri);
+ accessToken.getLogger().log("Loading object " + uri,
+ LOG_CHANNEL,Logger.INFO);
try {
@@ -180,7 +181,9 @@
}
} catch (ObjectAlreadyExistsException e) {
// Ignore, log and continue
- Domain.info("Object already exists at " + uri);
+ accessToken.getLogger().log
+ ("Object already exists at " + uri,
+ LOG_CHANNEL, Logger.INFO);
}
}
@@ -249,15 +252,20 @@
} catch (ObjectNotFoundException e) {
// Should NEVER happen
- Domain.log(e,LOG_CHANNEL,Logger.WARNING);
- Domain.log(e.toString(),LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log(e,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log
+ (e.toString(),LOG_CHANNEL,Logger.WARNING);
} catch (LinkedObjectNotFoundException e) {
// Icorrect link
- Domain.log(e,LOG_CHANNEL,Logger.WARNING);
- Domain.log("Incorrect link found while creating " +
uri,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log(e,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log
+ ("Incorrect link found while creating " + uri,
+ LOG_CHANNEL,Logger.WARNING);
} catch (AccessDeniedException e) {
// Security exception
- Domain.log("Insufficient credentials to create
object",LOG_CHANNEL,Logger.INFO);
+ accessToken.getLogger().log
+ ("Insufficient credentials to create object",
+ LOG_CHANNEL,Logger.INFO);
}
Enumeration childConfigurations =
@@ -299,7 +307,8 @@
NodeRevisionDescriptors revisionDescriptors = null;
try {
- revisionDescriptors = accessToken.getContentHelper().retrieve(token,
uri);
+ revisionDescriptors = accessToken.getContentHelper().retrieve
+ (token, uri);
} catch (ObjectLockedException e) {
// Ignore
}
@@ -352,12 +361,14 @@
(token, uri, revisionDescriptor, revisionContent);
} catch (RevisionDescriptorNotFoundException e) {
// Should not happen
- Domain.log(e,LOG_CHANNEL,Logger.WARNING);
- Domain.log(e.toString(),LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log(e,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log
+ (e.toString(),LOG_CHANNEL,Logger.WARNING);
} catch (RevisionNotFoundException e) {
// Should not happen
- Domain.log(e,LOG_CHANNEL,Logger.WARNING);
- Domain.log(e.toString(),LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log(e,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log
+ (e.toString(),LOG_CHANNEL,Logger.WARNING);
} catch (ObjectLockedException e) {
// Ignore
}
@@ -369,12 +380,14 @@
(token, uri, revisionDescriptor, revisionContent);
} catch(ObjectLockedException e) {
// Should not happen
- Domain.log(e,LOG_CHANNEL,Logger.WARNING);
- Domain.log(e.toString(),LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log(e,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log
+ (e.toString(),LOG_CHANNEL,Logger.WARNING);
} catch(RevisionAlreadyExistException e) {
// Should not happen
- Domain.log(e,LOG_CHANNEL,Logger.WARNING);
- Domain.log(e.toString(),LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log(e,LOG_CHANNEL,Logger.WARNING);
+ accessToken.getLogger().log
+ (e.toString(),LOG_CHANNEL,Logger.WARNING);
}
}
