You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by dl...@apache.org on 2006/05/10 19:31:28 UTC
svn commit: r405801 -
/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/
Author: dlouzan
Date: Wed May 10 10:27:23 2006
New Revision: 405801
URL: http://svn.apache.org/viewcvs?rev=405801&view=rev
Log:
commons-logging integration
Modified:
portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerConfiguredPortletList.java
portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPersistentFactoryImpl.java
portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletContextList.java
portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletRegistrationList.java
portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/PageList.java
Modified: portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerConfiguredPortletList.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerConfiguredPortletList.java?rev=405801&r1=405800&r2=405801&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerConfiguredPortletList.java (original)
+++ portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerConfiguredPortletList.java Wed May 10 10:27:23 2006
@@ -18,11 +18,15 @@
import java.io.FileReader;
import java.io.FileWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
+
import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.exception.WSRPXHelper;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+
import org.apache.wsrp4j.commons.persistence.PersistentHandler;
import org.apache.wsrp4j.commons.persistence.PersistentInformationProvider;
import org.apache.wsrp4j.commons.producer.provider.driver.
@@ -46,8 +50,8 @@
public class ConsumerConfiguredPortletList extends PersistentDataObjectImpl {
// log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+ private static final Log log =
+ LogFactory.getLog(ConsumerConfiguredPortletList.class);
/**
* Default Constructor
@@ -72,8 +76,9 @@
throws WSRPException {
String MN = "unMarshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -85,12 +90,11 @@
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.UNMARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
}
@@ -110,8 +114,9 @@
throws WSRPException {
String MN = "marshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -122,12 +127,13 @@
marshaller.marshal(_objects.get(0));
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.MARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.MARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
+
}
Modified: portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPersistentFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPersistentFactoryImpl.java?rev=405801&r1=405800&r2=405801&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPersistentFactoryImpl.java (original)
+++ portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPersistentFactoryImpl.java Wed May 10 10:27:23 2006
@@ -15,10 +15,14 @@
*/
package org.apache.wsrp4j.persistence.xml.driver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
+
+import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.exception.WSRPXHelper;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
import org.apache.wsrp4j.commons.persistence.ConsumerPersistentFactory;
import org.apache.wsrp4j.commons.persistence.PersistentDataObject;
@@ -35,16 +39,15 @@
*/
public class ConsumerPersistentFactoryImpl implements ConsumerPersistentFactory {
+ private static final Log log =
+ LogFactory.getLog(ConsumerPersistentFactoryImpl.class);
+
// holds the PersistentHandler
private static PersistentHandler persistentHandler;
// holds the ConsumerPersistentInformationProvider
protected static ConsumerPersistentInformationProvider consumerInfoProvider;
- // log and trace support
- protected Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
-
/**
* Returns a PersistentHandler
@@ -54,24 +57,25 @@
public PersistentHandler getPersistentHandler() {
String MN = "getConsumerPersistentHandler";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if (persistentHandler == null) {
persistentHandler = PersistentHandlerImpl.create();
- if (logger.isLogging(Logger.TRACE_MEDIUM)) {
- logger.text(Logger.TRACE_MEDIUM, MN,
- "PersistentHandler successfully created.");
+ if (log.isDebugEnabled()) {
+ log.debug("PersistentHandler successfully created.");
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return persistentHandler;
+
}
/**
@@ -82,8 +86,9 @@
public PersistentInformationProvider getPersistentInformationProvider() {
String MN = "getConsumerPersistentInformationProvider";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if(consumerInfoProvider == null) {
@@ -91,18 +96,17 @@
ConsumerPersistentInformationProviderImpl.create();
}
-
- if (logger.isLogging(Logger.TRACE_MEDIUM)) {
- logger.text(Logger.TRACE_MEDIUM, MN,
- "ConsumerPersistentInformationProvider successfully " +
+ if (log.isDebugEnabled()) {
+ log.debug("ConsumerPersistentInformationProvider successfully " +
"created.");
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return consumerInfoProvider;
+
}
@@ -116,8 +120,9 @@
public PersistentDataObject getPortletList() throws WSRPException {
String MN = "getPortletList";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
PortletList pdo = null;
@@ -132,14 +137,15 @@
} catch (Exception e) {
// could not find class
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, 1003, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return pdo;
+
}
/**
@@ -152,8 +158,9 @@
throws WSRPException {
String MN = "getConsumerPortletContextList";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
ConsumerPortletContextList pdo = null;
@@ -169,14 +176,15 @@
} catch (Exception e) {
// could not find class
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, 1003, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return pdo;
+
}
/**
@@ -188,8 +196,9 @@
public PersistentDataObject getProducerList() throws WSRPException {
String MN = "getProducerList";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
ProducerList pdo = null;
@@ -205,14 +214,15 @@
} catch (Exception e) {
// could not find class
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, 1003, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return pdo;
+
}
/**
@@ -224,8 +234,9 @@
public PersistentDataObject getPageList() throws WSRPException {
String MN = "getPageList";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
PageList pdo = null;
@@ -241,14 +252,15 @@
} catch (Exception e) {
// could not find class
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, 1003, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return pdo;
+
}
@@ -261,8 +273,9 @@
public PersistentDataObject getUserList() throws WSRPException {
String MN = "getUserList";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
UserList pdo = null;
@@ -278,14 +291,15 @@
} catch (Exception e) {
// could not find class
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, 1003, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return pdo;
+
}
}
Modified: portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletContextList.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletContextList.java?rev=405801&r1=405800&r2=405801&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletContextList.java (original)
+++ portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletContextList.java Wed May 10 10:27:23 2006
@@ -21,11 +21,15 @@
import org.exolab.castor.xml.Marshaller;
import org.exolab.castor.xml.Unmarshaller;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
+
import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.exception.WSRPXHelper;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+
import org.apache.wsrp4j.commons.persistence.PersistentHandler;
import org.apache.wsrp4j.commons.persistence.PersistentInformationProvider;
@@ -46,8 +50,8 @@
public class ConsumerPortletContextList extends PersistentDataObjectImpl {
// log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+ private static final Log log =
+ LogFactory.getLog(ConsumerPortletContextList.class);
/**
* Default Constructor
@@ -72,8 +76,9 @@
throws WSRPException {
String MN = "unMarshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -85,13 +90,13 @@
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.UNMARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
@@ -109,8 +114,9 @@
throws WSRPException {
String MN = "marshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -121,13 +127,13 @@
marshaller.marshal(_objects.get(0));
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.MARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.MARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
}
Modified: portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletRegistrationList.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletRegistrationList.java?rev=405801&r1=405800&r2=405801&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletRegistrationList.java (original)
+++ portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/ConsumerPortletRegistrationList.java Wed May 10 10:27:23 2006
@@ -18,11 +18,15 @@
import java.io.FileReader;
import java.io.FileWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
+
import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.exception.WSRPXHelper;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+
import org.apache.wsrp4j.commons.producer.provider.driver.
ConsumerPortletRegistrationImpl;
@@ -41,8 +45,8 @@
public class ConsumerPortletRegistrationList extends PersistentDataObjectImpl {
// log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+ private final static Log log =
+ LogFactory.getLog(ConsumerPortletRegistrationList.class);
/**
* Default Constructor
@@ -67,8 +71,9 @@
throws WSRPException {
String MN = "unMarshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -80,13 +85,13 @@
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.UNMARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
@@ -104,8 +109,9 @@
throws WSRPException {
String MN = "marshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -117,12 +123,13 @@
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.MARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.MARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
+
}
Modified: portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/PageList.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/PageList.java?rev=405801&r1=405800&r2=405801&view=diff
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/PageList.java (original)
+++ portals/wsrp4j/trunk/persistence-xml/src/java/org/apache/wsrp4j/persistence/xml/driver/PageList.java Wed May 10 10:27:23 2006
@@ -21,11 +21,15 @@
import org.exolab.castor.xml.Marshaller;
import org.exolab.castor.xml.Unmarshaller;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
+
import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.exception.WSRPXHelper;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+
import org.apache.wsrp4j.commons.persistence.PersistentHandler;
import org.apache.wsrp4j.commons.persistence.PersistentInformationProvider;
@@ -46,8 +50,7 @@
public class PageList extends PersistentDataObjectImpl {
// log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+ private static final Log log = LogFactory.getLog(PageList.class);
/**
* Default Constructor
@@ -72,8 +75,9 @@
throws WSRPException {
String MN = "unMarshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -84,13 +88,13 @@
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.UNMARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.UNMARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
@@ -108,8 +112,9 @@
throws WSRPException {
String MN = "marshalFile";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -120,13 +125,13 @@
marshaller.marshal(_objects.get(0));
}
} catch (Exception e) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.MARSHAL_ERROR, e);
+ WSRPXHelper.throwX(log, ErrorCodes.MARSHAL_ERROR, e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
}