Author: norman
Date: Tue Oct 13 16:27:46 2009
New Revision: 824833
URL: http://svn.apache.org/viewvc?rev=824833&view=rev
Log:
Fix poms (merge from trunk)
Fix NPE's
Modified:
james/server/sandbox/active/mina_experiments/core-api/pom.xml
james/server/sandbox/active/mina_experiments/imapserver-function/pom.xml
james/server/sandbox/active/mina_experiments/nntpserver-function/pom.xml
james/server/sandbox/active/mina_experiments/phoenix-deployment-refactor/pom.xml
james/server/sandbox/active/mina_experiments/phoenix-deployment/pom.xml
james/server/sandbox/active/mina_experiments/pop3server-function/pom.xml
james/server/sandbox/active/mina_experiments/remotemanager-function/pom.xml
james/server/sandbox/active/mina_experiments/smtpserver-function/pom.xml
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/sandbox/active/mina_experiments/spring-deployment/pom.xml
Modified: james/server/sandbox/active/mina_experiments/core-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/core-api/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/core-api/pom.xml (original)
+++ james/server/sandbox/active/mina_experiments/core-api/pom.xml Tue Oct 13
16:27:46 2009
@@ -37,7 +37,10 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
Modified:
james/server/sandbox/active/mina_experiments/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/imapserver-function/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/imapserver-function/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/imapserver-function/pom.xml
Tue Oct 13 16:27:46 2009
@@ -73,6 +73,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-shared-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-api</artifactId>
</dependency>
<dependency>
@@ -117,6 +121,10 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.db.torque</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
james/server/sandbox/active/mina_experiments/nntpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/nntpserver-function/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/nntpserver-function/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/nntpserver-function/pom.xml
Tue Oct 13 16:27:46 2009
@@ -54,6 +54,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-domain-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
@@ -62,6 +66,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-shared-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-javamail-util</artifactId>
</dependency>
@@ -79,6 +87,10 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
james/server/sandbox/active/mina_experiments/phoenix-deployment-refactor/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/phoenix-deployment-refactor/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/phoenix-deployment-refactor/pom.xml
(original)
+++
james/server/sandbox/active/mina_experiments/phoenix-deployment-refactor/pom.xml
Tue Oct 13 16:27:46 2009
@@ -34,8 +34,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
Modified:
james/server/sandbox/active/mina_experiments/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/phoenix-deployment/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/phoenix-deployment/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/phoenix-deployment/pom.xml Tue
Oct 13 16:27:46 2009
@@ -226,7 +226,10 @@
<groupId>avalon-phoenix</groupId>
<artifactId>avalon-phoenix-client</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
james/server/sandbox/active/mina_experiments/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/pop3server-function/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/pop3server-function/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/pop3server-function/pom.xml
Tue Oct 13 16:27:46 2009
@@ -60,6 +60,14 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
@@ -71,7 +79,10 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-avalon-socket-library</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-shared-library</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
Modified:
james/server/sandbox/active/mina_experiments/remotemanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/remotemanager-function/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/remotemanager-function/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/remotemanager-function/pom.xml
Tue Oct 13 16:27:46 2009
@@ -70,6 +70,10 @@
<artifactId>james-server-avalon-socket-library</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-shared-library</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
@@ -77,7 +81,10 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
@@ -90,7 +97,14 @@
<groupId>org.apache.avalon.cornerstone.sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/smtpserver-function/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/smtpserver-function/pom.xml
Tue Oct 13 16:27:46 2009
@@ -29,6 +29,15 @@
<name>Apache JAMES Server SMTP function</name>
<dependencies>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-shared-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
@@ -67,6 +76,14 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Tue Oct 13 16:27:46 2009
@@ -560,7 +560,7 @@
ProtocolCodecFilter codecFactory = new ProtocolCodecFilter(new
TextLineCodecFactory());
SocketAcceptor acceptor = new NioSocketAcceptor();
- acceptor.setHandler(new SMTPCommandDispatcherIoHandler(handlerChain,
theConfigData));
+ acceptor.setHandler(new SMTPCommandDispatcherIoHandler(handlerChain,
theConfigData,new AvalonLogger(getLogger())));
acceptor.getFilterChain().addLast("loggingFilter",new LoggingFilter());
acceptor.getFilterChain().addLast("protocolCodecFactory",
codecFactory);
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
Tue Oct 13 16:27:46 2009
@@ -31,10 +31,10 @@
private SMTPConfiguration conf;
public SMTPCommandDispatcherIoHandler(SMTPHandlerChain chain,
- SMTPConfiguration conf) {
+ SMTPConfiguration conf, Log logger) {
this.chain = chain;
this.conf = conf;
-
+ this.logger = logger;
}
/**
@@ -79,6 +79,7 @@
*/
public void exceptionCaught(IoSession session, Throwable exception)
throws Exception {
+ exception.printStackTrace();
logger.error("Caught exception: " + session.getCurrentWriteMessage(),
exception);
// just close session
@@ -137,7 +138,7 @@
*/
public void messageSent(IoSession session, Object message) throws
Exception {
// Nothing todo here
- System.err.println("SEND="+message);
+ //System.err.println("SEND="+message);
}
/**
@@ -180,6 +181,7 @@
(SMTPSession) session.getAttribute(SMTP_SESSION));
}
}
+ System.err.println("FINISH");
}
}
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
Tue Oct 13 16:27:46 2009
@@ -58,7 +58,7 @@
public SMTPSessionImpl(SMTPConfiguration theConfigData,
Log logger, IoSession session) {
this.theConfigData = theConfigData;
- //this.session = session;
+ this.session = session;
connectionState = new HashMap<String, Object>();
smtpID = random.nextInt(1024) + "";
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Tue Oct 13 16:27:46 2009
@@ -38,9 +38,7 @@
import junit.framework.TestCase;
-import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.cornerstone.services.threads.ThreadManager;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
@@ -49,12 +47,8 @@
import org.apache.james.api.user.UsersRepository;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
-import org.apache.james.socket.JamesConnectionManager;
-import org.apache.james.socket.SimpleConnectionManager;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.avalon.MockSocketManager;
import org.apache.james.test.mock.avalon.MockStore;
-import org.apache.james.test.mock.avalon.MockThreadManager;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.mock.james.MockMailServer;
import org.apache.james.test.util.Util;
@@ -200,9 +194,6 @@
private FakeLoader setUpServiceManager() throws Exception {
m_serviceManager = new FakeLoader();
- SimpleConnectionManager connectionManager = new
SimpleConnectionManager();
- ContainerUtil.enableLogging(connectionManager, new MockLogger());
- m_serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
m_serviceManager.put(MailetContext.class.getName(), new
FakeMailContext());
m_mailServer = new MockMailServer(new MockUsersRepository());
m_serviceManager.put(MailServer.ROLE, m_mailServer);
@@ -210,8 +201,6 @@
m_serviceManager.put("James", m_mailServer);
m_serviceManager.put("localusersrepository", m_usersRepository);
m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);
- m_serviceManager.put(SocketManager.ROLE, new
MockSocketManager(m_smtpListenerPort));
- m_serviceManager.put(ThreadManager.ROLE, new MockThreadManager());
m_dnsServer = new AlterableDNSServer();
m_serviceManager.put(DNSService.ROLE, m_dnsServer);
m_serviceManager.put("dnsserver", m_dnsServer);
Modified: james/server/sandbox/active/mina_experiments/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/spring-deployment/pom.xml?rev=824833&r1=824832&r2=824833&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/spring-deployment/pom.xml
(original)
+++ james/server/sandbox/active/mina_experiments/spring-deployment/pom.xml Tue
Oct 13 16:27:46 2009
@@ -33,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
</plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
