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 se...@apache.org on 2001/09/27 23:12:17 UTC
cvs commit: jakarta-james/src/java/org/apache/james/core AvalonMailStore.java AvalonUsersStore.java
serge 01/09/27 14:12:17
Modified: src/java/org/apache/james/core AvalonMailStore.java
AvalonUsersStore.java
Log:
Applying JDBC dir context fix.
Revision Changes Path
1.7 +15 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AvalonMailStore.java 2001/09/11 04:32:44 1.6
+++ AvalonMailStore.java 2001/09/27 21:12:17 1.7
@@ -20,6 +20,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.services.MailRepository;
@@ -38,7 +41,7 @@
*/
public class AvalonMailStore
extends AbstractLoggable
- implements Block, Composable, Configurable, MailStore, Initializable {
+ implements Block, Contextualizable, Composable, Configurable, Initializable, MailStore {
private static final String REPOSITORY_NAME = "Repository";
private static long id;
@@ -51,11 +54,17 @@
// map of [Repository Class]->default config for repository.
private HashMap defaultConfigs;
+ protected Context context;
protected Configuration configuration;
protected ComponentManager componentManager;
private SpoolRepository inboundSpool;
+ public void contextualize(final Context context)
+ throws ContextException {
+ this.context = context;
+ }
+
public void compose( final ComponentManager componentManager )
throws ComponentException
{
@@ -189,11 +198,14 @@
if (reply instanceof Loggable) {
setupLogger(reply);
}
- if (reply instanceof Configurable) {
- ((Configurable) reply).configure(config);
+ if (reply instanceof Contextualizable) {
+ ((Contextualizable) reply).contextualize(context);
}
if (reply instanceof Composable) {
((Composable) reply).compose( componentManager );
+ }
+ if (reply instanceof Configurable) {
+ ((Configurable) reply).configure(config);
}
if (reply instanceof Initializable) {
((Initializable) reply).initialize();
1.3 +14 -7 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AvalonUsersStore.java 2001/06/10 13:19:57 1.2
+++ AvalonUsersStore.java 2001/09/27 21:12:17 1.3
@@ -19,6 +19,9 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.james.services.UsersRepository;
import org.apache.james.services.UsersStore;
@@ -30,12 +33,19 @@
*/
public class AvalonUsersStore
extends AbstractLoggable
- implements Block, Composable, Configurable, UsersStore, Initializable {
+ implements Block, Contextualizable, Composable, Configurable, Initializable, UsersStore {
private HashMap repositories;
+ protected Context context;
protected Configuration configuration;
protected ComponentManager componentManager;
+
+ public void contextualize(final Context context)
+ throws ContextException {
+ this.context = context;
+ }
+
public void configure( final Configuration configuration )
throws ConfigurationException {
this.configuration = configuration;
@@ -64,18 +74,15 @@
setupLogger((Component)rep);
+ if (rep instanceof Contextualizable) {
+ ((Contextualizable) rep).contextualize(context);
+ }
if (rep instanceof Composable) {
((Composable) rep).compose( componentManager );
}
-
if (rep instanceof Configurable) {
((Configurable) rep).configure(repConf);
}
- /*
- if (rep instanceof Contextualizable) {
- ((Contextualizable) rep).contextualize(context);
- }
- */
if (rep instanceof Initializable) {
((Initializable) rep).initialize();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org