james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r882967 - in /james/server/trunk: management-library/src/main/java/org/apache/james/management/impl/ phoenix-deployment/src/conf/ spoolmanager-function/src/main/java/org/apache/james/transport/ spoolmanager-function/src/main/resources/org/a...
Date Sat, 21 Nov 2009 18:52:51 GMT
Author: norman
Date: Sat Nov 21 18:52:51 2009
New Revision: 882967

URL: http://svn.apache.org/viewvc?rev=882967&view=rev
Log:
Welcome in dependency hell...

Modified:
    james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
    james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
    james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMailetLoader.xinfo
    james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMatcherLoader.xinfo

Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java?rev=882967&r1=882966&r2=882967&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
(original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
Sat Nov 21 18:52:51 2009
@@ -122,6 +122,7 @@
      * 
      * @param selector The DataSourceSelector
      */
+    @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
     public void setDataSourceSelector (DataSourceSelector selector) {
         this.selector = selector;
     }

Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=882967&r1=882966&r2=882967&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Sat Nov 21 18:52:51
2009
@@ -68,10 +68,12 @@
   </block>
 
   <block name="matcherpackages" class="org.apache.james.transport.AvalonJamesMatcherLoader"
>
+    <provide name="James" role="org.apache.mailet.MailetContext"/>
     <proxy disable='true'/>
   </block>
 
   <block name="mailetpackages" class="org.apache.james.transport.AvalonJamesMailetLoader"
>
+    <provide name="James" role="org.apache.mailet.MailetContext"/>
     <proxy disable='true'/>
   </block>
 

Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java?rev=882967&r1=882966&r2=882967&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
Sat Nov 21 18:52:51 2009
@@ -28,12 +28,16 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.impl.AvalonLogger;
 import org.apache.james.api.kernel.LoaderService;
 import org.apache.james.bridge.GuiceInjected;
 import org.apache.james.util.ConfigurationAdapter;
 import org.apache.mailet.Mailet;
+import org.apache.mailet.MailetContext;
 import org.guiceyfruit.jsr250.Jsr250Module;
 
 import com.google.inject.AbstractModule;
@@ -42,12 +46,13 @@
 import com.google.inject.Provider;
 import com.google.inject.name.Names;
 
-public abstract class AbstractAvalonJamesLoader implements Configurable, Initializable, LogEnabled,
GuiceInjected {
+public abstract class AbstractAvalonJamesLoader implements Configurable, Serviceable, Initializable,
LogEnabled, GuiceInjected {
 
     
 
     private ConfigurationAdapter config;
     private AvalonLogger logger;
+    private MailetContext context;
 
     /**
      * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
@@ -61,6 +66,11 @@
     }
 
     
+    public void service(ServiceManager manager) throws ServiceException {       
+        context = (MailetContext) manager.lookup("org.apache.mailet.MailetContext");
+    }
+
+
     /**
      * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
      */
@@ -75,6 +85,7 @@
         protected void configure() {
             bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
             bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
+            bind(MailetContext.class).annotatedWith(Names.named("org.apache.mailet.MailetContext")).toInstance(context);
             bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new
Provider<LoaderService>() {
 
                 public LoaderService get() {

Modified: james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMailetLoader.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMailetLoader.xinfo?rev=882967&r1=882966&r2=882967&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMailetLoader.xinfo
(original)
+++ james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMailetLoader.xinfo
Sat Nov 21 18:52:51 2009
@@ -29,7 +29,10 @@
     <service name="org.apache.james.transport.MailetLoader" version="1.0" />
   </services>
 
-  <dependencies>
+  <dependencies> 
+    <dependency>
+      <service name="org.apache.mailet.MailetContext" version="1.0" />
+    </dependency>
   </dependencies>  
 
 </blockinfo>

Modified: james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMatcherLoader.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMatcherLoader.xinfo?rev=882967&r1=882966&r2=882967&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMatcherLoader.xinfo
(original)
+++ james/server/trunk/spoolmanager-function/src/main/resources/org/apache/james/transport/AvalonJamesMatcherLoader.xinfo
Sat Nov 21 18:52:51 2009
@@ -30,6 +30,9 @@
   </services>
 
   <dependencies>
+    <dependency>
+      <service name="org.apache.mailet.MailetContext" version="1.0" />
+    </dependency>
   </dependencies>  
 
 </blockinfo>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message