You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/10/07 15:26:19 UTC
svn commit: r582626 [3/3] - in /struts/struts2/trunk:
apps/mailreader/src/main/java/mailreader2/
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/
core/src/main/java/org/apache/struts2/components/
core/src/main/java/org/apache/struts2/compo...
Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java (original)
+++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java Sun Oct 7 06:26:12 2007
@@ -29,10 +29,9 @@
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionException;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
@@ -45,7 +44,7 @@
public class ShowValidatorAction extends ListValidatorsAction {
private static final long serialVersionUID = 4061534149317835177L;
- private static Log log = LogFactory.getLog(ShowValidatorAction.class);
+ private static Logger LOG = LoggerFactory.getLogger(ShowValidatorAction.class);
Set properties = Collections.EMPTY_SET;
int selected = 0;
@@ -89,7 +88,7 @@
try {
beanInfoFrom = Introspector.getBeanInfo(validator.getClass(), Object.class);
} catch (IntrospectionException e) {
- log.error("An error occurred", e);
+ LOG.error("An error occurred", e);
addActionError("An error occurred while introspecting a validator of type " + validator.getClass().getName());
return ERROR;
}
@@ -112,7 +111,7 @@
properties.add(new PropertyInfo(name, pd.getPropertyType(), value));
}
} catch (Exception e) {
- log.warn("Unable to retrieve properties.", e);
+ LOG.warn("Unable to retrieve properties.", e);
addActionError("Unable to retrieve properties: " + e.toString());
}
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java Sun Oct 7 06:26:12 2007
@@ -31,14 +31,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.components.UIBean;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
@@ -174,7 +174,7 @@
final public static String TEMPLATE = "datetimepicker";
final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat(
"yyyy-MM-dd'T'HH:mm:ss");
- final protected static Log LOG = LogFactory.getLog(DateTimePicker.class);
+ final protected static Logger LOG = LoggerFactory.getLogger(DateTimePicker.class);
protected String iconPath;
protected String formatLength;
@@ -393,7 +393,7 @@
formats.add(displayFormat);
} catch (Exception e) {
// don't use it then (this attribute is used by Dojo, not java code)
- LOG.error(e);
+ LOG.error("Cannot use attribute", e);
}
}
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java Sun Oct 7 06:26:12 2007
@@ -26,8 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.components.Form;
import org.apache.struts2.components.FormButton;
import org.apache.struts2.views.annotations.StrutsTag;
@@ -35,6 +33,8 @@
import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
@@ -126,7 +126,7 @@
@StrutsTag(name="submit", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.SubmitTag", description="Render a submit button")
public class Submit extends FormButton implements RemoteBean {
- private static final Log LOG = LogFactory.getLog(Submit.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Submit.class);
final public static String TEMPLATE = "submit";
Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java Sun Oct 7 06:26:12 2007
@@ -34,18 +34,18 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
*/
public abstract class AbstractUITagTest extends AbstractTagTest {
- private static final Log LOG = LogFactory.getLog(AbstractUITagTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractUITagTest.class);
static final String FREEMARKER_ERROR_EXPECTATION = "Java backtrace for programmers:";
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java Sun Oct 7 06:26:12 2007
@@ -32,7 +32,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRExporter;
+import net.sf.jasperreports.engine.JRExporterParameter;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JasperExportManager;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.export.JRCsvExporter;
import net.sf.jasperreports.engine.export.JRCsvExporterParameter;
import net.sf.jasperreports.engine.export.JRHtmlExporter;
@@ -42,14 +49,14 @@
import net.sf.jasperreports.engine.export.JRXmlExporter;
import net.sf.jasperreports.engine.util.JRLoader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.xwork2.util.TextUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.StrutsResultSupport;
+
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: description -->
@@ -122,7 +129,7 @@
private static final long serialVersionUID = -2523174799621182907L;
- private final static Log LOG = LogFactory.getLog(JasperReportsResult.class);
+ private final static Logger LOG = LoggerFactory.getLogger(JasperReportsResult.class);
protected String dataSource;
Modified: struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java (original)
+++ struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java Sun Oct 7 06:26:12 2007
@@ -20,15 +20,17 @@
*/
package org.apache.struts2.views.jasperreports;
-import org.apache.struts2.util.MakeIterator;
-import com.opensymphony.xwork2.util.ValueStack;
+import java.util.Iterator;
+
import net.sf.jasperreports.engine.JRDataSource;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JRField;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import java.util.Iterator;
+import org.apache.struts2.util.MakeIterator;
+
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Ported to Struts.
@@ -39,7 +41,7 @@
/**
* Logger for this class
*/
- private static Log log = LogFactory.getLog(ValueStackDataSource.class);
+ private static Logger LOG = LoggerFactory.getLogger(ValueStackDataSource.class);
Iterator iterator;
@@ -67,7 +69,7 @@
iterator = MakeIterator.convert(array);
}
} else {
- log.warn("Data source value for data source " + dataSource + " was null");
+ LOG.warn("Data source value for data source " + dataSource + " was null");
}
}
@@ -96,8 +98,8 @@
Object value = valueStack.findValue(expression);
- if (log.isDebugEnabled()) {
- log.debug("field: " + field.getName() + "/" + value);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("field: " + field.getName() + "/" + value);
}
if (MakeIterator.isIterable(value)) {
@@ -125,11 +127,11 @@
if ((iterator != null) && (iterator.hasNext())) {
valueStack.push(iterator.next());
- log.debug("Pushed next value: " + valueStack.findValue("."));
+ LOG.debug("Pushed next value: " + valueStack.findValue("."));
return true;
} else {
- log.debug("No more values");
+ LOG.debug("No more values");
return false;
}
Modified: struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java (original)
+++ struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java Sun Oct 7 06:26:12 2007
@@ -26,10 +26,9 @@
import javax.faces.event.PhaseListener;
import javax.faces.lifecycle.Lifecycle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Provides common lifecycle phase methods needed by interceptors and results.
@@ -39,7 +38,7 @@
private static final String LIFECYCLE_KEY = "lifecycle";
/** Log instance for each class */
- protected Log log;
+ protected Logger log;
/**
* Marker key for the ActionContext to dictate whether to treat the request
@@ -49,7 +48,7 @@
/** Initializes log instance for the instance object */
protected FacesSupport() {
- log = LogFactory.getLog(getClass());
+ log = LoggerFactory.getLogger(getClass());
}
/**
Modified: struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java (original)
+++ struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java Sun Oct 7 06:26:12 2007
@@ -20,15 +20,8 @@
*/
package org.apache.struts2.dispatcher.multipart;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsConstants;
-
-import com.opensymphony.xwork2.inject.Inject;
-
import http.utils.multipartrequest.ServletMultipartRequest;
-import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -37,6 +30,14 @@
import java.util.Enumeration;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.StrutsConstants;
+
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
* Multipart form data request adapter for Jason Pell's multipart utils package.
@@ -44,7 +45,7 @@
*/
public class PellMultiPartRequest implements MultiPartRequest {
- private static final Log LOG = LogFactory.getLog(PellMultiPartRequest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PellMultiPartRequest.class);
private ServletMultipartRequest multi;
private String defaultEncoding;
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java Sun Oct 7 06:26:12 2007
@@ -33,15 +33,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.plexus.PlexusContainer;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
* Creates a plexus container for the application, session, and request
*/
public class PlexusFilter implements Filter {
- private static final Log log = LogFactory.getLog(PlexusObjectFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class);
private static final String CHILD_CONTAINER_NAME = "request";
private static boolean loaded = false;
@@ -80,7 +81,7 @@
}
if (parent.hasChildContainer(CHILD_CONTAINER_NAME)) {
- log.warn("Plexus container (scope: request) alredy exist.");
+ LOG.warn("Plexus container (scope: request) alredy exist.");
child = parent.getChildContainer(CHILD_CONTAINER_NAME);
} else {
child = parent.createChildContainer(CHILD_CONTAINER_NAME, Collections.EMPTY_LIST, Collections.EMPTY_MAP);
@@ -90,7 +91,7 @@
}
PlexusThreadLocal.setPlexusContainer(child);
} catch (Exception e) {
- log.error("Error initializing plexus container (scope: request)", e);
+ LOG.error("Error initializing plexus container (scope: request)", e);
}
chain.doFilter(req, res);
@@ -102,7 +103,7 @@
}
PlexusThreadLocal.setPlexusContainer(null);
} catch (Exception e) {
- log.error("Error disposing plexus container (scope: request)", e);
+ LOG.error("Error disposing plexus container (scope: request)", e);
}
}
}
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java Sun Oct 7 06:26:12 2007
@@ -29,16 +29,17 @@
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
* Manages the Plexus lifecycle for the servlet and session contexts
*/
public class PlexusLifecycleListener implements ServletContextListener, HttpSessionListener {
- private static final Log log = LogFactory.getLog(PlexusObjectFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class);
private static boolean loaded = false;
public static final String KEY = "struts.plexus.container";
@@ -65,7 +66,7 @@
pc.initialize();
pc.start();
} catch (Exception e) {
- log.error("Error initializing plexus container (scope: application)", e);
+ LOG.error("Error initializing plexus container (scope: application)", e);
}
}
@@ -78,7 +79,7 @@
PlexusContainer pc = (PlexusContainer) ctx.getAttribute(KEY);
pc.dispose();
} catch (Exception e) {
- log.error("Error disposing plexus container (scope: application)", e);
+ LOG.error("Error disposing plexus container (scope: application)", e);
}
}
@@ -96,7 +97,7 @@
child.initialize();
child.start();
} catch (Exception e) {
- log.error("Error initializing plexus container (scope: session)", e);
+ LOG.error("Error initializing plexus container (scope: session)", e);
}
}
@@ -109,7 +110,7 @@
PlexusContainer child = (PlexusContainer) session.getAttribute(KEY);
child.dispose();
} catch (Exception e) {
- log.error("Error initializing plexus container (scope: session)", e);
+ LOG.error("Error initializing plexus container (scope: session)", e);
}
}
}
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java Sun Oct 7 06:26:12 2007
@@ -25,8 +25,6 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.plexus.PlexusContainer;
import com.opensymphony.xwork2.Action;
@@ -38,6 +36,8 @@
import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.validator.Validator;
/**
@@ -70,7 +70,7 @@
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
*/
public class PlexusObjectFactory extends ObjectFactory {
- private static final Log log = LogFactory.getLog(PlexusObjectFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class);
private static final String PLEXUS_COMPONENT_TYPE = "plexus.component.type";
@@ -105,7 +105,7 @@
" <listener>\n" +
" <listener-class>org.apache.struts2.plexus.PlexusLifecycleListener</listener-class>\n" +
" </listener>";
- log.fatal(message);
+ LOG.fatal(message);
return;
}
@@ -293,7 +293,7 @@
return pc.lookup(role, roleHint);
}
catch (Exception e) {
- log.debug("Can't load component (" + role + "/" + roleHint + ") with plexus, try now with struts.", e);
+ LOG.debug("Can't load component (" + role + "/" + roleHint + ") with plexus, try now with struts.", e);
Object o = super.buildBean(super.getClassInstance(role), extraContext);
pc.autowire(o);
return o;
Modified: struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java Sun Oct 7 06:26:12 2007
@@ -24,16 +24,17 @@
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
* Utility methods for dealing with Plexus
*/
public class PlexusUtils {
- private static final Log log = LogFactory.getLog(PlexusObjectFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PlexusObjectFactory.class);
/**
* Configures the container with the configuration file
@@ -45,7 +46,7 @@
public static void configure(PlexusContainer pc, String file) throws PlexusConfigurationResourceException {
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(file);
if (is == null) {
- log.info("Could not find " + file + ", skipping");
+ LOG.info("Could not find " + file + ", skipping");
is = new ByteArrayInputStream("<plexus><components></components></plexus>".getBytes());
}
pc.setConfigurationResource(new InputStreamReader(is));
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java Sun Oct 7 06:26:12 2007
@@ -23,13 +23,12 @@
import java.util.AbstractMap;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import javax.portlet.PortletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* A simple implementation of the {@link java.util.Map} interface to handle a collection of request attributes.
@@ -37,7 +36,7 @@
*/
public class PortletRequestMap extends AbstractMap {
- private static final Log LOG = LogFactory.getLog(PortletRequestMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletRequestMap.class);
private Set<Object> entries = null;
private PortletRequest request = null;
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java Sun Oct 7 06:26:12 2007
@@ -29,8 +29,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* A simple implementation of the {@link java.util.Map} interface to handle a collection of portlet session
@@ -40,7 +40,7 @@
*/
public class PortletSessionMap extends AbstractMap {
- private static final Log LOG = LogFactory.getLog(PortletSessionMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletSessionMap.class);
private PortletSession session = null;
private Set<Object> entries = null;
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Sun Oct 7 06:26:12 2007
@@ -41,8 +41,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
import org.apache.struts2.StrutsStatics;
@@ -70,6 +68,8 @@
import com.opensymphony.xwork2.util.FileManager;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.TextUtils;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: javadoc -->
@@ -164,7 +164,7 @@
public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
PortletActionConstants {
- private static final Log LOG = LogFactory.getLog(Jsr168Dispatcher.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Jsr168Dispatcher.class);
private ActionProxyFactory factory = null;
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java Sun Oct 7 06:26:12 2007
@@ -24,8 +24,6 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.interceptor.PrincipalAware;
import org.apache.struts2.portlet.PortletActionConstants;
@@ -33,12 +31,14 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
public class PortletAwareInterceptor extends AbstractInterceptor implements PortletActionConstants, StrutsStatics {
private static final long serialVersionUID = 2476509721059587700L;
- private static final Log LOG = LogFactory.getLog(PortletAwareInterceptor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletAwareInterceptor.class);
/**
* Sets action properties based on the interfaces an action implements. Things like application properties,
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java Sun Oct 7 06:26:12 2007
@@ -25,8 +25,6 @@
import javax.portlet.ActionResponse;
import javax.portlet.RenderRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
@@ -35,10 +33,12 @@
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
public class PortletStateInterceptor extends AbstractInterceptor implements PortletActionConstants {
- private final static Log LOG = LogFactory.getLog(PortletStateInterceptor.class);
+ private final static Logger LOG = LoggerFactory.getLogger(PortletStateInterceptor.class);
private static final long serialVersionUID = 6138452063353911784L;
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Sun Oct 7 06:26:12 2007
@@ -36,8 +36,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.StrutsResultSupport;
import org.apache.struts2.portlet.PortletActionConstants;
@@ -46,6 +44,8 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.TextUtils;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Result type that includes a JSP to render.
@@ -62,7 +62,7 @@
/**
* Logger instance.
*/
- private static final Log LOG = LogFactory.getLog(PortletResult.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletResult.class);
private String contentType = "text/html";
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java Sun Oct 7 06:26:12 2007
@@ -20,13 +20,10 @@
*/
package org.apache.struts2.portlet.result;
-import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -34,8 +31,6 @@
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.PageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.StrutsResultSupport;
@@ -51,6 +46,8 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* <!-- START SNIPPET: description -->
@@ -94,8 +91,7 @@
private static final long serialVersionUID = -8241086555872212274L;
- private static final Log log = LogFactory
- .getLog(PortletVelocityResult.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletVelocityResult.class);
private String defaultEncoding;
private VelocityManager velocityManager;
@@ -208,7 +204,7 @@
// deprecated, we'll oblige :)
writer.flush();
} catch (Exception e) {
- log.error("Unable to render Velocity Template, '" + finalLocation
+ LOG.error("Unable to render Velocity Template, '" + finalLocation
+ "'", e);
throw e;
} finally {
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Sun Oct 7 06:26:12 2007
@@ -34,12 +34,13 @@
import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsException;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.context.PortletActionContext;
+
import com.opensymphony.xwork2.util.TextUtils;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular
@@ -52,7 +53,7 @@
public class PortletUrlHelper {
public static final String ENCODING = "UTF-8";
- private static final Log LOG = LogFactory.getLog(PortletUrlHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortletUrlHelper.class);
/**
* Create a portlet URL with for the specified action and namespace.
Modified: struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java (original)
+++ struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java Sun Oct 7 06:26:12 2007
@@ -26,11 +26,12 @@
import java.io.InputStream;
import java.io.Writer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsException;
import org.apache.struts2.sitegraph.renderers.DOTRenderer;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
* // START SNIPPET: javadocs-intro
* SiteGraph is a tool that renders out GraphViz-generated images depicting your
@@ -48,7 +49,7 @@
*/
public class SiteGraph {
- private static final Log LOG = LogFactory.getLog(SiteGraph.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SiteGraph.class);
private String configDir;
private String views;
Modified: struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java (original)
+++ struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java Sun Oct 7 06:26:12 2007
@@ -27,8 +27,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.config.BeanSelectionProvider;
import org.apache.struts2.config.DefaultPropertiesProvider;
import org.apache.struts2.config.LegacyPropertiesConfigurationProvider;
@@ -42,13 +40,15 @@
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Initializes and retrieves XWork config elements
*/
public class StrutsConfigRetriever {
- private static final Log LOG = LogFactory.getLog(StrutsConfigRetriever.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StrutsConfigRetriever.class);
private static String configDir;
private static String[] views;
private static boolean isXWorkStarted = false;
Modified: struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java (original)
+++ struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java Sun Oct 7 06:26:12 2007
@@ -30,18 +30,18 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsConstants;
import org.apache.struts2.sitegraph.model.Link;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
*/
public abstract class FileBasedView implements View {
private String name;
private String contents;
- private static final Log log = LogFactory.getLog(FileBasedView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileBasedView.class);
public FileBasedView(File file) {
this.name = file.getName();
@@ -103,9 +103,9 @@
return buffer.toString();
} catch (FileNotFoundException e) {
- log.warn("File not found");
+ LOG.warn("File not found");
} catch (IOException e) {
- log.error(e);
+ LOG.error("Cannot read file: "+file, e);
}
return null;
Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java (original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java Sun Oct 7 06:26:12 2007
@@ -28,8 +28,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import com.opensymphony.module.sitemesh.Decorator;
@@ -39,6 +37,8 @@
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import freemarker.template.Configuration;
@@ -106,7 +106,7 @@
* @version $Date$ $Id$
*/
public class FreeMarkerPageFilter extends TemplatePageFilter {
- private static final Log LOG = LogFactory.getLog(FreeMarkerPageFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FreeMarkerPageFilter.class);
private static FreemarkerManager freemarkerManager;
Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java (original)
+++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java Sun Oct 7 06:26:12 2007
@@ -28,9 +28,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.velocity.VelocityManager;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
@@ -40,6 +37,8 @@
import com.opensymphony.module.sitemesh.Page;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
@@ -47,7 +46,7 @@
*
*/
public class VelocityPageFilter extends TemplatePageFilter {
- private static final Log LOG = LogFactory.getLog(VelocityPageFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(VelocityPageFilter.class);
private static VelocityManager velocityManager;
Modified: struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java (original)
+++ struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java Sun Oct 7 06:26:12 2007
@@ -22,8 +22,6 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.StrutsConstants;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
@@ -31,6 +29,8 @@
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.spring.SpringObjectFactory;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
@@ -42,7 +42,7 @@
*
*/
public class StrutsSpringObjectFactory extends SpringObjectFactory {
- private static final Log log = LogFactory.getLog(StrutsSpringObjectFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StrutsSpringObjectFactory.class);
@Inject
public StrutsSpringObjectFactory(
@@ -52,7 +52,7 @@
super();
boolean useClassCache = "true".equals(useClassCacheStr);
- log.info("Initializing Struts-Spring integration...");
+ LOG.info("Initializing Struts-Spring integration...");
ApplicationContext appContext = WebApplicationContextUtils.getWebApplicationContext(servletContext);
if (appContext == null) {
@@ -64,7 +64,7 @@
" <listener>\n" +
" <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>\n" +
" </listener>";
- log.fatal(message);
+ LOG.fatal(message);
return;
}
@@ -84,6 +84,6 @@
this.setUseClassCache(useClassCache);
- log.info("... initialized Struts-Spring integration successfully");
+ LOG.info("... initialized Struts-Spring integration successfully");
}
}
Modified: struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java (original)
+++ struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java Sun Oct 7 06:26:12 2007
@@ -26,11 +26,8 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.validator.ValidatorResources;
import org.apache.struts.Globals;
import org.apache.struts.action.ActionErrors;
@@ -41,8 +38,6 @@
import org.apache.struts.validator.ValidatorPlugIn;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.util.ServletContextAware;
import org.xml.sax.SAXException;
import com.opensymphony.xwork2.ActionContext;
@@ -52,6 +47,8 @@
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.interceptor.ScopedModelDriven;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Calls the validate() method on the ActionForm, if it exists. The errors are handled
@@ -64,7 +61,7 @@
private boolean stopOnFirstError;
private boolean initialized = false;
- private static final Log log = LogFactory.getLog(ActionFormValidationInterceptor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionFormValidationInterceptor.class);
/**
* Delimitter for Validator resources.
@@ -163,8 +160,8 @@
while (st.hasMoreTokens()) {
String validatorRules = st.nextToken().trim();
- if (log.isInfoEnabled()) {
- log.info("Loading validation rules file from '"
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Loading validation rules file from '"
+ validatorRules + "'");
}
@@ -197,7 +194,7 @@
resources = new ValidatorResources(urlArray);
} catch (SAXException sex) {
- log.error("Skipping all validation", sex);
+ LOG.error("Skipping all validation", sex);
throw new StrutsException("Skipping all validation because the validation files cannot be loaded", sex);
}
return resources;
Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java Sun Oct 7 06:26:12 2007
@@ -20,16 +20,18 @@
*/
package org.apache.struts2.tiles;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.factory.TilesContainerFactory;
import org.apache.tiles.web.startup.TilesListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import javax.servlet.ServletContext;
-import java.util.Map;
-import java.util.HashMap;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Listener used to automatically inject ServletContext
@@ -44,8 +46,7 @@
*/
public class StrutsTilesListener extends TilesListener {
- private static final Log LOG =
- LogFactory.getLog(StrutsTilesListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StrutsTilesListener.class);
private static final Map<String, String> INIT;
Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java?rev=582626&r1=582625&r2=582626&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java Sun Oct 7 06:26:12 2007
@@ -20,20 +20,21 @@
*/
package org.apache.struts2.tiles;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Container;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.views.freemarker.FreemarkerResult;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
* Default implementation of TilesUtil.
@@ -48,8 +49,7 @@
*/
public class StrutsTilesRequestContext extends TilesRequestContextWrapper {
- private static final Log LOG =
- LogFactory.getLog(StrutsTilesRequestContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StrutsTilesRequestContext.class);
/**