You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by pg...@apache.org on 2002/08/08 01:30:17 UTC
cvs commit: jakarta-james/src/java/org/apache/james/core AvalonMailStore.java AvalonUsersStore.java MimeMessageWrapper.java
pgoldstein 2002/08/07 16:30:17
Modified: src/java/org/apache/james/core AvalonMailStore.java
AvalonUsersStore.java MimeMessageWrapper.java
Log:
Part of the String=>StringBuffer changes. Includes some additional
commenting, formatting fixes, and wrapping of logging calls in log
level checks. Also converted equalsIgnoreCase paradigm as discussed on
mailing list. Locale issue for both toUpperCase() and toLowerCase() was
addressed as well.
Revision Changes Path
1.12 +56 -14 jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java
Index: AvalonMailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AvalonMailStore.java 3 Jun 2002 16:07:05 -0000 1.11
+++ AvalonMailStore.java 7 Aug 2002 23:30:16 -0000 1.12
@@ -96,15 +96,20 @@
getLogger().error("Cannot open private SpoolRepository");
throw e;
}
- getLogger().info("SpoolRepository inboundSpool opened: "
- + inboundSpool.hashCode());
- getLogger().info("James MailStore ...init");
+ if (getLogger().isInfoEnabled()) {
+ getLogger().info("SpoolRepository inboundSpool opened: "
+ + inboundSpool.hashCode());
+ getLogger().info("James MailStore ...init");
+ }
}
public synchronized void registerRepository(Configuration repConf)
throws ConfigurationException {
String className = repConf.getAttribute("class");
- getLogger().info("Registering Repository " + className);
+ boolean infoEnabled = getLogger().isInfoEnabled();
+ if (infoEnabled) {
+ getLogger().info("Registering Repository " + className);
+ }
Configuration[] protocols
= repConf.getChild("protocols").getChildren("protocol");
Configuration[] types = repConf.getChild("types").getChildren("type");
@@ -115,9 +120,17 @@
for ( int j = 0; j < types.length; j++ )
{
String type = types[j].getValue();
- String key = protocol + type ;
+ String key = protocol + type ;
classes.put(key, className);
- getLogger().info("Registered class: " + key+"->"+className);
+ if (infoEnabled) {
+ StringBuffer logBuffer =
+ new StringBuffer(128)
+ .append("Registered class: ")
+ .append(key)
+ .append("->")
+ .append(className);
+ getLogger().info(logBuffer.toString());
+ }
}
}
@@ -162,15 +175,32 @@
String type = repConf.getAttribute("type");
String repID = destination + type;
MailRepository reply = (MailRepository) repositories.get(repID);
+ StringBuffer logBuffer = null;
if (reply != null) {
- getLogger().debug("obtained repository: " + repID
- + "," + reply.getClass());
+ if (getLogger().isDebugEnabled()) {
+ logBuffer =
+ new StringBuffer(128)
+ .append("obtained repository: ")
+ .append(repID)
+ .append(",")
+ .append(reply.getClass());
+ getLogger().debug(logBuffer.toString());
+ }
return (Component)reply;
} else {
String repClass = (String) classes.get( protocol + type );
- getLogger().debug( "Need instance of " + repClass +
- " to handle: " + protocol + "," + type );
+ if (getLogger().isDebugEnabled()) {
+ logBuffer =
+ new StringBuffer(128)
+ .append("obtained repository: ")
+ .append(repClass)
+ .append(" to handle: ")
+ .append(protocol)
+ .append(",")
+ .append(type);
+ getLogger().debug( logBuffer.toString() );
+ }
// If default values have been set, create a new repository
// configuration element using the default values
@@ -206,11 +236,21 @@
((Initializable) reply).initialize();
}
repositories.put(repID, reply);
- getLogger().info("added repository: "+repID+"->"+repClass);
+ if (getLogger().isInfoEnabled()) {
+ logBuffer =
+ new StringBuffer(128)
+ .append("added repository: ")
+ .append(repID)
+ .append("->")
+ .append(repClass);
+ getLogger().info(logBuffer.toString());
+ }
return (Component)reply;
} catch (Exception e) {
- getLogger().warn( "Exception while creating repository:" +
- e.getMessage(), e );
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn( "Exception while creating repository:" +
+ e.getMessage(), e );
+ }
e.printStackTrace();
throw new
ComponentException("Cannot find or init repository",
@@ -239,7 +279,9 @@
try {
comp = select(hint);
} catch(ComponentException ex) {
- getLogger().error("Exception AvalonMailStore.hasComponent-"+ex.toString());
+ if (getLogger().isErrorEnabled()) {
+ getLogger().error("Exception AvalonMailStore.hasComponent-" + ex.toString());
+ }
}
return (comp != null);
}
1.8 +12 -3 jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java
Index: AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AvalonUsersStore.java 3 Jun 2002 16:07:06 -0000 1.7
+++ AvalonUsersStore.java 7 Aug 2002 23:30:16 -0000 1.8
@@ -67,7 +67,9 @@
String repName = repConf.getAttribute("name");
String repClass = repConf.getAttribute("class");
- getLogger().debug("Starting " + repClass);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Starting " + repClass);
+ }
UsersRepository rep = (UsersRepository) Class.forName(repClass).newInstance();
setupLogger((Component)rep);
@@ -85,7 +87,14 @@
((Initializable) rep).initialize();
}
repositories.put(repName, rep);
- getLogger().info("UsersRepository " + repName + " started.");
+ if (getLogger().isInfoEnabled()) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("UsersRepository ")
+ .append(repName)
+ .append(" started.");
+ getLogger().info(logBuffer.toString());
+ }
}
getLogger().info("AvalonUsersStore ...init");
}
@@ -93,7 +102,7 @@
public UsersRepository getRepository(String request) {
UsersRepository response = (UsersRepository) repositories.get(request);
- if (response == null) {
+ if ((response == null) && (getLogger().isWarnEnabled())) {
getLogger().warn("No users repository called: " + request);
}
return response;
1.11 +0 -11 jakarta-james/src/java/org/apache/james/core/MimeMessageWrapper.java
Index: MimeMessageWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MimeMessageWrapper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MimeMessageWrapper.java 28 Jul 2002 11:46:40 -0000 1.10
+++ MimeMessageWrapper.java 7 Aug 2002 23:30:16 -0000 1.11
@@ -615,17 +615,6 @@
in.close();
}
-
-
-
-
-
-
-
-
-
-
-
/*
* Various writer methods
*/
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>