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/23 19:08:56 UTC
svn commit: r902449 - in /james/server/trunk: ./ core-function/
core-library/ core-library/src/test/java/org/apache/james/test/mock/avalon/
smtpserver-function/src/test/java/org/apache/james/smtpserver/
spring-deployment/
Author: norman
Date: Sat Jan 23 18:08:55 2010
New Revision: 902449
URL: http://svn.apache.org/viewvc?rev=902449&view=rev
Log:
remove dependencies on cornerstone pool, sockets thread-pool
Removed:
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockSocketManager.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockThreadManager.java
Modified:
james/server/trunk/core-function/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/pom.xml
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
james/server/trunk/spring-deployment/pom.xml
Modified: james/server/trunk/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=902449&r1=902448&r2=902449&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Sat Jan 23 18:08:55 2010
@@ -118,16 +118,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-thread-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-impl</artifactId>
<scope>test</scope>
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=902449&r1=902448&r2=902449&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sat Jan 23 18:08:55 2010
@@ -71,22 +71,11 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-api</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-thread-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.excalibur.components</groupId>
@@ -104,16 +93,7 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-thread-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-impl</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=902449&r1=902448&r2=902449&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sat Jan 23 18:08:55 2010
@@ -791,39 +791,7 @@
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.connection</groupId>
- <artifactId>cornerstone-connection-api</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.connection</groupId>
- <artifactId>cornerstone-connection-impl</artifactId>
- <version>2.2.2</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-api</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-impl</artifactId>
- <version>2.2.2</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
@@ -890,44 +858,7 @@
<artifactId>dnsjava</artifactId>
<version>2.0.7</version>
</dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-pool-impl</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-api</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-impl</artifactId>
- <version>2.2.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-thread-api</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-thread-impl</artifactId>
- <version>2.2.1</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>junitperf</artifactId>
- <groupId>junitperf</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -1026,12 +957,6 @@
<artifactId>cornerstone-datasources-api</artifactId>
<version>2.2.2</version>
</dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
- <scope>runtime</scope>
- </dependency>
<!-- Used by Mime4J -->
<dependency>
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java?rev=902449&r1=902448&r2=902449&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java Sat Jan 23 18:08:55 2010
@@ -54,9 +54,7 @@
import org.apache.james.smtpserver.mina.AsyncSMTPServer;
import org.apache.james.test.mock.DummyDataSourceSelector;
import org.apache.james.test.mock.DummyVirtualUserTableStore;
-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;
@@ -154,8 +152,6 @@
protected MockUsersRepository m_usersRepository = new MockUsersRepository();
protected FakeLoader m_serviceManager;
protected AlterableDNSServer m_dnsServer;
- protected MockSocketManager socketManager;
- protected MockThreadManager threadManager;
protected MockStore store;
protected MockFileSystem fileSystem;
protected SMTPServerDNSServiceAdapter dnsAdapter;
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=902449&r1=902448&r2=902449&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Sat Jan 23 18:08:55 2010
@@ -353,27 +353,7 @@
<artifactId>cornerstone-datasources-impl</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org