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:48:03 UTC
svn commit: r405796 - in /portals/wsrp4j/trunk/commons-consumer: ./
src/java/org/apache/wsrp4j/commons/consumer/driver/
Author: dlouzan
Date: Wed May 10 09:48:00 2006
New Revision: 405796
URL: http://svn.apache.org/viewcvs?rev=405796&view=rev
Log:
Modified:
portals/wsrp4j/trunk/commons-consumer/project.xml
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericGroupSessionImpl.java
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericPortletSessionImpl.java
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericWSRPBaseRequestImpl.java
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/InitCookieInfoImpl.java
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/PortletDriverImpl.java
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/ProducerImpl.java
portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/URLRewriterImpl.java
Modified: portals/wsrp4j/trunk/commons-consumer/project.xml
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/project.xml?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/project.xml (original)
+++ portals/wsrp4j/trunk/commons-consumer/project.xml Wed May 10 09:48:00 2006
@@ -68,6 +68,11 @@
<groupId>commons-lang</groupId>
<version>&commons-lang-version;</version>
</dependency>
+ <dependency>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ <version>&commons-logging-version;</version>
+ </dependency>
</dependencies>
<reports>
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericGroupSessionImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericGroupSessionImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericGroupSessionImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericGroupSessionImpl.java Wed May 10 09:48:00 2006
@@ -18,11 +18,15 @@
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.consumer.interfaces.session.GroupSessionMgr;
import org.apache.wsrp4j.commons.consumer.interfaces.session.PortletSession;
+
+import org.apache.wsrp4j.commons.util.Utility;
import org.apache.wsrp4j.commons.exception.WSRPException;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
+
/**
* Class implements a consumer based group session
@@ -32,30 +36,33 @@
*/
public abstract class GenericGroupSessionImpl extends InitCookieInfoImpl implements GroupSessionMgr {
+ private static final Log log = LogFactory.getLog(GenericGroupSessionImpl.class);
+
// ID of the group this session is bind to
private String groupID;
// holding all the portlet session objects for this group
protected Hashtable portletSessions;
+
- // logger
- private static final Logger logger = LogManager.getLogManager().getLogger(
- GenericGroupSessionImpl.class);
-
- public GenericGroupSessionImpl(String groupID, String markupInterfaceURL) throws WSRPException {
+ public GenericGroupSessionImpl(String groupID, String markupInterfaceURL)
+ throws WSRPException {
+
super(markupInterfaceURL);
- final String MN = "constructor";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ final String MN = "GenericGroupSessionImpl";
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
this.groupID = groupID;
this.portletSessions = new Hashtable();
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
+
}
public String getGroupID() {
@@ -73,10 +80,11 @@
if (portletSession != null) {
this.portletSessions.put(portletSession.getPortletHandle(), portletSession);
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(Logger.TRACE_HIGH, MN, "added PortletSession with handle: "
- + portletSession.getPortletHandle() + " to GroupSession with ID: "
- + groupID);
+ if (log.isDebugEnabled()) {
+ log.debug("Added PortletSession with handle:" +
+ portletSession.getPortletHandle() +
+ " to GroupSession wth ID: " +
+ groupID);
}
}
}
@@ -91,9 +99,11 @@
final String MN = "removePortletSession";
if (portletHandle == null) {
this.portletSessions.remove(portletHandle);
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.text(Logger.TRACE_HIGH, MN, "deleted PortletSession with handle: "
- + portletHandle + " from GroupSession with ID: " + groupID);
+ if (log.isDebugEnabled()) {
+ log.debug("Deleted PortletSession with handle: " +
+ portletHandle +
+ "from GroupSession with ID: " +
+ groupID);
}
}
}
@@ -107,4 +117,5 @@
return false;
return this.portletSessions.containsKey(portletHandle);
}
+
}
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericPortletSessionImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericPortletSessionImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericPortletSessionImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericPortletSessionImpl.java Wed May 10 09:48:00 2006
@@ -19,10 +19,13 @@
import java.util.Iterator;
import java.util.Map;
+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.interfaces.session.PortletSession;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
import oasis.names.tc.wsrp.v1.types.SessionContext;
@@ -31,6 +34,9 @@
* cziegeler $
*/
public abstract class GenericPortletSessionImpl implements PortletSession {
+
+ private static final Log log = LogFactory.getLog(GenericPortletSessionImpl.class);
+
// the session context passed from the producer to store
private SessionContext sessionCtx;
@@ -40,21 +46,19 @@
// holds the varios window sessions for this portlet instance
protected final Map windowSessions;
- // logger
- private static final Logger logger = LogManager.getLogManager().getLogger(
- GenericPortletSessionImpl.class);
public GenericPortletSessionImpl(String handle) {
- final String MN = "constructor";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ final String MN = "GenericPortletSessionImpl";
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
this.windowSessions = new HashMap();
this.handle = handle;
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
}
@@ -107,11 +111,11 @@
public PortletWindowSession removePortletWindowSession(String windowID) {
final String MN = "getPortletWindowSession";
- PortletWindowSession winSession = (PortletWindowSession) this.windowSessions
- .remove(windowID);
+ PortletWindowSession winSession =
+ (PortletWindowSession) this.windowSessions.remove(windowID);
- if (logger.isLogging(Logger.TRACE_HIGH) && winSession != null) {
- logger.text(Logger.TRACE_HIGH, MN, "removed PortletWindowSession with ID: " + windowID);
+ if (log.isDebugEnabled() && winSession != null) {
+ log.debug("Removed PortletWindowSession with ID: " + windowID);
}
return winSession;
@@ -123,4 +127,5 @@
public void removeAllPortletWindowSessions() {
this.windowSessions.clear();
}
+
}
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericWSRPBaseRequestImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericWSRPBaseRequestImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericWSRPBaseRequestImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/GenericWSRPBaseRequestImpl.java Wed May 10 09:48:00 2006
@@ -15,9 +15,12 @@
*/
package org.apache.wsrp4j.commons.consumer.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.consumer.interfaces.request.WSRPBaseRequest;
-import org.apache.wsrp4j.commons.log.LogManager;
-import org.apache.wsrp4j.commons.log.Logger;
import oasis.names.tc.wsrp.v1.types.ClientData;
@@ -26,9 +29,8 @@
*/
public abstract class GenericWSRPBaseRequestImpl implements WSRPBaseRequest {
- protected Logger logger =
- LogManager.getLogManager().
- getLogger(GenericWSRPBaseRequestImpl.class);
+ protected final static Log log =
+ LogFactory.getLog(GenericWSRPBaseRequestImpl.class);
public abstract String getSessionID();
@@ -55,8 +57,8 @@
public boolean isModeSupported(String wsrpMode) {
final String MN = "isModeSupported(String)";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if (wsrpMode == null)
@@ -69,8 +71,8 @@
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return false;
@@ -79,8 +81,8 @@
public boolean isWindowStateSupported(String wsrpWindowState) {
final String MN = "isWindowStateSupported(String)";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if (wsrpWindowState == null)
@@ -93,8 +95,8 @@
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return false;
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/InitCookieInfoImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/InitCookieInfoImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/InitCookieInfoImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/InitCookieInfoImpl.java Wed May 10 09:48:00 2006
@@ -21,19 +21,21 @@
import oasis.names.tc.wsrp.v1.intf.WSRP_v1_Markup_PortType;
import oasis.names.tc.wsrp.v1.wsdl.WSRPServiceLocator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.wsrp4j.commons.consumer.interfaces.session.InitCookieInfo;
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;
+
/**
* @version $Id$
*/
public class InitCookieInfoImpl implements InitCookieInfo {
-
- private Logger logger;
+
+ private static final Log log = LogFactory.getLog(InitCookieInfo.class);
private String markupInterfaceURL;
@@ -46,8 +48,6 @@
public InitCookieInfoImpl(String markupURL) throws WSRPException {
final String MN = "init";
- logger = LogManager.getLogManager().getLogger(getClass());
-
this.initCookieDone = false;
this.initCookieRequired = false;
this.markupInterfaceURL = markupURL;
@@ -59,10 +59,14 @@
markupInterface = serviceLocator.getWSRPBaseService(new URL(markupURL));
} catch (javax.xml.rpc.ServiceException xmlEx) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, ErrorCodes.INIT_OF_MARKUP_PORT_FAILED,
+ WSRPXHelper.throwX(
+ log,
+ ErrorCodes.INIT_OF_MARKUP_PORT_FAILED,
xmlEx);
} catch (MalformedURLException urlEx) {
- WSRPXHelper.throwX(logger, Logger.ERROR, MN, ErrorCodes.INVALID_URL_OF_MARKUP_PORT,
+ WSRPXHelper.throwX(
+ log,
+ ErrorCodes.INVALID_URL_OF_MARKUP_PORT,
urlEx);
}
}
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/PortletDriverImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/PortletDriverImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/PortletDriverImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/PortletDriverImpl.java Wed May 10 09:48:00 2006
@@ -15,6 +15,8 @@
*/
package org.apache.wsrp4j.commons.consumer.driver;
+import java.rmi.RemoteException;
+
import oasis.names.tc.wsrp.v1.intf.WSRP_v1_Markup_PortType;
import oasis.names.tc.wsrp.v1.intf.WSRP_v1_PortletManagement_PortType;
import oasis.names.tc.wsrp.v1.types.BlockingInteractionResponse;
@@ -49,6 +51,9 @@
import oasis.names.tc.wsrp.v1.types.ReleaseSessions;
import oasis.names.tc.wsrp.v1.types.SetPortletProperties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.wsrp4j.commons.consumer.interfaces.consumer.ConsumerEnvironment;
import org.apache.wsrp4j.commons.consumer.interfaces.session.GroupSessionMgr;
import org.apache.wsrp4j.commons.consumer.interfaces.request.InteractionRequest;
@@ -63,8 +68,6 @@
import org.apache.wsrp4j.commons.consumer.interfaces.portlet.WSRPPortlet;
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.ParameterChecker;
@@ -74,6 +77,8 @@
* @version $Id$
*/
public class PortletDriverImpl implements PortletDriver {
+
+ private static final Log log = LogFactory.getLog(PortletDriverImpl.class);
private WSRPPortlet portlet;
@@ -89,10 +94,6 @@
private CookieProtocol initCookie = CookieProtocol.none;
- // the logger
- private static final Logger logger = LogManager.getLogManager().getLogger(
- PortletDriverImpl.class);
-
public PortletDriverImpl(WSRPPortlet portlet, ConsumerEnvironment consumerEnv)
throws WSRPException {
parameterChecker = new ParameterChecker();
@@ -404,9 +405,9 @@
// and try it again
response = getMarkup(markupRequest, userID);
- } catch (java.rmi.RemoteException wsrpFault) {
+ } catch (RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
@@ -456,7 +457,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -489,7 +490,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -516,7 +517,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -545,7 +546,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -566,7 +567,7 @@
markupPort.initCookie(request);
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
}
@@ -606,7 +607,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -644,7 +645,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -683,7 +684,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
@@ -720,7 +721,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return response;
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/ProducerImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/ProducerImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/ProducerImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/ProducerImpl.java Wed May 10 09:48:00 2006
@@ -18,6 +18,9 @@
import java.net.URL;
import java.util.Hashtable;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import oasis.names.tc.wsrp.v1.intf.WSRP_v1_PortletManagement_PortType;
import oasis.names.tc.wsrp.v1.intf.WSRP_v1_Registration_PortType;
import oasis.names.tc.wsrp.v1.intf.WSRP_v1_ServiceDescription_PortType;
@@ -36,8 +39,6 @@
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.ParameterChecker;
import org.apache.wsrp4j.commons.util.impl.StateChangedServiceImpl;
@@ -54,6 +55,8 @@
**/
public class ProducerImpl extends StateChangedServiceImpl implements Producer {
+ private static Log log = LogFactory.getLog(ProducerImpl.class);
+
// ID and misc. infos
private String name;
private String producerID;
@@ -79,8 +82,7 @@
private WSRP_v1_Registration_PortType registrationInterface;
private WSRP_v1_PortletManagement_PortType portletManagementInterface;
- // Logger and parameter checker
- private Logger logger;
+ // Parameter checker
private ParameterChecker checker;
/**
@@ -89,7 +91,6 @@
**/
public ProducerImpl() {
this.portletDesc = new Hashtable();
- logger = LogManager.getLogManager().getLogger(getClass());
checker = new ParameterChecker();
}
@@ -107,8 +108,7 @@
if (markupURL != null) {
this.markupURL = markupURL;
} else {
- WSRPXHelper.throwX(logger, Logger.ERROR, "init",
- ErrorCodes.MISSING_MARKUP_PORT);
+ WSRPXHelper.throwX(log, ErrorCodes.MISSING_MARKUP_PORT);
}
if (serviceDescriptionURL != null) {
@@ -117,8 +117,7 @@
initServiceDescInterface(serviceDescriptionURL);
} else {
- WSRPXHelper.throwX(logger, Logger.ERROR, "init",
- ErrorCodes.MISSING_SERVCICE_DESC_PORT);
+ WSRPXHelper.throwX(log, ErrorCodes.MISSING_SERVICE_DESC_PORT);
}
}
@@ -170,22 +169,14 @@
} catch (javax.xml.rpc.ServiceException xmlEx) {
- WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initServiceDescInterface",
- ErrorCodes.INIT_OF_SERVICE_DESC_PORT_FAILED,
+ WSRPXHelper.throwX(log, ErrorCodes.INIT_OF_SERVICE_DESC_PORT_FAILED,
xmlEx);
} catch (java.net.MalformedURLException urlEx) {
- WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initServiceDescInterface",
- ErrorCodes.INVALID_URL_OF_SERVICE_DESC_PORT,
+ WSRPXHelper.throwX(log, ErrorCodes.INVALID_URL_OF_SERVICE_DESC_PORT,
urlEx);
-
+
}
}
@@ -207,22 +198,14 @@
} catch (javax.xml.rpc.ServiceException xmlEx) {
- WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initRegistrationInterface",
- ErrorCodes.INIT_OF_REGISTRATION_PORT_FAILED,
+ WSRPXHelper.throwX(log, ErrorCodes.INIT_OF_REGISTRATION_PORT_FAILED,
xmlEx);
} catch (java.net.MalformedURLException urlEx) {
- WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "initRegistrationInterface",
- ErrorCodes.INVALID_URL_OF_REGISTRATION_PORT,
+ WSRPXHelper.throwX(log, ErrorCodes.INVALID_URL_OF_REGISTRATION_PORT,
urlEx);
-
+
}
}
@@ -432,7 +415,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
@@ -447,11 +430,8 @@
} else {
- WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- "getServiceDescription",
- ErrorCodes.INVALID_SERVICE_DESCRIPTION);
+ WSRPXHelper.throwX(log, ErrorCodes.INVALID_SERVICE_DESCRIPTION);
+
}
} catch (InvalidRegistrationFault invalidReg) {
@@ -463,7 +443,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
}
@@ -496,9 +476,7 @@
if (desc == null) {
- WSRPXHelper.throwX(logger, Logger.ERROR,
- "getPortletDescription",
- ErrorCodes.INVALID_PORTLET_HANDLE);
+ WSRPXHelper.throwX(log, ErrorCodes.INVALID_PORTLET_HANDLE);
}
}
@@ -573,7 +551,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
@@ -624,7 +602,7 @@
}
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
@@ -658,7 +636,7 @@
} catch (java.rmi.RemoteException wsrpFault) {
- WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+ WSRPXHelper.handleWSRPFault(log, wsrpFault);
}
return any;
@@ -708,18 +686,14 @@
} catch (javax.xml.rpc.ServiceException xmlEx) {
WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- MN,
+ log,
ErrorCodes.INIT_OF_PORTLET_MGMT_PORT_FAILED,
xmlEx);
} catch (java.net.MalformedURLException urlEx) {
WSRPXHelper.throwX(
- logger,
- Logger.ERROR,
- MN,
+ log,
ErrorCodes.INVALID_URL_OF_PORTLET_MGMT_PORT,
urlEx);
Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/URLRewriterImpl.java
URL: http://svn.apache.org/viewcvs/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/URLRewriterImpl.java?rev=405796&r1=405795&r2=405796&view=diff
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/URLRewriterImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/URLRewriterImpl.java Wed May 10 09:48:00 2006
@@ -18,11 +18,14 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.wsrp4j.commons.consumer.interfaces.urlgenerator.URLGenerator;
import org.apache.wsrp4j.commons.consumer.interfaces.urlgenerator.URLRewriter;
-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.Utility;
/**
* This class implements the URLRewriter-interface providing a method
@@ -31,13 +34,12 @@
* @version $Id$
*/
public class URLRewriterImpl implements URLRewriter {
+
+ private final static Log log = LogFactory.getLog(URLRewriterImpl.class);
private static URLRewriter instance;
private URLGenerator urlGenerator;
-
- // log and trace support
- private Logger logger =
- LogManager.getLogManager().getLogger(this.getClass());
+
public static URLRewriter getInstance() {
if (instance == null) {
@@ -56,14 +58,15 @@
public void setURLGenerator(URLGenerator urlGenerator) {
String MN = "setURLGenerator";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
this.urlGenerator = urlGenerator;
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
}
@@ -113,18 +116,17 @@
// handle namespace rewriting
markup.append(urlGenerator.getNamespacedToken(""));
} else {
- if (logger.isLogging(Logger.ERROR)) {
- logger.text(Logger.ERROR, MN, "no valid rewrite " +
- "expression found in: " + rewriteURL);
+ if (log.isErrorEnabled()) {
+ log.error("No valid rewrite expression found in: " +
+ rewriteURL);
}
}
} else {
- if (logger.isLogging(Logger.ERROR)) {
- String message = "URLGenerator has not been set for class " +
- "URLRewriterImpl. URL-Rewriting not possible.";
- logger.text(Logger.ERROR, MN, message);
+ if (log.isErrorEnabled()) {
+ log.error("URLGenerator has not been set for class " +
+ "URLRewriterImpl. URL-Rewriting not possible.");
}
}
@@ -203,15 +205,15 @@
*/
public String rewriteURLs(String markup) {
final String MN = "rewriteURLs";
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.entry(Logger.TRACE_HIGH, MN);
+
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strEnter(MN));
}
if (this.urlGenerator == null) {
- if (logger.isLogging(Logger.ERROR)) {
- String message = "URLGenerator has not been set for class " +
- "URLRewriterImpl. URL-Rewriting not possible.";
- logger.text(Logger.ERROR, MN, message);
+ if (log.isErrorEnabled()) {
+ log.error("URLGenerator has not been set for class " +
+ "URLRewriterImpl. URL-Rewriting not possible.");
}
return markup;
}
@@ -297,8 +299,8 @@
}
}
- if (logger.isLogging(Logger.TRACE_HIGH)) {
- logger.exit(Logger.TRACE_HIGH, MN);
+ if (log.isDebugEnabled()) {
+ log.debug(Utility.strExit(MN));
}
return resultMarkup.toString();