craigmcc 2002/06/29 20:28:47
Modified: src/share/org/apache/struts/util StrutsValidator.java
src/share/org/apache/struts/validator
DynaValidatorActionForm.java DynaValidatorForm.java
ValidatorActionForm.java ValidatorForm.java
ValidatorPlugIn.java
Log:
Replace uses of deprecated LogSource with LogFactory (from commons-logging
1.0 final), and make the Log instances per-class static variables.
PR: Bugzilla #10278
Submitted by: Ivar <ivar.kanters at gend.nl>
Revision Changes Path
1.4 +3 -3
jakarta-struts/src/share/org/apache/struts/util/StrutsValidator.java
Index: StrutsValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/StrutsValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StrutsValidator.java 25 Jun 2002 18:27:52 -0000 1.3
+++ StrutsValidator.java 30 Jun 2002 03:28:46 -0000 1.4
@@ -61,7 +61,7 @@
import javax.servlet.ServletContext;
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.commons.validator.Field;
import org.apache.commons.validator.GenericTypeValidator;
import org.apache.commons.validator.GenericValidator;
@@ -81,8 +81,8 @@
/**
* Commons Logging instance.
- */
- private static Log LOG = LogSource.getInstance(StrutsValidator.class.getName());
+ */
+ private static Log LOG = LogFactory.getLog(StrutsValidator.class);
/**
* <p>Checks if the field isn't null and length of the field is greater than
zero not
1.5 +7 -7
jakarta-struts/src/share/org/apache/struts/validator/DynaValidatorActionForm.java
Index: DynaValidatorActionForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/DynaValidatorActionForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynaValidatorActionForm.java 24 Jun 2002 16:56:56 -0000 1.4
+++ DynaValidatorActionForm.java 30 Jun 2002 03:28:47 -0000 1.5
@@ -67,7 +67,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.commons.validator.Validator;
import org.apache.commons.validator.ValidatorException;
import org.apache.commons.validator.ValidatorResources;
@@ -96,8 +96,8 @@
/**
* Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
+ */
+ private static Log log = LogFactory.getLog(DynaValidatorActionForm.class);
/**
* Validate the properties that have been set from this HTTP request,
1.4 +7 -7
jakarta-struts/src/share/org/apache/struts/validator/DynaValidatorForm.java
Index: DynaValidatorForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/DynaValidatorForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynaValidatorForm.java 24 Jun 2002 16:56:56 -0000 1.3
+++ DynaValidatorForm.java 30 Jun 2002 03:28:47 -0000 1.4
@@ -68,7 +68,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.commons.validator.Validator;
import org.apache.commons.validator.ValidatorException;
import org.apache.commons.validator.ValidatorResources;
@@ -99,8 +99,8 @@
/**
* Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
+ */
+ private static Log log = LogFactory.getLog(DynaValidatorForm.class);
/**
* The results returned from the validation performed
1.4 +7 -7
jakarta-struts/src/share/org/apache/struts/validator/ValidatorActionForm.java
Index: ValidatorActionForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/ValidatorActionForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ValidatorActionForm.java 24 Jun 2002 16:56:56 -0000 1.3
+++ ValidatorActionForm.java 30 Jun 2002 03:28:47 -0000 1.4
@@ -66,7 +66,7 @@
import javax.servlet.ServletContext;
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.commons.validator.Validator;
import org.apache.commons.validator.ValidatorException;
import org.apache.commons.validator.ValidatorResources;
@@ -95,8 +95,8 @@
/**
* Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
+ */
+ private static Log log = LogFactory.getLog(ValidatorActionForm.class);
/**
* Validate the properties that have been set from this HTTP request,
1.5 +7 -7
jakarta-struts/src/share/org/apache/struts/validator/ValidatorForm.java
Index: ValidatorForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/ValidatorForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValidatorForm.java 25 Jun 2002 18:28:28 -0000 1.4
+++ ValidatorForm.java 30 Jun 2002 03:28:47 -0000 1.5
@@ -67,7 +67,7 @@
import javax.servlet.ServletContext;
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.commons.validator.Validator;
import org.apache.commons.validator.ValidatorException;
import org.apache.commons.validator.ValidatorResources;
@@ -97,8 +97,8 @@
/**
* Commons Logging instance.
- */
- private Log log = LogSource.getInstance(this.getClass().getName());
+ */
+ private static Log log = LogFactory.getLog(ValidatorForm.class);
/**
* The results returned from the validation performed
1.5 +6 -6
jakarta-struts/src/share/org/apache/struts/validator/ValidatorPlugIn.java
Index: ValidatorPlugIn.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/ValidatorPlugIn.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValidatorPlugIn.java 24 Jun 2002 16:56:56 -0000 1.4
+++ ValidatorPlugIn.java 30 Jun 2002 03:28:47 -0000 1.5
@@ -75,7 +75,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.commons.validator.ValidatorResources;
import org.apache.commons.validator.ValidatorResourcesInitializer;
import org.apache.struts.action.ActionServlet;
@@ -96,7 +96,7 @@
/**
* Commons Logging instance.
*/
- private Log log = LogSource.getInstance(this.getClass().getName());
+ private static Log log = LogFactory.getLog(ValidatorPlugIn.class);
/**
* The application configuration for our owning sub-application.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
