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/12 20:01:20 UTC
svn commit: r405814 -
/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/
Author: dlouzan
Date: Fri May 12 11:01:18 2006
New Revision: 405814
URL: http://svn.apache.org/viewcvs?rev=405814&view=rev
Log:
commons-logging integration
Modified:
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/AggregationImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletSessionImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/ProducerRegistryImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/WSRPRequestImpl.java
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/AggregationImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/AggregationImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/AggregationImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/AggregationImpl.java Fri May 12 11:01:18 2006
@@ -19,6 +19,9 @@
import java.util.Iterator;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import oasis.names.tc.wsrp.v1.types.LocalizedString;
import oasis.names.tc.wsrp.v1.types.MarkupContext;
import oasis.names.tc.wsrp.v1.types.MarkupResponse;
@@ -27,10 +30,11 @@
import oasis.names.tc.wsrp.v1.types.SessionContext;
import org.apache.wsrp4j.commons.exception.WSRPException;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+import org.apache.wsrp4j.commons.exception.WSRPXHelper;
+
import org.apache.wsrp4j.commons.util.Constants;
import org.apache.wsrp4j.commons.util.Modes;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.util.WindowStates;
import org.apache.wsrp4j.commons.consumer.interfaces.consumer.ConsumerEnvironment;
@@ -62,7 +66,7 @@
private String maxPortletInstanceKey;
// log and trace support
- private Logger logger = LogManager.getLogManager().getLogger(this.getClass());
+ private final static Log log = LogFactory.getLog(AggregationImpl.class);
/**
* Construct a new <code>AggregationImpl</code> object by providing a
@@ -88,8 +92,9 @@
public String renderPage(Page page, Request request) {
String MN = "renderPage";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -177,19 +182,16 @@
pageMarkup.append("</table>");
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return pageMarkup.toString();
} catch (Exception ex) {
- if (logger.isLogging(Logger.ERROR)) {
- String message = "Rendering of page failed.";
- logger.text(Logger.ERROR, MN, ex, message);
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isErrorEnabled()) {
+ log.error("Rendering of page failed", ex);
}
-
return ex.getMessage();
}
@@ -199,8 +201,9 @@
SimplePortletWindowSession windowSession, String title) {
String MN = "addPortletFrame";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
String bgcolor = "0000bb";
@@ -242,9 +245,10 @@
System.out.println("[INFO] Markup of portlet :"
+ portlet.getPortletContext().getPortletHandle() + "\n" + markup.toString());
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
return markup.toString();
}
@@ -255,8 +259,9 @@
private String getPortletTitle(WSRPPortlet portlet, SimplePortletWindowSession windowSession) {
String MN = "getPortletTitle";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
String title = "";
@@ -293,8 +298,8 @@
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return title;
@@ -336,8 +341,9 @@
SimplePortletWindowSession windowSession) {
String MN = "getModeLink";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
// if the portlet is already in this mode, do nothing
@@ -366,8 +372,8 @@
} catch (WSRPException e) {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return "";
@@ -394,8 +400,8 @@
if (modes[j].equalsIgnoreCase(md)) {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return "<a href='" + Constants.PORTLET_INSTANCE_KEY + Constants.EQUALS
@@ -413,8 +419,8 @@
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return "";
@@ -460,14 +466,16 @@
SimplePortletWindowSession windowSession) {
String MN = "getStateLink";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
// if the portlet is already in this windows state do nothing
if (windowSession.getWindowState().equalsIgnoreCase(st)) {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return "";
@@ -517,8 +525,9 @@
for (int j = 0; j < windowStates.length; j++) {
if (windowStates[j].equalsIgnoreCase(st)) {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return "<a href='" + Constants.PORTLET_INSTANCE_KEY + Constants.EQUALS
@@ -535,8 +544,8 @@
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return "";
@@ -567,9 +576,11 @@
*/
private String getMarkup(WSRPPortlet portlet, SimplePortletWindowSession windowSession,
Request request) {
+
String MN = "getMarkup";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
// markup returned of the remote portlet
@@ -647,8 +658,8 @@
windowSession.updateMarkupCache(null);
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return content;
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PageRegistryImpl.java Fri May 12 11:01:18 2006
@@ -18,9 +18,10 @@
import java.util.Hashtable;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.wsrp4j.commons.exception.WSRPException;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
import org.apache.wsrp4j.commons.persistence.PersistentDataObject;
import org.apache.wsrp4j.commons.persistence.ConsumerPersistentFactory;
@@ -32,6 +33,7 @@
import org.apache.wsrp4j.commons.util.StateChangedEvent;
import org.apache.wsrp4j.commons.util.StateChangedListener;
import org.apache.wsrp4j.commons.util.StateChangedService;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.consumer.interfaces.page.Page;
import org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey;
@@ -49,6 +51,8 @@
*/
public class PageRegistryImpl implements PageRegistry, StateChangedListener {
+ private static final Log log = LogFactory.getLog(PageRegistryImpl.class);
+
private static PageRegistry instance;
private Hashtable pages;
@@ -59,15 +63,13 @@
private HandleGenerator handleGenerator;
- // for logging and exception support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
private PageRegistryImpl() {
- String MN = "Constructor PageRegistryImpl";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ String MN = "PageRegistryImpl";
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
this.pages = new Hashtable();
@@ -85,19 +87,15 @@
restore();
- } catch (WSRPException e) {
-
- if (logger.isLogging(Logger.WARN)) {
- logger.text(
- Logger.WARN,
- MN,
- "Restore of at least one page registration failed. " +
+ } catch (WSRPException e) {
+ if (log.isWarnEnabled()) {
+ log.warn("Restore of at least one page registration failed. " +
"Check the persistent store.");
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
}
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletRegistryImpl.java Fri May 12 11:01:18 2006
@@ -18,15 +18,15 @@
import java.util.Hashtable;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import oasis.names.tc.wsrp.v1.types.PortletContext;
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.PersistentDataObject;
import org.apache.wsrp4j.commons.persistence.ConsumerPersistentFactory;
import org.apache.wsrp4j.commons.persistence.PersistentHandler;
@@ -35,6 +35,7 @@
import org.apache.wsrp4j.commons.util.StateChangedEvent;
import org.apache.wsrp4j.commons.util.StateChangedListener;
import org.apache.wsrp4j.commons.util.StateChangedService;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey;
import org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletRegistry;
@@ -55,8 +56,7 @@
implements StateChangedListener {
// log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+ private static final Log log = LogFactory.getLog(PortletRegistryImpl.class);
private static PortletRegistry instance;
@@ -72,9 +72,10 @@
super();
- String MN = "Constructor after super()";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ String MN = "PortletRegistryImpl (after super() call)";
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
contextMap = new Hashtable();
@@ -93,18 +94,16 @@
} catch (WSRPException e) {
// catch exception and log a warning message, but proceed
- if (logger.isLogging(Logger.WARN)) {
- logger.text(
- Logger.WARN,
- MN,
- "Restore of at least one portlet or context failed. " +
- "Check persistent XML file and content");
+ if (log.isWarnEnabled()) {
+ log.warn("Restore of at least one portlet or context failed. " +
+ "Check persistent XML file and content.", e);
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
@@ -130,8 +129,9 @@
public void addPortlet(WSRPPortlet portlet) throws WSRPException {
String MN = "addPortlet";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if (portlet != null) {
@@ -154,8 +154,10 @@
// cleanup on error
super.removePortlet(portlet.getPortletKey());
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.CONSUMER_PROPERTY_FILE_NOT_FOUND, e);
+ WSRPXHelper.throwX(
+ log,
+ ErrorCodes.CONSUMER_PROPERTY_FILE_NOT_FOUND,
+ e);
}
//store PortletContext to persistent file
@@ -187,8 +189,10 @@
// delete portletContext
delete(persistentDataObjectContext);
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.CONSUMER_PROPERTY_FILE_NOT_FOUND, e);
+ WSRPXHelper.throwX(
+ log,
+ ErrorCodes.CONSUMER_PROPERTY_FILE_NOT_FOUND,
+ e);
}
// add as listener
@@ -197,9 +201,10 @@
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletSessionImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletSessionImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletSessionImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/PortletSessionImpl.java Fri May 12 11:01:18 2006
@@ -15,9 +15,11 @@
*/
package org.apache.wsrp4j.consumer.swingconsumer.driver;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.wsrp4j.commons.util.Modes;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.util.WindowStates;
import org.apache.wsrp4j.commons.consumer.interfaces.session.
@@ -35,8 +37,7 @@
public class PortletSessionImpl extends GenericPortletSessionImpl {
// logger
- private static final Logger logger =
- LogManager.getLogManager().getLogger(PortletSessionImpl.class);
+ private static final Log log = LogFactory.getLog(PortletSessionImpl.class);
public PortletSessionImpl(String handle) {
super(handle);
@@ -50,10 +51,11 @@
* @return The <code>PorletWindowSession</code> with the given ID.
**/
public PortletWindowSession getPortletWindowSession(String windowID) {
+
final String MN ="getPortletWindowSession";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
SimplePortletWindowSession session =
@@ -65,14 +67,13 @@
this.windowSessions.put(windowID, session);
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(Logger.TRACE_HIGH, MN,
- "created windowSession with ID: " + windowID);
+ if (log.isDebugEnabled()) {
+ log.debug("Created windowSession with ID: " + windowID);
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return session;
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/ProducerRegistryImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/ProducerRegistryImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/ProducerRegistryImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/ProducerRegistryImpl.java Fri May 12 11:01:18 2006
@@ -15,10 +15,12 @@
*/
package org.apache.wsrp4j.consumer.swingconsumer.driver;
-import org.apache.wsrp4j.commons.exception.WSRPException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+import org.apache.wsrp4j.commons.exception.WSRPException;
import org.apache.wsrp4j.commons.persistence.ConsumerPersistentFactory;
import org.apache.wsrp4j.commons.persistence.driver.PersistentAccess;
@@ -38,8 +40,8 @@
extends GenericPersistentProducerRegistryImpl {
// log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+ private static final Log log =
+ LogFactory.getLog(ProducerRegistryImpl.class);
private static ProducerRegistry instance ;
@@ -47,9 +49,10 @@
super();
- String MN = "Constructor after super()";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ String MN = "ProducerRegistryImpl (after super() call)";
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
// restore producers from persistent file store
@@ -65,18 +68,16 @@
} catch (WSRPException e) {
// catch exception and log a warning message, but proceed
- if (logger.isLogging(Logger.WARN)) {
- logger.text(
- Logger.WARN,
- MN,
- "Restore of at least one producer failed. " +
+ if (log.isWarnEnabled()) {
+ log.warn("Restore of at least one producer failed. " +
"Check persistent XML file and content");
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java Fri May 12 11:01:18 2006
@@ -43,6 +43,9 @@
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import oasis.names.tc.wsrp.v1.types.BlockingInteractionResponse;
import oasis.names.tc.wsrp.v1.types.Contact;
import oasis.names.tc.wsrp.v1.types.DestroyFailed;
@@ -60,10 +63,10 @@
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.util.Constants;
import org.apache.wsrp4j.commons.util.Modes;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.util.WindowStates;
import org.apache.wsrp4j.commons.consumer.interfaces.consumer.
@@ -100,6 +103,8 @@
public class SwingConsumer extends JFrame
implements HyperlinkListener, ChangeListener {
+ private static final Log log = LogFactory.getLog(SwingConsumer.class);
+
// Constants for window state, portlet mode, clone and property links
public static final String CHANGE_MODE = "change.mode";
public static final String CHANGE_STATE = "change.state";
@@ -139,8 +144,6 @@
// An instance to the singelton instance
private static SwingConsumer instance;
- // Logger
- private Logger logger;
private SwingConsumer() {
@@ -148,9 +151,6 @@
try {
- // init logger
- logger = LogManager.getLogManager().getLogger(getClass());
-
// this is a dummy consumer url
consumerURL = "http://www.apache.org/wsrp4j/swingconsumer";
@@ -217,18 +217,14 @@
} catch (IOException ioEx) {
WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initConsumerEnvironment",
+ log,
ErrorCodes.CONSUMER_PROPERTY_FILE_NOT_FOUND,
ioEx);
} catch (Exception ex) {
WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initConsumerEnvironment",
+ log,
ErrorCodes.INSTANTIATION_OF_CONSUMER_ENV_FAILED,
ex);
}
@@ -444,7 +440,9 @@
}
}
} catch (WSRPException e) {
- logger.text(Logger.ERROR,MN,e,"sessions release failed");
+ if (log.isErrorEnabled()) {
+ log.error("Sessions release failed.", e);
+ }
}
}
@@ -663,8 +661,7 @@
String portletInstanceKey = getParameterValue(link,
Constants.PORTLET_INSTANCE_KEY + Constants.EQUALS);
if (portletInstanceKey == null) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.INVALID_LINK_WITHIN_MARKUP);
+ WSRPXHelper.throwX(log, ErrorCodes.INVALID_LINK_WITHIN_MARKUP);
}
// get the corresponding portlet
@@ -795,7 +792,7 @@
} else {
// no valid wsrp-urlType parameter found
- WSRPXHelper.throwX(logger, Logger.ERROR, "onLink",
+ WSRPXHelper.throwX(log,
ErrorCodes.NO_VALID_URL_TYPE_PARAM_FOUND);
}
}
@@ -945,8 +942,9 @@
windowSession.setMode(portletMode);
} else {
- logger.text(Logger.WARN, "integrateURLParameter",
- "Found unknown portlet mode :" + portletMode);
+ if (log.isWarnEnabled()) {
+ log.warn("Found unknown portlet mode: " + portletMode);
+ }
}
}
@@ -961,8 +959,9 @@
getCurrentPage().setMaximizedPortletInstanceKey(null);
windowSession.setWindowState(windowState);
} else {
- logger.text(Logger.WARN, "integrateURLParameter",
- "Found unknown window state :" + windowState);
+ if (log.isWarnEnabled()) {
+ log.warn("Found unknown window state: " + windowState);
+ }
}
}
}
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/URLGeneratorImpl.java Fri May 12 11:01:18 2006
@@ -16,11 +16,13 @@
package org.apache.wsrp4j.consumer.swingconsumer.driver;
import java.io.UnsupportedEncodingException;
+
import java.util.Iterator;
import java.util.Map;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.wsrp4j.commons.util.Constants;
import org.apache.wsrp4j.commons.util.Utility;
@@ -34,15 +36,14 @@
*/
public class URLGeneratorImpl implements URLGenerator {
+ private static final Log log = LogFactory.getLog(URLGeneratorImpl.class);
+
private static URLGeneratorImpl instance;
private StringBuffer appURL;
private String url;
private Map consumerParameters;
- // log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
public static URLGenerator getInstance(String url,
Map consumerParameters) {
@@ -128,8 +129,9 @@
private String getParameterString(Map params) {
String MN = "getParameterString";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
StringBuffer result = null;
@@ -192,8 +194,8 @@
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
if (result != null) {
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/WSRPRequestImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/WSRPRequestImpl.java?rev=405814&r1=405813&r2=405814&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/WSRPRequestImpl.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/WSRPRequestImpl.java Fri May 12 11:01:18 2006
@@ -15,13 +15,15 @@
*/
package org.apache.wsrp4j.consumer.swingconsumer.driver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import oasis.names.tc.wsrp.v1.types.ClientData;
import oasis.names.tc.wsrp.v1.types.MarkupContext;
import oasis.names.tc.wsrp.v1.types.NamedString;
import oasis.names.tc.wsrp.v1.types.SessionContext;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.consumer.interfaces.consumer.
ConsumerEnvironment;
@@ -42,12 +44,11 @@
public class WSRPRequestImpl extends GenericWSRPBaseRequestImpl
implements InteractionRequest, MarkupRequest {
+ protected final static Log log = LogFactory.getLog(WSRPRequestImpl.class);
+
private SimplePortletWindowSession windowSession ;
private Request request;
private ConsumerEnvironment consEnv;
- // the logger
- protected Logger logger =
- LogManager.getLogManager().getLogger(WSRPRequestImpl.class);
public WSRPRequestImpl(SimplePortletWindowSession session,