dirkv 01/08/18 06:46:51
Modified: src/share/org/apache/slide/common Namespace.java
Log:
logger cleanup, replace printstacktrace
Revision Changes Path
1.36 +59 -49 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Namespace.java 2001/07/24 21:38:26 1.35
+++ Namespace.java 2001/08/18 13:46:51 1.36
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.35
2001/07/24 21:38:26 dirkv Exp $
- * $Revision: 1.35 $
- * $Date: 2001/07/24 21:38:26 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.36
2001/08/18 13:46:51 dirkv Exp $
+ * $Revision: 1.36 $
+ * $Date: 2001/08/18 13:46:51 $
*
* ====================================================================
*
@@ -93,7 +93,8 @@
* Namespace class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.35 $
+ * @author Dirk Verbeeck
+ * @version $Revision: 1.36 $
*/
public final class Namespace {
@@ -159,6 +160,10 @@
private TransactionManager transactionManager =
new SlideTransactionManager();
+ /**
+ * Log channel for logger
+ */
+ private final static String LOG_CHANNEL = Namespace.class.getName();
/**
* Logger.
@@ -379,7 +384,7 @@
(storeClass);
} catch(ClassCastException e) {
// TEMP
- e.printStackTrace();
+ getLogger().log(e,LOG_CHANNEL, Logger.ERROR);
// --TEMP
throw new ServiceRegistrationFailedException
(storeClass);
@@ -409,7 +414,7 @@
while (serviceList.hasMoreElements()) {
Service service = (Service) serviceList.nextElement();
try {
- Domain.info("Initializing Store " + service);
+ getLogger().log("Initializing Store " +
service,LOG_CHANNEL,Logger.INFO);
service.setNamespace(this);
service.initialize(new NamespaceAccessTokenImpl(this));
} catch (ServiceInitializationFailedException e) {
@@ -474,7 +479,7 @@
try {
Service service = (Service) connectedServices.elementAt(i);
if (service.isConnected()) {
- Domain.info("Shutting down service " + service);
+ getLogger().log("Shutting down service " +
service,LOG_CHANNEL,Logger.INFO);
service.disconnect();
}
} catch (ServiceDisconnectionFailedException e) {
@@ -625,7 +630,7 @@
void loadDefinition(Configuration definition)
throws SlideException, ConfigurationException {
- Domain.info("Loading namespace definition");
+ getLogger().log("Loading namespace definition",LOG_CHANNEL,Logger.INFO);
// Loading stores
@@ -668,13 +673,13 @@
void loadBaseData(Configuration namespaceBaseDataDefinition)
throws SlideException, ConfigurationException {
- Domain.info("Loading namespace " + getName() + " base data");
+ getLogger().log("Loading namespace " + getName() + " base
data",LOG_CHANNEL,Logger.INFO);
// Load Namespace Base Data
try {
- // start transaction for temp object creation
+ // start transaction for temp object creation
getTransactionManager().begin();
-
+
// First, we create the root node
Uri rootUri = getUri("/");
SubjectNode rootNode = new SubjectNode("/");
@@ -682,9 +687,9 @@
try {
rootUri.getStore().createObject(rootUri, rootNode);
} catch (ObjectAlreadyExistsException e) {
- // abort the failed transaction
+ // abort the failed transaction
getTransactionManager().rollback();
- // start a new one to continue processing
+ // start a new one to continue processing
getTransactionManager().begin();
}
rootUri.getStore().grantPermission(rootUri, allAccess);
@@ -693,10 +698,12 @@
Uri tempActionUri = getUri("/tempaction");
ActionNode tempAction = new ActionNode("/tempaction");
tempActionUri.getStore().createObject(tempActionUri, tempAction);
+
+ // end transaction for temp object creation
+ getTransactionManager().commit();
- // end transaction for temp object creation
- getTransactionManager().commit();
-
+ getLogger().log("Init namespace " + getName() + "
configuration",LOG_CHANNEL,Logger.INFO);
+
// Create the dummy configuration
config.initializeAsDummyConfig(this);
@@ -706,6 +713,7 @@
// start the transaction, NOTE some operations are outside this TA
token.begin();
+ getLogger().log("Import data into namespace " +
getName(),LOG_CHANNEL,Logger.INFO);
token.importData
(new SlideToken(new CredentialsToken(new String("/"))),
namespaceBaseDataDefinition);
@@ -715,6 +723,8 @@
// start transaction for temp object removal
getTransactionManager().begin();
+
+ getLogger().log("Finish init namespace " + getName() + "
configuration",LOG_CHANNEL,Logger.INFO);
// Then, destroy the temp action
tempActionUri.getStore().removeObject(tempActionUri, tempAction);
@@ -731,26 +741,26 @@
} catch (SlideException e) {
// If that occurs, then most likely the base config was
// already done before
- Domain.info("Namespace base configuration was already done before");
- try {
+ getLogger().log("Namespace base configuration was already done
before",LOG_CHANNEL,Logger.INFO);
+ try {
if (getTransactionManager().getStatus()==Status.STATUS_ACTIVE)
getTransactionManager().rollback();
- }
- catch (SystemException ex) {
- Domain.warn("Could not rollback namespace base configuration:
" + ex.getMessage());
- }
+ }
+ catch (SystemException ex) {
+ getLogger().log("Could not rollback namespace base configuration: "
+ ex.toString(),LOG_CHANNEL,Logger.WARNING);
+ }
} catch (Exception e) {
- e.printStackTrace();
+ getLogger().log("Unable to read Namespace base configuration file :
",LOG_CHANNEL,Logger.ERROR);
+ getLogger().log(e,LOG_CHANNEL, Logger.ERROR);
// Unable to load the base configuration XML file.
// Log the event, and hope it was already done before.
- Domain.info("Unable to read Namespace base configuration file : " +
e.getMessage());
- try {
- if (getTransactionManager().getStatus()==Status.STATUS_ACTIVE)
- getTransactionManager().rollback();
- }
- catch (SystemException ex) {
- Domain.warn("Could not rollback namespace base configuration
after load error: " + ex.getMessage());
- }
+ try {
+ if (getTransactionManager().getStatus()==Status.STATUS_ACTIVE)
+ getTransactionManager().rollback();
+ }
+ catch (SystemException ex) {
+ getLogger().log("Could not rollback namespace base configuration
after load error: " + ex.toString(),LOG_CHANNEL,Logger.WARNING);
+ }
}
}
@@ -766,7 +776,7 @@
void loadConfiguration(Configuration namespaceConfigurationDefinition)
throws SlideException {
- Domain.info("Loading namespace " + getName() + " configuration");
+ getLogger().log("Loading namespace " + getName() + "
configuration",LOG_CHANNEL,Logger.INFO);
// Load Namespace Config
config = new NamespaceConfig();
@@ -787,7 +797,7 @@
void loadParameters(Configuration namespaceConfigurationDefinition)
throws SlideException {
- Domain.info("Loading namespace " + getName() + " parameters");
+ getLogger().log("Loading namespace " + getName() + "
parameters",LOG_CHANNEL,Logger.INFO);
// Load Namespace Config
config = new NamespaceConfig();
@@ -833,7 +843,7 @@
try {
storeClass = Class.forName(storeClassname);
} catch (Exception e) {
- e.printStackTrace();
+ getLogger().log(e,LOG_CHANNEL, Logger.ERROR);
throw new SlideException(e.getMessage());
}
storesClass.put(storeName, storeClass);
@@ -863,9 +873,9 @@
storeDefinition.getConfiguration(REFERENCE);
currentStoreChildStores.put
(NODE_STORE, referenceDefinition.getAttribute("store"));
- Domain.info("Node store references " +
referenceDefinition.getAttribute("store"));
+ getLogger().log("Node store references " +
referenceDefinition.getAttribute("store"),LOG_CHANNEL,Logger.INFO);
} catch (ConfigurationException ex) {
- Domain.info("Node store: " +
nodeStoreDefinition.getAttribute("classname"));
+ getLogger().log("Node store: " +
nodeStoreDefinition.getAttribute("classname"),LOG_CHANNEL,Logger.INFO);
NodeStore nodeStore =
(NodeStore) loadChildStore(nodeStoreDefinition,
storeParameters);
@@ -886,9 +896,9 @@
currentStoreChildStores.put
(SECURITY_STORE,
referenceDefinition.getAttribute("store"));
- Domain.info("Security store references " +
referenceDefinition.getAttribute("store"));
+ getLogger().log("Security store references " +
referenceDefinition.getAttribute("store"),LOG_CHANNEL,Logger.INFO);
} catch (ConfigurationException ex) {
- Domain.info("Security store: " +
securityStoreDefinition.getAttribute("classname"));
+ getLogger().log("Security store: " +
securityStoreDefinition.getAttribute("classname"),LOG_CHANNEL,Logger.INFO);
SecurityStore securityStore =
(SecurityStore) loadChildStore(securityStoreDefinition,
storeParameters);
@@ -908,9 +918,9 @@
lockStoreDefinition.getConfiguration(REFERENCE);
currentStoreChildStores.put
(LOCK_STORE, referenceDefinition.getAttribute("store"));
- Domain.info("Lock store store references " +
referenceDefinition.getAttribute("store"));
+ getLogger().log("Lock store store references " +
referenceDefinition.getAttribute("store"),LOG_CHANNEL,Logger.INFO);
} catch (ConfigurationException ex) {
- Domain.info("Lock store store: " +
lockStoreDefinition.getAttribute("classname"));
+ getLogger().log("Lock store store: " +
lockStoreDefinition.getAttribute("classname"),LOG_CHANNEL,Logger.INFO);
LockStore lockStore =
(LockStore) loadChildStore(lockStoreDefinition,
storeParameters);
@@ -933,9 +943,9 @@
currentStoreChildStores.put
(REVISION_DESCRIPTORS_STORE,
referenceDefinition.getAttribute("store"));
- Domain.info("Revision descriptors store references " +
referenceDefinition.getAttribute("store"));
+ getLogger().log("Revision descriptors store references " +
referenceDefinition.getAttribute("store"),LOG_CHANNEL,Logger.INFO);
} catch (ConfigurationException ex) {
- Domain.info("Revision descriptors store: " +
revisionDescriptorsStoreDefinition.getAttribute("classname"));
+ getLogger().log("Revision descriptors store: " +
revisionDescriptorsStoreDefinition.getAttribute("classname"),LOG_CHANNEL,Logger.INFO);
RevisionDescriptorsStore revisionDescriptorsStore =
(RevisionDescriptorsStore) loadChildStore
(revisionDescriptorsStoreDefinition, storeParameters);
@@ -958,9 +968,9 @@
currentStoreChildStores.put
(REVISION_DESCRIPTOR_STORE,
referenceDefinition.getAttribute("store"));
- Domain.info("Revision descriptor store references " +
referenceDefinition.getAttribute("store"));
+ getLogger().log("Revision descriptor store references " +
referenceDefinition.getAttribute("store"),LOG_CHANNEL,Logger.INFO);
} catch (ConfigurationException ex) {
- Domain.info("Revision descriptor store: " +
revisionDescriptorStoreDefinition.getAttribute("classname"));
+ getLogger().log("Revision descriptor store: " +
revisionDescriptorStoreDefinition.getAttribute("classname"),LOG_CHANNEL,Logger.INFO);
RevisionDescriptorStore revisionDescriptorStore =
(RevisionDescriptorStore) loadChildStore
(revisionDescriptorStoreDefinition, storeParameters);
@@ -981,9 +991,9 @@
contentStoreDefinition.getConfiguration(REFERENCE);
currentStoreChildStores.put
(CONTENT_STORE, referenceDefinition.getAttribute("store"));
- Domain.info("Content store references " +
referenceDefinition.getAttribute("store"));
+ getLogger().log("Content store references " +
referenceDefinition.getAttribute("store"),LOG_CHANNEL,Logger.INFO);
} catch (ConfigurationException ex) {
- Domain.info("Content store: " +
contentStoreDefinition.getAttribute("classname"));
+ getLogger().log("Content store: " +
contentStoreDefinition.getAttribute("classname"),LOG_CHANNEL,Logger.INFO);
ContentStore contentStore =
(ContentStore) loadChildStore(contentStoreDefinition,
storeParameters);
@@ -1023,7 +1033,7 @@
Class.forName(childStoreClassname);
childStore = (Service) childStoreClass.newInstance();
} catch (Exception e) {
- e.printStackTrace();
+ getLogger().log(e,LOG_CHANNEL, Logger.ERROR);
return null;
}
@@ -1089,13 +1099,13 @@
(Hashtable) storesParameters.get(storeName),
new Scope(match),
(Hashtable) childStores.get(storeName));
- Domain.info("Registering Store "
+ getLogger().log("Registering Store "
+ storeName
+ " of class "
+ storesClass.get(storeName)
+ " with parameters "
+ storesParameters.get(storeName)
- + " on scope " + match);
+ + " on scope " + match,LOG_CHANNEL,Logger.INFO);
}
}
