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 2009/10/25 16:54:06 UTC
svn commit: r829612 - in /james/server/trunk: ./ avalon-user-function/
basic-user-function/src/test/java/org/apache/james/user/impl/
phoenix-deployment/ phoenix-deployment/src/java/org/apache/james/phoenix/
smtp-protocol-library/src/test/java/org/apach...
Author: norman
Date: Sun Oct 25 15:54:06 2009
New Revision: 829612
URL: http://svn.apache.org/viewvc?rev=829612&view=rev
Log:
fix build
Removed:
james/server/trunk/basic-user-function/src/test/java/org/apache/james/user/impl/
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/GuiceInjected.java
Modified:
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java
james/server/trunk/pom.xml
james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandlerTest.java
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java
Modified: james/server/trunk/avalon-user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Sun Oct 25 15:54:06 2009
@@ -61,6 +61,10 @@
<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>
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Sun Oct 25 15:54:06 2009
@@ -74,6 +74,10 @@
<dependencies>
<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>
Modified: james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java (original)
+++ james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/PhoenixLoader.java Sun Oct 25 15:54:06 2009
@@ -33,7 +33,7 @@
import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.BlockEvent;
import org.apache.james.api.kernel.LoaderService;
-import org.apache.james.smtpserver.mina.GuiceInjected;
+import org.apache.james.bridge.GuiceInjected;
public class PhoenixLoader implements LoaderService, ApplicationListener, LogEnabled {
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Oct 25 15:54:06 2009
@@ -64,6 +64,7 @@
<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>
@@ -271,6 +272,11 @@
</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>
<version>2.4</version>
<exclusions>
Modified: james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandlerTest.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandlerTest.java (original)
+++ james/server/trunk/smtp-protocol-library/src/test/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandlerTest.java Sun Oct 25 15:54:06 2009
@@ -20,15 +20,12 @@
import javax.mail.internet.ParseException;
-import org.apache.avalon.framework.container.ContainerUtil;
+import junit.framework.TestCase;
+
import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.fastfail.TarpitHandler;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.mailet.MailAddress;
-import junit.framework.TestCase;
-
public class TarpitHandlerTest extends TestCase {
private SMTPSession session;
@@ -59,9 +56,7 @@
long tarpitTolerance = 100;
long startTime;
TarpitHandler handler = new TarpitHandler();
-
- ContainerUtil.enableLogging(handler, new MockLogger());
-
+
handler.setTarpitRcptCount(2);
handler.setTarpitSleepTime(tarpitTime);
Modified: james/server/trunk/smtpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Sun Oct 25 15:54:06 2009
@@ -34,6 +34,10 @@
</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>
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java Sun Oct 25 15:54:06 2009
@@ -34,6 +34,7 @@
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.bridge.GuiceInjected;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java Sun Oct 25 15:54:06 2009
@@ -27,7 +27,7 @@
import org.apache.james.api.user.User;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
-import org.apache.james.smtpserver.mina.GuiceInjected;
+import org.apache.james.bridge.GuiceInjected;
import org.guiceyfruit.jsr250.Jsr250Module;
import com.google.inject.AbstractModule;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java Sun Oct 25 15:54:06 2009
@@ -28,7 +28,7 @@
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.user.management.UserManagementException;
import org.apache.james.api.user.management.UserManagementMBean;
-import org.apache.james.smtpserver.mina.GuiceInjected;
+import org.apache.james.bridge.GuiceInjected;
import org.guiceyfruit.jsr250.Jsr250Module;
import com.google.inject.AbstractModule;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java Sun Oct 25 15:54:06 2009
@@ -40,7 +40,7 @@
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.api.vut.management.VirtualUserTableManagement;
-import org.apache.james.smtpserver.mina.GuiceInjected;
+import org.apache.james.bridge.GuiceInjected;
import org.apache.james.util.ConfigurationAdapter;
import com.google.inject.AbstractModule;
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java?rev=829612&r1=829611&r2=829612&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java Sun Oct 25 15:54:06 2009
@@ -30,7 +30,7 @@
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.api.vut.management.InvalidMappingException;
-import org.apache.james.smtpserver.mina.GuiceInjected;
+import org.apache.james.bridge.GuiceInjected;
import org.guiceyfruit.jsr250.Jsr250Module;
import com.google.inject.AbstractModule;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org