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 ba...@apache.org on 2008/07/30 17:43:05 UTC
svn commit: r681086 - in /james/server/trunk: ./ core-library/
phoenix-deployment/ phoenix-deployment/src/test/org/apache/james/core/
phoenix-deployment/src/test/org/apache/james/test/mock/james/
phoenix-deployment/src/test/org/apache/james/transport/m...
Author: bago
Date: Wed Jul 30 08:43:04 2008
New Revision: 681086
URL: http://svn.apache.org/viewvc?rev=681086&view=rev
Log:
First pass to updated m2 build (and some ant reference) according to updates to mailet products
Modified:
james/server/trunk/core-library/pom.xml
james/server/trunk/include.properties
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/phoenix-deployment/src/test/org/apache/james/core/MailImplTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
james/server/trunk/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Wed Jul 30 08:43:04 2008
@@ -146,5 +146,25 @@
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <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>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Wed Jul 30 08:43:04 2008
@@ -252,7 +252,7 @@
commons-digester.jar=${path.lib.commonsdigester}/${jarname.commons-digester.jar}
# ----- mailet-----
-jarname.mailet.jar=mailet-3.0-SNAPSHOT.jar
+jarname.mailet.jar=mailet-2.4-SNAPSHOT.jar
mailet.jar=${path.lib.james}/${jarname.mailet.jar}
jarname.base-mailet.jar=apache-james-mailet-base-1.0-SNAPSHOT.jar
base-mailet.jar=${path.lib.james}/${jarname.base-mailet.jar}
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Wed Jul 30 08:43:04 2008
@@ -322,6 +322,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>runtime</scope>
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/core/MailImplTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/core/MailImplTest.java?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/core/MailImplTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/core/MailImplTest.java Wed Jul 30 08:43:04 2008
@@ -21,8 +21,8 @@
package org.apache.james.core;
-import org.apache.james.test.mock.james.MockMailServer;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mail;
@@ -47,7 +47,7 @@
public void testConstr2() throws MessagingException {
ArrayList recepients = new ArrayList();
- String name = MockMailServer.newId();
+ String name = MailUtil.newId();
String sender = "sender@localhost";
MailAddress senderMailAddress = new MailAddress(sender);
MailImpl mail = new MailImpl(name, senderMailAddress, recepients);
@@ -64,7 +64,7 @@
public void testConstr3() throws MessagingException {
ArrayList recepients = new ArrayList();
- String name = MockMailServer.newId();
+ String name = MailUtil.newId();
String sender = "sender@localhost";
MailAddress senderMailAddress = new MailAddress(sender);
MockMimeMessage mimeMessage = new MockMimeMessage();
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/james/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/james/MockMailServer.java?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/james/MockMailServer.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/james/MockMailServer.java Wed Jul 30 08:43:04 2008
@@ -24,6 +24,7 @@
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -44,7 +45,6 @@
private final MockUsersRepository m_users = new MockUsersRepository();
- private static int m_counter = 0;
private int m_maxMessageSizeBytes = 0;
// private final ArrayList mails = new ArrayList();
@@ -65,7 +65,7 @@
// Object[] mailObjects = new Object[]{sender, recipients, new MimeMessageCopyOnWriteProxy(msg)};
// mails.add(mailObjects);
//
- String newId = newId();
+ String newId = MailUtil.newId();
MailImpl m = new MailImpl(newId, sender, recipients, msg);
sendMail(m);
m.dispose();
@@ -74,7 +74,7 @@
public void sendMail(MailAddress sender, Collection recipients, InputStream msg) throws MessagingException {
// Object[] mailObjects = new Object[]{sender, recipients, msg};
// mails.add(mailObjects);
- MailImpl m = new MailImpl(newId(), sender, recipients, msg);
+ MailImpl m = new MailImpl(MailUtil.newId(), sender, recipients, msg);
sendMail(m);
m.dispose();
}
@@ -128,12 +128,7 @@
public synchronized String getId() {
- return newId();
- }
-
- public static String newId() {
- m_counter++;
- return "MockMailServer-ID-" + m_counter;
+ return MailUtil.newId();
}
public boolean addUser(String userName, String password) {
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java Wed Jul 30 08:43:04 2008
@@ -32,6 +32,7 @@
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMailetConfig;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.james.userrepository.DefaultJamesUser;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
@@ -287,7 +288,7 @@
}
public void sendMail(MailAddress sender, Collection recipients, MimeMessage msg, String state) throws MessagingException {
- MailImpl m = new MailImpl(MockMailServer.newId(), sender, recipients, msg);
+ MailImpl m = new MailImpl(MailUtil.newId(), sender, recipients, msg);
m.setState(state);
mockMailServer.sendMail(m);
m.dispose();
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Jul 30 08:43:04 2008
@@ -377,6 +377,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=681086&r1=681085&r2=681086&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Wed Jul 30 08:43:04 2008
@@ -55,5 +55,15 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org