remm 01/06/20 11:17:00
Modified: src/share/org/apache/slide/common Namespace.java
NamespaceAccessToken.java
NamespaceAccessTokenImpl.java
Log:
- Add new NAT.getLogger() method, which returns the namespace application
logger.
- A namespace now holds two loggers :
- a "system" log
- a logger for the application
Revision Changes Path
1.32 +34 -10 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Namespace.java 2001/05/16 12:03:46 1.31
+++ Namespace.java 2001/06/20 18:16:57 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.31
2001/05/16 12:03:46 juergen Exp $
- * $Revision: 1.31 $
- * $Date: 2001/05/16 12:03:46 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.32
2001/06/20 18:16:57 remm Exp $
+ * $Revision: 1.32 $
+ * $Date: 2001/06/20 18:16:57 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* Namespace class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.31 $
+ * @version $Revision: 1.32 $
*/
public final class Namespace {
@@ -166,6 +166,12 @@
private Logger logger;
+ /**
+ * Application logger.
+ */
+ private Logger applicationLogger;
+
+
// ------------------------------------------------------------ Constructor
@@ -208,7 +214,7 @@
*
* @return NamespaceConfig Namespace configuration
*/
- NamespaceConfig getConfig() {
+ public NamespaceConfig getConfig() {
return config;
}
@@ -247,11 +253,30 @@
/**
* Set the logger used by this namespace.
*/
- void setLogger(Logger logger) {
+ public void setLogger(Logger logger) {
this.logger = logger;
}
+ /**
+ * Return the current application logger.
+ */
+ public Logger getApplicationLogger() {
+ if (applicationLogger != null)
+ return applicationLogger;
+ else
+ return Domain.getLogger();
+ }
+
+
+ /**
+ * Set the logger used by this namespace.
+ */
+ public void setApplicationLogger(Logger logger) {
+ this.applicationLogger = applicationLogger;
+ }
+
+
// --------------------------------------------------------- Public Methods
@@ -270,8 +295,9 @@
* @exception ServiceParameterErrorException Incorrect service parameter
* @exception ServiceParameterMissingException Service parameter missing
*/
- public void registerStore(String storeName, Class storeClass, Hashtable
parameters,
- Scope scope, Hashtable childStores)
+ public void registerStore(String storeName, Class storeClass,
+ Hashtable parameters, Scope scope,
+ Hashtable childStores)
throws ServiceRegistrationFailedException,
ServiceParameterErrorException, ServiceParameterMissingException {
if (!stores.containsKey(scope)) {
@@ -488,8 +514,6 @@
store = null;
}
}
-
-
/**
1.12 +14 -4
jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessToken.java
Index: NamespaceAccessToken.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessToken.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NamespaceAccessToken.java 2001/01/10 18:49:33 1.11
+++ NamespaceAccessToken.java 2001/06/20 18:16:58 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessToken.java,v
1.11 2001/01/10 18:49:33 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/01/10 18:49:33 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessToken.java,v
1.12 2001/06/20 18:16:58 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/06/20 18:16:58 $
*
* ====================================================================
*
@@ -94,12 +94,13 @@
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.util.conf.Configuration;
import org.apache.slide.util.conf.ConfigurationException;
+import org.apache.slide.util.logger.Logger;
/**
* Namespace access token interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public interface NamespaceAccessToken extends UserTransaction {
@@ -220,4 +221,13 @@
*/
String getName();
+
+ /**
+ * Get namespace logger.
+ *
+ * @return The logger associated with the namespace.
+ */
+ Logger getLogger();
+
+
}
1.14 +15 -4
jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java
Index: NamespaceAccessTokenImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NamespaceAccessTokenImpl.java 2001/02/26 12:51:58 1.13
+++ NamespaceAccessTokenImpl.java 2001/06/20 18:16:59 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java,v
1.13 2001/02/26 12:51:58 juergen Exp $
- * $Revision: 1.13 $
- * $Date: 2001/02/26 12:51:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java,v
1.14 2001/06/20 18:16:59 remm Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/06/20 18:16:59 $
*
* ====================================================================
*
@@ -101,12 +101,13 @@
import org.apache.slide.util.conf.ConfigurationElement;
import org.apache.slide.util.conf.Populate;
import org.apache.slide.util.conf.ConfigurationException;
+import org.apache.slide.util.logger.Logger;
/**
* Namespace access token implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public final class NamespaceAccessTokenImpl implements NamespaceAccessToken {
@@ -238,6 +239,16 @@
}
+ /**
+ * Get namespace logger.
+ *
+ * @return The logger associated with the namespace.
+ */
+ public Logger getLogger() {
+ return namespace.getApplicationLogger();
+ }
+
+
// ------------------------------------------- NamespaceAccessToken Methods
