pgoldstein 2002/09/25 16:29:39
Modified: src/java/org/apache/james/nntpserver/repository
NNTPUtil.java
src/java/org/apache/james/transport MatchLoader.java
MailetLoader.java
src/java/org/apache/james/util/mordred JdbcDataSource.java
src/java/org/apache/james/core AvalonUsersStore.java
AvalonMailStore.java
Log:
Removing Class.forName calls and replacing with calls to specific class loaders.
Revision Changes Path
1.9 +1 -1
jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPUtil.java
Index: NNTPUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NNTPUtil.java 14 Aug 2002 02:11:00 -0000 1.8
+++ NNTPUtil.java 25 Sep 2002 23:29:39 -0000 1.9
@@ -88,7 +88,7 @@
try { clsName = configuration.getAttribute("class");
} catch(ConfigurationException ce) { }
try {
- Object obj = Class.forName(clsName).newInstance();
+ Object obj =
NNTPUtil.class.getClassLoader().loadClass(clsName).newInstance();
if ( obj instanceof LogEnabled )
((LogEnabled)obj).enableLogging( logger );
if (obj instanceof Contextualizable)
1.6 +1 -1
jakarta-james/src/java/org/apache/james/transport/MatchLoader.java
Index: MatchLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/MatchLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MatchLoader.java 17 Aug 2002 18:43:55 -0000 1.5
+++ MatchLoader.java 25 Sep 2002 23:29:39 -0000 1.6
@@ -79,7 +79,7 @@
configImpl.setCondition(condition);
configImpl.setMailetContext(context);
- Matcher matcher = (Matcher)
Class.forName(className).newInstance();
+ Matcher matcher = (Matcher)
this.getClass().getClassLoader().loadClass(className).newInstance();
matcher.init(configImpl);
return matcher;
} catch (ClassNotFoundException cnfe) {
1.5 +1 -1
jakarta-james/src/java/org/apache/james/transport/MailetLoader.java
Index: MailetLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/transport/MailetLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailetLoader.java 17 Aug 2002 18:43:55 -0000 1.4
+++ MailetLoader.java 25 Sep 2002 23:29:39 -0000 1.5
@@ -73,7 +73,7 @@
configImpl.setConfiguration(configuration);
configImpl.setMailetContext(context);
- Mailet mailet = (Mailet) Class.forName(className).newInstance();
+ Mailet mailet = (Mailet)
this.getClass().getClassLoader().loadClass(className).newInstance();
mailet.init(configImpl);
return mailet;
} catch (ClassNotFoundException cnfe) {
1.15 +2 -2
jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JdbcDataSource.java 14 Sep 2002 09:00:58 -0000 1.14
+++ JdbcDataSource.java 25 Sep 2002 23:29:39 -0000 1.15
@@ -234,7 +234,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("Loading new driver: " + jdbcDriver);
}
- Class.forName(jdbcDriver, true,
Thread.currentThread().getContextClassLoader());
+
Thread.currentThread().getContextClassLoader().loadClass(jdbcDriver);
} catch(ClassNotFoundException cnfe) {
StringBuffer exceptionBuffer =
new StringBuffer(128)
1.11 +1 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AvalonUsersStore.java 17 Aug 2002 18:16:24 -0000 1.10
+++ AvalonUsersStore.java 25 Sep 2002 23:29:39 -0000 1.11
@@ -116,7 +116,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("Starting " + repClass);
}
- UsersRepository rep = (UsersRepository)
Class.forName(repClass).newInstance();
+ UsersRepository rep = (UsersRepository)
this.getClass().getClassLoader().loadClass(repClass).newInstance();
setupLogger((Component)rep);
1.14 +1 -1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AvalonMailStore.java 17 Aug 2002 18:16:23 -0000 1.13
+++ AvalonMailStore.java 25 Sep 2002 23:29:39 -0000 1.14
@@ -289,7 +289,7 @@
}
try {
- reply = (MailRepository) Class.forName(repClass).newInstance();
+ reply = (MailRepository)
this.getClass().getClassLoader().loadClass(repClass).newInstance();
if (reply instanceof LogEnabled) {
setupLogger(reply);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
