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 no...@apache.org on 2010/01/02 14:26:46 UTC
svn commit: r895190 - in
/james/server/sandbox/active/pure_spring_deployment: ./
avalon-guice-bridge-api/ avalon-socket-library/
avalon-socket-library/src/main/java/org/apache/james/socket/
avalon-user-function/ avalon-user-function/src/main/java/org/a...
Author: norman
Date: Sat Jan 2 13:26:45 2010
New Revision: 895190
URL: http://svn.apache.org/viewvc?rev=895190&view=rev
Log:
Remove phoenix and guice stuff
Removed:
james/server/sandbox/active/pure_spring_deployment/avalon-guice-bridge-api/
james/server/sandbox/active/pure_spring_deployment/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java
james/server/sandbox/active/pure_spring_deployment/core-function/src/main/java/org/apache/james/dnsserver/AvalonDNSServer.java
james/server/sandbox/active/pure_spring_deployment/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java
james/server/sandbox/active/pure_spring_deployment/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java
james/server/sandbox/active/pure_spring_deployment/core-function/src/main/java/org/apache/james/domain/AvalonXMLDomainList.java
james/server/sandbox/active/pure_spring_deployment/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java
james/server/sandbox/active/pure_spring_deployment/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java
james/server/sandbox/active/pure_spring_deployment/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java
james/server/sandbox/active/pure_spring_deployment/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java
james/server/sandbox/active/pure_spring_deployment/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java
james/server/sandbox/active/pure_spring_deployment/phoenix-deployment/
james/server/sandbox/active/pure_spring_deployment/phoenix-deployment-refactor/
james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java
james/server/sandbox/active/pure_spring_deployment/stage/com.google.code.guice/
james/server/sandbox/active/pure_spring_deployment/stage/org.guiceyfruit/
james/server/sandbox/active/pure_spring_deployment/stage/spring-aopalliance/
james/server/sandbox/active/pure_spring_deployment/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
james/server/sandbox/active/pure_spring_deployment/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
Modified:
james/server/sandbox/active/pure_spring_deployment/avalon-socket-library/pom.xml
james/server/sandbox/active/pure_spring_deployment/avalon-user-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java
james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml
james/server/sandbox/active/pure_spring_deployment/core-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/fetchmail-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/include.properties
james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml
james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/pom.xml
james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/remotemanager-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/smtpserver-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java
james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml
james/server/sandbox/active/pure_spring_deployment/stage/pom.xml
james/server/sandbox/active/pure_spring_deployment/user-library/pom.xml
Modified: james/server/sandbox/active/pure_spring_deployment/avalon-socket-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/avalon-socket-library/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/avalon-socket-library/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/avalon-socket-library/pom.xml Sat Jan 2 13:26:45 2010
@@ -94,23 +94,6 @@
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-thread-impl</artifactId>
<version>2.2.1</version>
Modified: james/server/sandbox/active/pure_spring_deployment/avalon-user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/avalon-user-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/avalon-user-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/avalon-user-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -61,11 +61,7 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
-
+
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
Modified: james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java (original)
+++ james/server/sandbox/active/pure_spring_deployment/avalon-user-function/src/main/java/org/apache/james/core/UsersStoreImpl.java Sat Jan 2 13:26:45 2010
@@ -21,23 +21,12 @@
package org.apache.james.core;
-import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
-import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.james.api.user.UsersRepository;
-import org.apache.james.api.user.UsersStore;
-import org.apache.james.services.FileSystem;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Module;
-import com.google.inject.name.Names;
-
import java.util.Iterator;
import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.api.user.UsersRepository;
+import org.apache.james.api.user.UsersStore;
/**
* Provides a registry of user repositories.
Modified: james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml Sat Jan 2 13:26:45 2010
@@ -241,8 +241,6 @@
<include name="${jsr250.jar}"/>
<include name='${path.lib.james}/apache-james-imap*.jar'/>
<include name="${mina-core.jar}"/>
- <include name="${guice.jar}"/>
- <include name="${guiceyfruit-core.jar}"/>
</fileset>
</path>
Modified: james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml Sat Jan 2 13:26:45 2010
@@ -66,7 +66,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/jcr-store"/>
<classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/>
- <classpathentry combineaccessrules="false" kind="src" path="/phoenix-deployment"/>
<classpathentry combineaccessrules="false" kind="src" path="/pop3server-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/remotemanager-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/smtpserver-function"/>
Modified: james/server/sandbox/active/pure_spring_deployment/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/core-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/core-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/core-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -98,23 +98,7 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-management-library</artifactId>
Modified: james/server/sandbox/active/pure_spring_deployment/fetchmail-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/fetchmail-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/fetchmail-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/fetchmail-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -72,22 +72,5 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -104,23 +104,6 @@
<artifactId>apache-james-imap-seda</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
Modified: james/server/sandbox/active/pure_spring_deployment/include.properties
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/include.properties?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/include.properties (original)
+++ james/server/sandbox/active/pure_spring_deployment/include.properties Sat Jan 2 13:26:45 2010
@@ -368,16 +368,6 @@
jarname.mina-core.jar=mina-core-2.0.0-RC1.jar
mina-core.jar=${path.lib.mina}/${jarname.mina-core.jar}
-# ------ Guice and Co ------------------
-jarname.guice.jar=guice-2.0.jar
-guice.jar=${path.lib.guice}/${jarname.guice.jar}
-
-jarname.guiceyfruit-core.jar=guiceyfruit-core-2.0.jar
-guiceyfruit-core.jar=${path.lib.guiceyfruit}/${jarname.guiceyfruit-core.jar}
-
-jarname.spring-aopalliance.jar=spring-aopalliance-1.0.jar
-spring-aopalliance.jar=${path.lib.springaopalliance}/${jarname.spring-aopalliance.jar}
-
# --------------------------------------------------
# TEST LIBRARIES
Modified: james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml Sat Jan 2 13:26:45 2010
@@ -99,23 +99,6 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -91,23 +91,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: james/server/sandbox/active/pure_spring_deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/pom.xml Sat Jan 2 13:26:45 2010
@@ -60,11 +60,9 @@
<module>fetchmail-function</module>
<module>experimental-activemq-function</module>
<module>jcr-store</module>
- <module>phoenix-deployment</module>
<module>spring-deployment</module>
<module>socket-shared-library</module>
<module>mina-socket-library</module>
- <module>avalon-guice-bridge-api</module>
</modules>
<ciManagement>
<system>hudson</system>
@@ -270,11 +268,7 @@
<artifactId>james-server-socket-shared-library</artifactId>
<version>3.0-M1</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- <version>3.0-M1</version>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
@@ -1138,23 +1132,7 @@
<version>1.4.6</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
+
</dependencies>
</dependencyManagement>
Modified: james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -107,23 +107,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
Modified: james/server/sandbox/active/pure_spring_deployment/remotemanager-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/remotemanager-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/remotemanager-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/remotemanager-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -106,23 +106,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
Modified: james/server/sandbox/active/pure_spring_deployment/smtpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/smtpserver-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/smtpserver-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/smtpserver-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -34,10 +34,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
@@ -145,19 +141,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<type>test-jar</type>
Modified: james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/pom.xml Sat Jan 2 13:26:45 2010
@@ -114,23 +114,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-standard-mailets</artifactId>
<scope>test</scope>
@@ -158,5 +141,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java (original)
+++ james/server/sandbox/active/pure_spring_deployment/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java Sat Jan 2 13:26:45 2010
@@ -34,16 +34,12 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
+import org.apache.james.api.kernel.LoaderService;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.SpoolRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetException;
-import org.guiceyfruit.jsr250.Jsr250Module;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.name.Names;
/**
* This class is responsible for creating a set of named processors and
@@ -66,6 +62,8 @@
private MatcherLoader matcherLoader;
private SpoolRepository spoolRepos;
+
+ private LoaderService loader;
public StateAwareProcessorList() {
super();
@@ -93,6 +91,10 @@
this.spoolRepos = spoolRepos;
}
+ @Resource(name="org.apache.james.LoaderService")
+ public final void setLoaderService(LoaderService loader) {
+ this.loader = loader;
+ }
/**
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
@@ -107,19 +109,10 @@
String processorClass = processorConf.getString("[@class]","org.apache.james.transport.LinearProcessor");
try {
- Class<MailProcessor> cObj = (Class<MailProcessor>) Thread.currentThread().getContextClassLoader().loadClass(processorClass);
- MailProcessor processor = Guice.createInjector(new Jsr250Module(), new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(processorConf);
- bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(MailetLoader.class).annotatedWith(Names.named("mailetpackages")).toInstance(mailetLoader);
- bind(MatcherLoader.class).annotatedWith(Names.named("matcherpackages")).toInstance(matcherLoader);
- bind(SpoolRepository.class).annotatedWith(Names.named("spoolrepository")).toInstance(spoolRepos);
- }
-
- }).getInstance(cObj);
+
+ MailProcessor processor = (MailProcessor) Thread.currentThread().getContextClassLoader().loadClass(processorClass).newInstance();
+ loader.injectDependenciesWithLifecycle(processor, logger, processorConf);
+
processors.put(processorName, processor);
//setupLogger(processor, processorName);
Modified: james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml Sat Jan 2 13:26:45 2010
@@ -312,10 +312,12 @@
<include name="**/LICENSE*" />
</fileset>
</copy>
+ <!--
<echo>${phoenix-deployment.build.lib.jar}</echo>
<copy todir="${spring-deployment.target.lib.dir}" >
<fileset file="${phoenix-deployment.build.lib.jar}" />
</copy>
+ -->
</target>
<target name="package-aquire-config-files" >
@@ -507,7 +509,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/jcr-store"/>
<classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/>
- <classpathentry combineaccessrules="false" kind="src" path="/phoenix-deployment"/>
<classpathentry combineaccessrules="false" kind="src" path="/pop3server-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/remotemanager-function"/>
<classpathentry combineaccessrules="false" kind="src" path="/core-function"/>
Modified: james/server/sandbox/active/pure_spring_deployment/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/stage/pom.xml Sat Jan 2 13:26:45 2010
@@ -390,20 +390,7 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
+
</dependencies>
<build>
Modified: james/server/sandbox/active/pure_spring_deployment/user-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/user-library/pom.xml?rev=895190&r1=895189&r2=895190&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/user-library/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/user-library/pom.xml Sat Jan 2 13:26:45 2010
@@ -31,6 +31,10 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
@@ -50,23 +54,6 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-guice-bridge-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>spring-aopalliance</groupId>
- <artifactId>spring-aopalliance</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>oro</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org