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 18:49:36 UTC
svn commit: r405799 - in
/portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl:
PortletSessionImpl.java ProxyPortlet.java WSRPRequestImpl.java
Author: dlouzan
Date: Wed May 10 09:49:33 2006
New Revision: 405799
URL: http://svn.apache.org/viewcvs?rev=405799&view=rev
Log:
commons-logging integration
Modified:
portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/PortletSessionImpl.java
portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java
portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/WSRPRequestImpl.java
Modified: portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/PortletSessionImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/PortletSessionImpl.java?rev=405799&r1=405798&r2=405799&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/PortletSessionImpl.java (original)
+++ portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/PortletSessionImpl.java Wed May 10 09:49:33 2006
@@ -15,12 +15,15 @@
*/
package org.apache.wsrp4j.consumer.proxyportlet.impl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.wsrp4j.commons.util.Utility;
+
import org.apache.wsrp4j.commons.consumer.interfaces.session.PortletWindowSession;
import org.apache.wsrp4j.commons.consumer.driver.GenericPortletSessionImpl;
import org.apache.wsrp4j.commons.consumer.driver.GenericPortletWindowSessionImpl;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
/**
* @version $Id$
@@ -28,8 +31,8 @@
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);
@@ -44,10 +47,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));
}
PortletWindowSession session = (PortletWindowSession) this.windowSessions.get(windowID);
@@ -55,15 +59,17 @@
session = new GenericPortletWindowSessionImpl(windowID, this);
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/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java?rev=405799&r1=405798&r2=405799&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java (original)
+++ portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/ProxyPortlet.java Wed May 10 09:49:33 2006
@@ -83,13 +83,16 @@
import org.apache.wsrp4j.consumer.proxyportlet.SessionHandler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
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.Modes;
import org.apache.wsrp4j.commons.util.ParameterChecker;
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.util.WindowStates;
/**
@@ -106,8 +109,7 @@
private static ParameterChecker checker;
// logger
- private static final Logger logger =
- LogManager.getLogManager().getLogger(ProxyPortlet.class);
+ private static final Log log = LogFactory.getLog(ProxyPortlet.class);
// lock object for thread synchronization while setting the urlgenerator
private static final Object urlGenLock = new Object();
@@ -128,10 +130,11 @@
* configuration and initialization parameters
**/
public void init(PortletConfig config) throws PortletException {
+
final String MN = "init";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
super.init(config);
@@ -144,9 +147,10 @@
throw new PortletException(e);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
/**
@@ -154,6 +158,7 @@
*/
private void initConsumerEnvironment(PortletConfig config)
throws WSRPException {
+
try {
String className = config.getInitParameter(
ConsumerConstants.CONSUMER_ENV_CLASS);
@@ -164,9 +169,9 @@
String path =
config.getPortletContext().getRealPath("/WEB-INF");
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(Logger.TRACE_HIGH, "initConsumerEnvironment",
- "Path to persistent directory :" + path);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Path to persistent directory: " + path);
}
((ConsumerEnvironmentImpl)consumerEnv).setRegistryPath(path);
@@ -178,12 +183,11 @@
} catch (Exception e) {
WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initConsumerEnvironment",
+ log,
ErrorCodes.INSTANTIATION_OF_CONSUMER_ENV_FAILED,
e);
}
+
}
/**
@@ -206,8 +210,9 @@
ActionResponse actionResponse) throws PortletException {
String MN = "processAction";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -235,14 +240,11 @@
CoreUtils.getInternalRequest(request).
getInternalPortletWindow();
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(
- Logger.TRACE_HIGH,
- MN,
- "proxyportlet("
- + myWindow.getPortletEntity().getId()
- + ") invokes action on portlet "
- + portlet.getPortletKey().getPortletHandle());
+ if (log.isDebugEnabled()) {
+ log.debug("proxyportlet(" +
+ myWindow.getPortletEntity().getId() +
+ ") invokes action on portlet " +
+ portlet.getPortletKey().getPortletHandle());
}
// do the actual call and check the response from the producer
@@ -253,7 +255,7 @@
checker.check(response);
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
// process the reponse
@@ -298,15 +300,11 @@
} catch (PortletModeException e) {
// means portlet does not support this mode
// means portlet does not support the window state
- if (logger.isLogging(Logger.INFO)) {
- logger.text(
- Logger.INFO,
- MN,
- "The portlet='"
- + portlet.getPortletKey().
- getPortletHandle()
- + "' does not support the mode="
- + e.getMode());
+ if (log.isInfoEnabled()) {
+ log.info("The portlet: '" +
+ portlet.getPortletKey().getPortletHandle() +
+ "' does not support the mode: " +
+ e.getMode());
}
}
}
@@ -333,15 +331,11 @@
}
} catch (WindowStateException e) {
// means portlet does not support the window state
- if (logger.isLogging(Logger.INFO)) {
- logger.text(
- Logger.INFO,
- MN,
- "The portlet='"
- + portlet.getPortletKey().
- getPortletHandle()
- + "' does not support the window state="
- + e.getState());
+ if (log.isInfoEnabled()) {
+ log.info("The portlet: '" +
+ portlet.getPortletKey().getPortletHandle() +
+ "' does not support the windowState: " +
+ e.getState());
}
}
}
@@ -351,8 +345,8 @@
try {
actionResponse.sendRedirect(redirectURL);
} catch (IOException ioEx) {
- WSRPXHelper.throwX(logger, Logger.ERROR,
- "processAction",
+ WSRPXHelper.throwX(
+ log,
ErrorCodes.COULD_NOT_FOLLOW_REDIRECT);
}
}
@@ -361,8 +355,8 @@
} catch (WSRPException e) {
throw new PortletException(e);
} finally {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
}
@@ -387,8 +381,9 @@
throws PortletException, IOException {
String MN = "render";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
try {
@@ -419,14 +414,11 @@
CoreUtils.getInternalRequest(request).
getInternalPortletWindow();
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(
- Logger.TRACE_HIGH,
- MN,
- "proxyportlet("
- + myWindow.getPortletEntity().getId()
- + ") renders portlet "
- + portlet.getPortletKey().getPortletHandle());
+ if (log.isDebugEnabled()) {
+ log.debug("proxyportlet(" +
+ myWindow.getPortletEntity().getId() +
+ ") renders portlet " +
+ portlet.getPortletKey().getPortletHandle());
}
// feed the url generator with the current response
synchronized (urlGenLock) {
@@ -450,7 +442,7 @@
checker.check(response);
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
// process the markup response
@@ -472,8 +464,8 @@
throw new PortletException(
"Error occured while retrieving markup", e);
} finally {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
}
@@ -484,11 +476,13 @@
MarkupContext markupContext,
RenderResponse renderResponse)
throws WSRPException {
+
final String MN = "processMarkupContext";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
+
String markup = null;
if (markupContext != null && renderResponse != null) {
@@ -504,25 +498,25 @@
renderResponse.getWriter().write(markup);
} catch (IOException e) {
- WSRPXHelper.throwX(0, e);
+ WSRPXHelper.throwX(log, ErrorCodes.INTERNAL_ERROR, e);
}
}
// TODO: need to handle markup binary
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return markup;
}
- private PortletWindowSession getWindowSession(
- String userID,
+ private PortletWindowSession getWindowSession(String userID,
WSRPPortlet portlet,
PortletRequest request)
- throws WSRPException {
+ throws WSRPException {
+
PortletKey portletKey = portlet.getPortletKey();
// to ensure that producer is added to the producer registry
@@ -618,7 +612,7 @@
preferences.store();
} catch (Exception e) {
// ups
- WSRPXHelper.throwX(0, e);
+ WSRPXHelper.throwX(log, ErrorCodes.INTERNAL_ERROR, e);
}
}
@@ -766,19 +760,22 @@
}
protected Producer getProducer(String producerID) throws WSRPException {
+
final String MN = "getProducer";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(Logger.TRACE_HIGH, MN,
- "Trying to load producer with ID :" + producerID);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug("Trying to load producer with ID: " + producerID);
}
Producer producer =
consumerEnv.getProducerRegistry().getProducer(producerID);
if (producer == null) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN,
- ErrorCodes.PRODUCER_DOES_NOT_EXIST);
+ WSRPXHelper.throwX(log, ErrorCodes.PRODUCER_DOES_NOT_EXIST);
}
return producer;
Modified: portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/WSRPRequestImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/WSRPRequestImpl.java?rev=405799&r1=405798&r2=405799&view=diff
==============================================================================
--- portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/WSRPRequestImpl.java (original)
+++ portals/wsrp4j/trunk/consumer/src/java/org/apache/wsrp4j/consumer/proxyportlet/impl/WSRPRequestImpl.java Wed May 10 09:49:33 2006
@@ -25,6 +25,10 @@
import javax.portlet.PortletMode;
import javax.portlet.PortletRequest;
+
+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;
@@ -39,13 +43,13 @@
import org.apache.wsrp4j.commons.consumer.interfaces.session.
PortletWindowSession;
import org.apache.wsrp4j.commons.consumer.driver.GenericWSRPBaseRequestImpl;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+
import org.apache.wsrp4j.commons.util.AuthenticationInfoHelper;
import org.apache.wsrp4j.commons.util.Constants;
import org.apache.wsrp4j.commons.util.LocaleHelper;
import org.apache.wsrp4j.commons.util.Modes;
import org.apache.wsrp4j.commons.util.WindowStates;
+import org.apache.wsrp4j.commons.util.Utility;
/**
@@ -54,6 +58,8 @@
public class WSRPRequestImpl extends GenericWSRPBaseRequestImpl
implements InteractionRequest, MarkupRequest {
+ protected final static Log log = LogFactory.getLog(WSRPRequestImpl.class);
+
private final PortletRequest portletRequest;
private final PortletWindowSession windowSession;
private final PortletWindow portletWindow;
@@ -70,8 +76,6 @@
private String[] modes;
private String[] locales;
- protected Logger logger =
- LogManager.getLogManager().getLogger(WSRPRequestImpl.class);
public WSRPRequestImpl(PortletWindowSession windowSession,
javax.portlet.PortletRequest portletRequest) {
@@ -174,15 +178,16 @@
}
public String[] getModes() {
+
final String MN = "getModes()";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if (this.modes != null) {
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return this.modes;
@@ -229,8 +234,8 @@
this.modes = (String[])result.toArray(new String[0]);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return this.modes;
@@ -276,10 +281,11 @@
}
private void integrateParameter() {
- final String MN = "integrateParameter()";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ final String MN = "integrateParameter";
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
ArrayList formParams = new ArrayList();
@@ -324,9 +330,10 @@
formParams.toArray(formParameters);
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
}