You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/08/31 10:05:57 UTC
cvs commit: jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser DataStreamParser.java DefaultCookieParser.java DefaultParameterParser.java
jvanzyl 01/08/31 01:05:57
Modified: src/services/java/org/apache/fulcrum/intake Intake.java
src/services/java/org/apache/fulcrum/intake/validator
IntegerValidator.java NumberKeyValidator.java
NumberValidator.java
src/services/java/org/apache/fulcrum/security/impl/db
DBSecurityService.java
src/services/java/org/apache/fulcrum/xmlrpc/util
FileTransfer.java
src/util/java/org/apache/fulcrum/util/parser
DataStreamParser.java DefaultCookieParser.java
DefaultParameterParser.java
Log:
- classes that were using the Log wrapper are now using a log4j
Category.
- the getCategory() method has been left in the service interfaces
for all the services that rely on the BaseServiceBroker for a logging
category. this method will remain in place until the
Category c = Category.getInstance(getClass().getName())
pattern is employed in all the service code so that arbitrary
granularity WRT to logging will be possible.
Revision Changes Path
1.4 +9 -4 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/Intake.java
Index: Intake.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/Intake.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Intake.java 2001/08/30 05:23:57 1.3
+++ Intake.java 2001/08/31 08:05:56 1.4
@@ -60,18 +60,18 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.pool.Recyclable;
import org.apache.torque.om.Retrievable;
import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.intake.TurbineIntake;
+import org.apache.log4j.Category;
/**
* The main class through which Intake is accessed.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: Intake.java,v 1.3 2001/08/30 05:23:57 jmcnally Exp $
+ * @version $Id: Intake.java,v 1.4 2001/08/31 08:05:56 jvanzyl Exp $
*/
public class Intake
implements Recyclable
@@ -87,6 +87,11 @@
/** The cache of PullHelpers. **/
private Map pullMap;
+ /**
+ * Log4j category
+ */
+ Category category = Category.getInstance(getClass().getName());
+
public Intake()
{
String[] groupNames = TurbineIntake.getGroupNames();
@@ -141,7 +146,7 @@
}
catch(Exception e)
{
- Log.error(e);
+ category.error(e);
}
}
}
@@ -272,7 +277,7 @@
}
catch(Exception e)
{
- Log.error(e);
+ category.error(e);
}
return null;
1.2 +1 -2 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/validator/IntegerValidator.java
Index: IntegerValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/validator/IntegerValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntegerValidator.java 2001/08/23 07:20:21 1.1
+++ IntegerValidator.java 2001/08/31 08:05:56 1.2
@@ -55,7 +55,6 @@
*/
import java.util.Map;
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.ServiceException;
/**
@@ -73,7 +72,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: IntegerValidator.java,v 1.1 2001/08/23 07:20:21 jmcnally Exp $
+ * @version $Id: IntegerValidator.java,v 1.2 2001/08/31 08:05:56 jvanzyl Exp $
*/
public class IntegerValidator
extends NumberValidator
1.2 +1 -2 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/validator/NumberKeyValidator.java
Index: NumberKeyValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/validator/NumberKeyValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberKeyValidator.java 2001/08/23 07:20:21 1.1
+++ NumberKeyValidator.java 2001/08/31 08:05:56 1.2
@@ -57,7 +57,6 @@
import java.math.BigDecimal;
import java.util.Map;
import org.apache.torque.om.NumberKey;
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.ServiceException;
/**
@@ -75,7 +74,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberKeyValidator.java,v 1.1 2001/08/23 07:20:21 jmcnally Exp $
+ * @version $Id: NumberKeyValidator.java,v 1.2 2001/08/31 08:05:56 jvanzyl Exp $
*/
public class NumberKeyValidator
extends NumberValidator
1.2 +1 -2 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/validator/NumberValidator.java
Index: NumberValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/validator/NumberValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberValidator.java 2001/08/23 07:20:21 1.1
+++ NumberValidator.java 2001/08/31 08:05:56 1.2
@@ -57,7 +57,6 @@
import java.math.BigDecimal;
import java.util.Map;
import org.apache.torque.om.NumberKey;
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.ServiceException;
/**
@@ -75,7 +74,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberValidator.java,v 1.1 2001/08/23 07:20:21 jmcnally Exp $
+ * @version $Id: NumberValidator.java,v 1.2 2001/08/31 08:05:56 jvanzyl Exp $
*/
public class NumberValidator
extends DefaultValidator
1.3 +9 -4 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/DBSecurityService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DBSecurityService.java 2001/08/02 05:31:12 1.2
+++ DBSecurityService.java 2001/08/31 08:05:56 1.3
@@ -80,7 +80,6 @@
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.security.BaseSecurityService;
import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.fulcrum.Log;
import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.util.AccessControlList;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -89,12 +88,13 @@
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
+import org.apache.log4j.Category;
/**
* An implementation of SecurityService that uses a database as backend.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: DBSecurityService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
+ * @version $Id: DBSecurityService.java,v 1.3 2001/08/31 08:05:56 jvanzyl Exp $
*/
public class DBSecurityService
extends BaseSecurityService
@@ -112,6 +112,11 @@
public static final String USER_PEER_CLASS_DEFAULT =
"org.apache.turbine.om.security.TurbineUserPeer";
+ /**
+ * Log4j category
+ */
+ Category category = Category.getInstance(getClass().getName());
+
/*-----------------------------------------------------------------------
Creation of AccessControlLists
-----------------------------------------------------------------------*/
@@ -938,8 +943,8 @@
}
catch(Exception e)
{
- Log.error("Failed to delete a Group");
- Log.error(e);
+ category.error("Failed to delete a Group");
+ category.error(e);
throw new DataBackendException("removeGroup(Group) failed", e);
}
finally
1.3 +14 -10 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/xmlrpc/util/FileTransfer.java
Index: FileTransfer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/xmlrpc/util/FileTransfer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileTransfer.java 2001/08/10 11:46:25 1.2
+++ FileTransfer.java 2001/08/31 08:05:57 1.3
@@ -55,21 +55,25 @@
*/
import java.util.Vector;
-
import java.net.URL;
-
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.xmlrpc.TurbineXmlRpc;
+import org.apache.log4j.Category;
/**
* Test class for FileHandler.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: FileTransfer.java,v 1.2 2001/08/10 11:46:25 knielsen Exp $
+ * @version $Id: FileTransfer.java,v 1.3 2001/08/31 08:05:57 jvanzyl Exp $
*/
public class FileTransfer
{
/**
+ * Log4j category
+ */
+ protected static Category category =
+ Category.getInstance(FileTransfer.class.getName());
+
+ /**
* Method to allow a client to send a file to a server.
*
* @param serverURL
@@ -113,7 +117,7 @@
}
catch (Exception e)
{
- Log.error("Error sending file to server:", e);
+ category.error("Error sending file to server:", e);
throw new Exception(e.toString());
}
}
@@ -171,7 +175,7 @@
}
catch (Exception e)
{
- Log.error("Error sending file to server:", e);
+ category.error("Error sending file to server:", e);
throw new Exception(e.toString());
}
}
@@ -221,7 +225,7 @@
}
catch (Exception e)
{
- Log.error("Error getting file from server:", e);
+ category.error("Error getting file from server:", e);
throw new Exception(e.toString());
}
}
@@ -280,7 +284,7 @@
}
catch (Exception e)
{
- Log.error("Error getting file from server:", e);
+ category.error("Error getting file from server:", e);
throw new Exception(e.toString());
}
}
@@ -317,7 +321,7 @@
}
catch (Exception e)
{
- Log.error("Error removing file from server:", e);
+ category.error("Error removing file from server:", e);
throw new Exception(e.toString());
}
}
@@ -362,7 +366,7 @@
}
catch (Exception e)
{
- Log.error("Error removing file from server:", e);
+ category.error("Error removing file from server:", e);
throw new Exception(e.toString());
}
}
1.2 +10 -5 jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/DataStreamParser.java
Index: DataStreamParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/DataStreamParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataStreamParser.java 2001/08/20 00:15:20 1.1
+++ DataStreamParser.java 2001/08/31 08:05:57 1.2
@@ -63,7 +63,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.fulcrum.Log;
+import org.apache.log4j.Category;
/**
* DataStreamParser is used to parse a stream with a fixed format and
@@ -85,7 +85,7 @@
* </pre>
*
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
- * @version $Id: DataStreamParser.java,v 1.1 2001/08/20 00:15:20 mpoeschl Exp $
+ * @version $Id: DataStreamParser.java,v 1.2 2001/08/31 08:05:57 jvanzyl Exp $
*/
public abstract class DataStreamParser
implements Iterator
@@ -121,6 +121,11 @@
private String characterEncoding;
/**
+ * Log4j category
+ */
+ Category category = Category.getInstance(getClass().getName());
+
+ /**
* Create a new DataStreamParser instance. Requires a Reader to read the
* comma-separated values from, a list of column names and a
* character encoding.
@@ -247,7 +252,7 @@
String colval = tokenizer.sval;
if (DEBUG)
{
- Log.debug("DataStreamParser.nextRow(): " +
+ category.debug("DataStreamParser.nextRow(): " +
colname + '=' + colval);
}
lineValues.add(colname, colval);
@@ -273,7 +278,7 @@
}
catch (IOException e)
{
- Log.error("IOException in CSVParser.hasNext", e);
+ category.error("IOException in CSVParser.hasNext", e);
}
return hasNext;
@@ -297,7 +302,7 @@
}
catch (IOException e)
{
- Log.error("IOException in CSVParser.next", e);
+ category.error("IOException in CSVParser.next", e);
throw new NoSuchElementException();
}
1.2 +10 -5 jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/DefaultCookieParser.java
Index: DefaultCookieParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/DefaultCookieParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultCookieParser.java 2001/08/20 00:15:20 1.1
+++ DefaultCookieParser.java 2001/08/31 08:05:57 1.2
@@ -57,8 +57,8 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.pool.Recyclable;
+import org.apache.log4j.Category;
/**
* CookieParser is used to get and set values of Cookies on the Client
@@ -85,7 +85,7 @@
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
- * @version $Id: DefaultCookieParser.java,v 1.1 2001/08/20 00:15:20 mpoeschl Exp $
+ * @version $Id: DefaultCookieParser.java,v 1.2 2001/08/31 08:05:57 jvanzyl Exp $
*/
public class DefaultCookieParser
extends BaseValueParser
@@ -97,7 +97,12 @@
*/
private HttpServletRequest request;
private HttpServletResponse response;
-
+
+ /**
+ * Log4j category
+ */
+ Category category = Category.getInstance(getClass().getName());
+
/**
* Constructs a new CookieParser.
*/
@@ -141,13 +146,13 @@
Cookie[] cookies = request.getCookies();
- Log.info ("Number of Cookies "+cookies.length);
+ category.info ("Number of Cookies "+cookies.length);
for (int i=0; i<cookies.length; i++)
{
String name = convert (cookies[i].getName());
String value = cookies[i].getValue();
- Log.info ("Adding "+name+"="+value);
+ category.info ("Adding "+name+"="+value);
add (name,value);
}
1.3 +8 -3 jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/DefaultParameterParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultParameterParser.java 2001/08/30 05:23:57 1.2
+++ DefaultParameterParser.java 2001/08/31 08:05:57 1.3
@@ -60,11 +60,11 @@
import java.util.Enumeration;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
-import org.apache.fulcrum.Log;
import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.pool.Recyclable;
import org.apache.fulcrum.upload.FileItem;
import org.apache.fulcrum.upload.TurbineUpload;
+import org.apache.log4j.Category;
/**
* DefaultParameterParser is a utility object to handle parsing and
@@ -88,7 +88,7 @@
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
- * @version $Id: DefaultParameterParser.java,v 1.2 2001/08/30 05:23:57 jmcnally Exp $
+ * @version $Id: DefaultParameterParser.java,v 1.3 2001/08/31 08:05:57 jvanzyl Exp $
*/
public class DefaultParameterParser
extends BaseValueParser
@@ -106,6 +106,11 @@
private byte[] uploadData = null;
/**
+ * Log4j category
+ */
+ Category category = Category.getInstance(getClass().getName());
+
+ /**
* Create a new empty instance of ParameterParser. Uses the
* default character encoding (US-ASCII).
*
@@ -203,7 +208,7 @@
}
catch(ServiceException e)
{
- Log.error(new ServiceException("File upload failed", e));
+ category.error(new ServiceException("File upload failed", e));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org