craigmcc 02/03/09 14:26:35
Modified: src/share/org/apache/struts/action ActionServlet.java
RequestProcessor.java
src/share/org/apache/struts/actions DispatchAction.java
src/share/org/apache/struts/upload
DiskMultipartRequestHandler.java
src/share/org/apache/struts/util GenericDataSource.java
MessageResources.java MessageResourcesFactory.java
RequestUtils.java
Log:
Switch to the non-deprecated log factory mechanism from commosn logging 1.0.
Revision Changes Path
1.95 +12 -10
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ActionServlet.java 4 Mar 2002 05:38:23 -0000 1.94
+++ ActionServlet.java 9 Mar 2002 22:26:35 -0000 1.95
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.94
2002/03/04 05:38:23 martinc Exp $
- * $Revision: 1.94 $
- * $Date: 2002/03/04 05:38:23 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.95
2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.95 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -87,7 +87,7 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.config.ActionConfig;
import org.apache.struts.config.ApplicationConfig;
import org.apache.struts.config.ConfigRuleSet;
@@ -269,7 +269,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.94 $ $Date: 2002/03/04 05:38:23 $
+ * @version $Revision: 1.95 $ $Date: 2002/03/09 22:26:35 $
*/
public class ActionServlet
@@ -278,11 +278,7 @@
// ----------------------------------------------------- Instance Variables
- /**
- * Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
-
+
/**
* The context-relative path to our configuration resource for the
* default sub-application.
@@ -329,6 +325,12 @@
protected String internalName = "org.apache.struts.action.ActionResources";
+ /**
+ * Commons Logging instance.
+ */
+ protected Log log = LogFactory.getLog(this.getClass());
+
+
/**
* The <code>RequestProcessor</code> instance we will use to process
* all incoming requests.
1.5 +11 -9
jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java
Index: RequestProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestProcessor.java 26 Feb 2002 03:38:56 -0000 1.4
+++ RequestProcessor.java 9 Mar 2002 22:26:35 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java,v
1.4 2002/02/26 03:38:56 dwinterfeldt Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/26 03:38:56 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java,v
1.5 2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
import javax.servlet.http.HttpSession;
import org.apache.commons.collections.FastHashMap;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.config.ActionConfig;
import org.apache.struts.config.ApplicationConfig;
import org.apache.struts.config.ControllerConfig;
@@ -94,7 +94,7 @@
* interested in changing.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2002/02/26 03:38:56 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/09 22:26:35 $
* @since Struts 1.1
*/
@@ -122,10 +122,6 @@
// ----------------------------------------------------- Instance Variables
- /**
- * Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
/**
* The set of Action instances that have been created and initialized,
@@ -140,6 +136,12 @@
protected ApplicationConfig appConfig = null;
+ /**
+ * Commons Logging instance.
+ */
+ protected Log log = LogFactory.getLog(this.getClass());
+
+
/**
* The controller servlet we are associated with.
*/
1.5 +11 -9
jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java
Index: DispatchAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DispatchAction.java 26 Feb 2002 03:38:57 -0000 1.4
+++ DispatchAction.java 9 Mar 2002 22:26:35 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java,v 1.4
2002/02/26 03:38:57 dwinterfeldt Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/26 03:38:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java,v 1.5
2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -130,7 +130,7 @@
* @author Niall Pemberton <[EMAIL PROTECTED]>
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.4 $ $Date: 2002/02/26 03:38:57 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/09 22:26:35 $
*/
public abstract class DispatchAction extends Action {
@@ -138,15 +138,17 @@
// ----------------------------------------------------- Instance Variables
- /**
- * Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
/**
* The Class instance of this <code>DispatchAction</code> class.
*/
protected Class clazz = this.getClass();
+
+
+ /**
+ * Commons Logging instance.
+ */
+ protected Log log = LogFactory.getLog(this.getClass());
/**
1.14 +3 -3
jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
Index: DiskMultipartRequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DiskMultipartRequestHandler.java 6 Mar 2002 19:39:08 -0000 1.13
+++ DiskMultipartRequestHandler.java 9 Mar 2002 22:26:35 -0000 1.14
@@ -11,7 +11,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.ActionMapping;
@@ -27,8 +27,8 @@
/**
* Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
+ */
+ protected Log log = LogFactory.getLog(this.getClass());
/**
* The ActionServlet instance used for this class
1.10 +11 -10
jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java
Index: GenericDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GenericDataSource.java 26 Feb 2002 05:21:07 -0000 1.9
+++ GenericDataSource.java 9 Mar 2002 22:26:35 -0000 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v 1.9
2002/02/26 05:21:07 dwinterfeldt Exp $
- * $Revision: 1.9 $
- * $Date: 2002/02/26 05:21:07 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v
1.10 2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
import java.util.Properties;
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
@@ -180,7 +180,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.9 $ $Date: 2002/02/26 05:21:07 $
+ * @version $Revision: 1.10 $ $Date: 2002/03/09 22:26:35 $
*/
public class GenericDataSource implements DataSource {
@@ -188,11 +188,6 @@
// ----------------------------------------------------- Instance Constants
- /**
- * Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
-
private static final String SQLEXCEPTION_GETCONNECTION =
"getConnection(String username, String password) Method not supported. Use
getConnection() instead.";
@@ -219,6 +214,12 @@
* The JDBC driver that we use as a connection factory.
*/
protected Driver driver = null;
+
+
+ /**
+ * Commons Logging instance.
+ */
+ protected Log log = LogFactory.getLog(this.getClass());
/**
1.13 +8 -7
jakarta-struts/src/share/org/apache/struts/util/MessageResources.java
Index: MessageResources.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResources.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MessageResources.java 26 Feb 2002 03:38:57 -0000 1.12
+++ MessageResources.java 9 Mar 2002 22:26:35 -0000 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResources.java,v 1.12
2002/02/26 03:38:57 dwinterfeldt Exp $
- * $Revision: 1.12 $
- * $Date: 2002/02/26 03:38:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResources.java,v 1.13
2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import java.util.HashMap;
import java.util.Locale;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
@@ -91,7 +91,7 @@
* application server environments.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12 $ $Date: 2002/02/26 03:38:57 $
+ * @version $Revision: 1.13 $ $Date: 2002/03/09 22:26:35 $
*/
public abstract class MessageResources implements Serializable {
@@ -101,8 +101,9 @@
/**
* Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
+ */
+ protected Log log = LogFactory.getLog(this.getClass());
+
/**
* The configuration parameter used to initialize this MessageResources.
1.6 +11 -9
jakarta-struts/src/share/org/apache/struts/util/MessageResourcesFactory.java
Index: MessageResourcesFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResourcesFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MessageResourcesFactory.java 26 Feb 2002 03:38:57 -0000 1.5
+++ MessageResourcesFactory.java 9 Mar 2002 22:26:35 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResourcesFactory.java,v
1.5 2002/02/26 03:38:57 dwinterfeldt Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/26 03:38:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResourcesFactory.java,v
1.6 2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -65,7 +65,7 @@
import java.io.Serializable;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
@@ -83,7 +83,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/02/26 03:38:57 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/09 22:26:35 $
*/
public abstract class MessageResourcesFactory implements Serializable {
@@ -121,16 +121,18 @@
// ------------------------------------------------------ Static Properties
- /**
- * Commons Logging instance.
- */
- private static Log LOG =
LogSource.getInstance(MessageResourcesFactory.class.getName());
/**
* The Java class to be used for
* <code>MessageResourcesFactory</code> instances.
*/
protected static transient Class clazz = null;
+
+
+ /**
+ * Commons Logging instance.
+ */
+ private static Log LOG = LogFactory.getLog(MessageResourcesFactory.class);
/**
1.32 +9 -7
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- RequestUtils.java 6 Mar 2002 19:39:08 -0000 1.31
+++ RequestUtils.java 9 Mar 2002 22:26:35 -0000 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v 1.31
2002/03/06 19:39:08 mschachter Exp $
- * $Revision: 1.31 $
- * $Date: 2002/03/06 19:39:08 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v 1.32
2002/03/09 22:26:35 craigmcc Exp $
+ * $Revision: 1.32 $
+ * $Date: 2002/03/09 22:26:35 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -110,7 +110,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.31 $ $Date: 2002/03/06 19:39:08 $
+ * @version $Revision: 1.32 $ $Date: 2002/03/09 22:26:35 $
*/
public class RequestUtils {
@@ -118,10 +118,12 @@
// ------------------------------------------------------- Static Variables
+
/**
* Commons Logging instance.
- */
- private static Log LOG = LogSource.getInstance(RequestUtils.class.getName());
+ */
+ protected static Log LOG = LogFactory.getLog(RequestUtils.class);
+
/**
* The default Locale for our server.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
