You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/01/27 17:34:16 UTC
svn commit: r126622 - /lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java /lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java
Author: andreas
Date: Thu Jan 27 08:34:14 2005
New Revision: 126622
URL: http://svn.apache.org/viewcvs?view=rev&rev=126622
Log:
switch to AbstractLogEnabled
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java?view=diff&rev=126622&p1=lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java&r1=126621&p2=lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java&r2=126622
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java Thu Jan 27 08:34:14 2005
@@ -32,15 +32,12 @@
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteManager;
import org.apache.lenya.cms.site.tree.TreeSiteManager;
-import org.apache.log4j.Category;
/**
* A publication.
*/
public abstract class AbstractPublication extends AbstractLogEnabled implements Publication {
- private static Category log = Category.getInstance(AbstractPublication.class);
-
private static final String[] areas = { AUTHORING_AREA, STAGING_AREA, LIVE_AREA, ADMIN_AREA,
ARCHIVE_AREA, TRASH_AREA, INFO_AREA_PREFIX + AUTHORING_AREA,
INFO_AREA_PREFIX + STAGING_AREA, INFO_AREA_PREFIX + LIVE_AREA,
@@ -139,8 +136,8 @@
Object key = getProxyKey(area, Boolean.valueOf(ssl).booleanValue());
this.areaSsl2proxy.put(key, proxy);
- if (log.isDebugEnabled()) {
- log.debug("Adding proxy: [" + proxy + "] for area=[" + area + "] SSL=[" + ssl
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Adding proxy: [" + proxy + "] for area=[" + area + "] SSL=[" + ssl
+ "]");
}
}
@@ -148,7 +145,6 @@
} catch (PublicationException e) {
throw e;
} catch (Exception e) {
- log.error(e);
throw new PublicationException("Problem with config file: "
+ configFile.getAbsolutePath(), e);
}
@@ -389,9 +385,9 @@
Object key = getProxyKey(document.getArea(), isSslProtected);
Proxy proxy = (Proxy) this.areaSsl2proxy.get(key);
- if (log.isDebugEnabled()) {
- log.debug("Resolving proxy for [" + document + "] SSL=[" + isSslProtected + "]");
- log.debug("Resolved proxy: [" + proxy + "]");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Resolving proxy for [" + document + "] SSL=[" + isSslProtected + "]");
+ getLogger().debug("Resolved proxy: [" + proxy + "]");
}
return proxy;
Modified: lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java?view=diff&rev=126622&p1=lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java&r1=126621&p2=lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java&r2=126622
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/util/ServletHelper.java Thu Jan 27 08:34:14 2005
@@ -24,15 +24,12 @@
import java.util.Map;
import org.apache.cocoon.environment.Request;
-import org.apache.log4j.Category;
/**
* Servlet utility class.
*/
public final class ServletHelper {
- private static Category log = Category.getInstance(ServletHelper.class);
-
/**
* Ctor.
*/
@@ -65,9 +62,6 @@
if (url.length() > 0 && !url.startsWith("/")) {
url = "/" + url;
}
-
- log.debug(" Context prefix: [" + context + "]");
- log.debug(" Webapp URL: [" + url + "]");
return url;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org