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/09 11:44:44 UTC

svn commit: r897413 - in /james/server/trunk: ./ avalon-socket-library/ avalon-user-function/ basic-user-function/ build-tools/ common-util/ core-api/ core-function/ core-library/ domain-api/ experimental-activemq-function/ fetchmail-function/ imapserv...

Author: norman
Date: Sat Jan  9 10:44:43 2010
New Revision: 897413

URL: http://svn.apache.org/viewvc?rev=897413&view=rev
Log:
Remove ant build (JAMES-945)

Added:
    james/server/trunk/spring-deployment/src/mpt/delivery-smtp.mpt
    james/server/trunk/spring-deployment/src/mpt/imap-post-john-sieve.mpt
    james/server/trunk/spring-deployment/src/mpt/imap-prep-john-sieve.mpt
    james/server/trunk/spring-deployment/src/mpt/imap-sieve.mpt
    james/server/trunk/spring-deployment/src/mpt/john.smith.sieve
    james/server/trunk/spring-deployment/src/mpt/pop3-after-smtp.mpt
    james/server/trunk/spring-deployment/src/mpt/sieve-smtp.mpt
    james/server/trunk/spring-deployment/src/mpt/vut-pop3.mpt
    james/server/trunk/spring-deployment/src/mpt/vut-smtp.mpt
Removed:
    james/server/trunk/avalon-socket-library/build.xml
    james/server/trunk/avalon-user-function/build.xml
    james/server/trunk/basic-user-function/build.xml
    james/server/trunk/build-tools/
    james/server/trunk/build.xml
    james/server/trunk/common-util/build.xml
    james/server/trunk/core-api/build.xml
    james/server/trunk/core-function/build.xml
    james/server/trunk/core-library/build.xml
    james/server/trunk/default.properties
    james/server/trunk/domain-api/build.xml
    james/server/trunk/experimental-activemq-function/build.xml
    james/server/trunk/fetchmail-function/build.xml
    james/server/trunk/imapserver-function/build.xml
    james/server/trunk/include.properties
    james/server/trunk/javamail-util/build.xml
    james/server/trunk/jcr-store/build.xml
    james/server/trunk/jpa-store/build.xml
    james/server/trunk/mailets-function/build.xml
    james/server/trunk/management-library/build.xml
    james/server/trunk/mina-socket-library/build.xml
    james/server/trunk/nntpserver-function/build.xml
    james/server/trunk/pop3server-function/build.xml
    james/server/trunk/remotemanager-function/build.xml
    james/server/trunk/smtp-protocol-library/build.xml
    james/server/trunk/smtpserver-function/build.xml
    james/server/trunk/socket-api/build.xml
    james/server/trunk/socket-shared-library/build.xml
    james/server/trunk/spoolmanager-function/build.xml
    james/server/trunk/spring-deployment/build.xml
    james/server/trunk/user-api/build.xml
Modified:
    james/server/trunk/BUILDING.txt
    james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
    james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java

Modified: james/server/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/BUILDING.txt?rev=897413&r1=897412&r2=897413&view=diff
==============================================================================
--- james/server/trunk/BUILDING.txt (original)
+++ james/server/trunk/BUILDING.txt Sat Jan  9 10:44:43 2010
@@ -1,9 +1,7 @@
-The primary build tool for James server is ant. The Maven builds are used to build the
-website and are less promptly maintained. For those new to James, the ant build is 
-recommended.
+The primary build tool for James server is maven.
 
 On a new checkout start by running
 
-$ ant dist
+$ mvn clean package
 
 This will compiled all modules and build the distributions. 

Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java?rev=897413&r1=897412&r2=897413&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java Sat Jan  9 10:44:43 2010
@@ -34,6 +34,9 @@
 import org.apache.james.imap.mailbox.SubscriptionException;
 import org.apache.james.imap.store.Subscriber;
 
+/**
+ *
+ */
 public class UserMetaDataRepositorySubscripter implements Subscriber {
 
     public static final String META_DATA_KEY = "org.apache.james.IMAP_SUBSCRIPTIONS";
@@ -41,10 +44,10 @@
     private Log log = LogFactory.getLog(UserMetaDataRepositorySubscripter.class);
 
     private UserMetaDataRespository repository;
-    private final Map userSubscriptionsByUser;
+    private final Map<String,UserSubscription> userSubscriptionsByUser;
 
     public UserMetaDataRepositorySubscripter() {
-        userSubscriptionsByUser = new HashMap();
+        userSubscriptionsByUser = new HashMap<String, UserSubscription>();
     }
 
     @Resource(name = "userMetaDataRepository")
@@ -120,9 +123,9 @@
         public synchronized void subscribe(String mailbox) throws UserRepositoryException {
             final HashSet<String> existingSubscriptions = subscriptions();
             if (!existingSubscriptions.contains(mailbox)) {
-                final HashSet newSubscriptions;
+                final HashSet<String> newSubscriptions;
                 if (existingSubscriptions == null) {
-                    newSubscriptions = new HashSet();
+                    newSubscriptions = new HashSet<String>();
                 } else {
                     existingSubscriptions.add(mailbox);
                     newSubscriptions = existingSubscriptions;
@@ -132,7 +135,7 @@
         }
 
         public synchronized void unsubscribe(String mailbox) throws UserRepositoryException {
-            final HashSet subscriptions = subscriptions();
+            final HashSet<String> subscriptions = subscriptions();
             if (subscriptions.remove(mailbox)) {
                 repository.setAttribute(user, subscriptions, META_DATA_KEY);
             }

Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java?rev=897413&r1=897412&r2=897413&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/user/impl/file/FileUserMetaDataRepository.java Sat Jan  9 10:44:43 2010
@@ -56,6 +56,10 @@
         this.baseDirectory = baseDirectory;
     }
 
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.api.user.UserMetaDataRespository#clear(java.lang.String)
+     */
     public void clear(String username) throws UserRepositoryException {
         final File userDir = userDirectory(username);
         try {
@@ -65,6 +69,10 @@
         }
     }
 
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.api.user.UserMetaDataRespository#getAttribute(java.lang.String, java.lang.String)
+     */
     public Serializable getAttribute(String username, String key)
             throws UserRepositoryException {
         final File valueFile = valueFile(username, key);
@@ -88,6 +96,10 @@
         return result;
     }
 
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.api.user.UserMetaDataRespository#setAttribute(java.lang.String, java.io.Serializable, java.lang.String)
+     */
     public void setAttribute(String username, Serializable value, String key)
             throws UserRepositoryException {
 

Added: james/server/trunk/spring-deployment/src/mpt/delivery-smtp.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/delivery-smtp.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/delivery-smtp.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/delivery-smtp.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,38 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: 220 .* SMTP Server \(JAMES SMTP Server .*
+C: HELO example.org
+S: 250 .* Hello example.org .*
+C: MAIL FROM:<jo...@example.org>
+S: 250 2.1.0 Sender <jo...@example.org> OK
+C: RCPT TO:<jo...@localhost>
+S: 250 2.1.5 Recipient <jo...@localhost> OK
+C: DATA
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: Date: 12 Dec 2008 GMT
+C: From: <jo...@example.org>
+C: To: <jo...@localhost>
+C: Subject: A Test Message
+C:
+C: Simple plain mail content
+C:
+C: .
+S: 250 2.6.0 Message received
+C: QUIT
+S: 221 2.0.0 .* Service closing transmission channel

Added: james/server/trunk/spring-deployment/src/mpt/imap-post-john-sieve.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/imap-post-john-sieve.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/imap-post-john-sieve.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/imap-post-john-sieve.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,48 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: \* OK JAMES IMAP4rev1 Server.*
+C: abcd CAPABILITY
+S: \* CAPABILITY IMAP4rev1 LITERAL\+ NAMESPACE CHILDREN
+S: abcd OK CAPABILITY completed.
+C: 1 LOGIN john.smith passwd
+S: 1 OK LOGIN completed.
+C: 2 SELECT INBOX
+S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
+S: \* 0 EXISTS
+S: \* 0 RECENT
+S: \* OK \[UIDVALIDITY .*
+S: \* OK \[PERMANENTFLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\]
+S: \* OK \[UIDNEXT .*\]
+S: 2 OK \[READ-WRITE\] SELECT completed.
+C: 3 SELECT sub
+S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
+S: \* 1 EXISTS
+S: \* 1 RECENT
+S: \* OK \[UIDVALIDITY .*
+S: \* OK \[UNSEEN 1\]
+S: \* OK \[PERMANENTFLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\]
+S: \* OK \[UIDNEXT .*\]
+S: 3 OK \[READ-WRITE\] SELECT completed.
+C: 4 FETCH 1 FULL
+S: \* 1 FETCH \(FLAGS \(\\Recent\) INTERNALDATE \".*\" RFC822.SIZE .* ENVELOPE \(\"12 Dec 2008 GMT\" \"Hello\" \(\(NIL NIL "joe" "example.org"\)\) \(\(NIL NIL \"joe\" \"example.org\"\)\) \(\(NIL NIL \"joe\" \"example.org\"\)\) \(\(NIL NIL \"john.smith\" \"localhost\"\)\) NIL NIL NIL \".*\"\) BODY \(\"TEXT\" \"PLAIN\" \(\"charset\" \"us-ascii\"\) NIL NIL \"7BIT\" 16 2\)\)
+S: 4 OK FETCH completed.
+C: END LOGOUT
+S: \* BYE IMAP4rev1 Server logging out
+
+

Added: james/server/trunk/spring-deployment/src/mpt/imap-prep-john-sieve.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/imap-prep-john-sieve.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/imap-prep-john-sieve.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/imap-prep-john-sieve.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,29 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: \* OK JAMES IMAP4rev1 Server.*
+C: abcd CAPABILITY
+S: \* CAPABILITY IMAP4rev1 LITERAL\+ NAMESPACE CHILDREN
+S: abcd OK CAPABILITY completed.
+C: 1 LOGIN john.smith passwd
+S: 1 OK LOGIN completed.
+C: 2 CREATE sub
+S: 2 OK CREATE completed.
+C: END LOGOUT
+S: \* BYE IMAP4rev1 Server logging out
+

Added: james/server/trunk/spring-deployment/src/mpt/imap-sieve.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/imap-sieve.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/imap-sieve.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/imap-sieve.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,38 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: \* OK JAMES IMAP4rev1 Server.*
+C: abcd CAPABILITY
+S: \* CAPABILITY IMAP4rev1 LITERAL\+ NAMESPACE CHILDREN
+S: abcd OK CAPABILITY completed.
+C: 1 LOGIN user passwd 
+S: 1 OK LOGIN completed.
+C: 2 SELECT INBOX
+S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
+S: \* 1 EXISTS
+S: \* 1 RECENT
+S: \* OK \[UIDVALIDITY .*
+S: \* OK \[UNSEEN 1\]
+S: \* OK \[PERMANENTFLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\]
+S: \* OK \[UIDNEXT .*\]
+S: 2 OK \[READ-WRITE\] SELECT completed.
+C: 3 FETCH 1 FULL
+S: \* 1 FETCH \(FLAGS \(\\Recent\) INTERNALDATE \".*\" RFC822.SIZE .* ENVELOPE \(\"12 Dec 2008 GMT\" \"A Test Message\" \(\(NIL NIL "joe" "example.org"\)\) \(\(NIL NIL \"joe\" \"example.org\"\)\) \(\(NIL NIL \"joe\" \"example.org\"\)\) \(\(NIL NIL \"user\" \"localhost\"\)\) NIL NIL NIL \".*\"\) BODY \(\"TEXT\" \"PLAIN\" \(\"charset\" \"us-ascii\"\) NIL NIL \"7BIT\" 29 2\)\)
+S: 3 OK FETCH completed.
+C: END LOGOUT
+S: \* BYE IMAP4rev1 Server logging out

Added: james/server/trunk/spring-deployment/src/mpt/john.smith.sieve
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/john.smith.sieve?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/john.smith.sieve (added)
+++ james/server/trunk/spring-deployment/src/mpt/john.smith.sieve Sat Jan  9 10:44:43 2010
@@ -0,0 +1,6 @@
+require ["fileinto"];
+
+if header :is "Subject" "Hello"
+{
+   fileinto "sub";
+}
\ No newline at end of file

Added: james/server/trunk/spring-deployment/src/mpt/pop3-after-smtp.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/pop3-after-smtp.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/pop3-after-smtp.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/pop3-after-smtp.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,51 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: \+OK .* POP3 server \(JAMES POP3 Server .*
+C: USER john.smith
+S: \+OK
+C: PASS passwd
+S: \+OK Welcome john.smith
+C: STAT
+S: \+OK 1 .*
+C: RETR 1
+S: \+OK Message follows
+S: Message-ID: .*
+S: MIME-Version: 1.0
+S: Return-Path: <jo...@example.org>
+S: Content-Type: text/plain; charset=us-ascii
+S: Content-Transfer-Encoding: 7bit
+S: Delivered-To: john.smith@localhost
+S: Received: from .*
+S: .*by .*
+S: .*for <jo...@localhost>;
+S: .*
+S: Date: .*
+S: From: <jo...@example.org>
+S: To: <jo...@localhost>
+S: Subject: A Test Message
+S:
+S: Simple plain mail content
+S:
+S: .
+C: DELE 1
+S: \+OK Message deleted
+C: STAT
+S: \+OK 0 0
+C: QUIT
+S: \+OK Apache James POP3 Server signing off.

Added: james/server/trunk/spring-deployment/src/mpt/sieve-smtp.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/sieve-smtp.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/sieve-smtp.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/sieve-smtp.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,38 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: 220 .* SMTP Server \(JAMES SMTP Server .*
+C: HELO example.org
+S: 250 .* Hello example.org .*
+C: MAIL FROM:<jo...@example.org>
+S: 250 2.1.0 Sender <jo...@example.org> OK
+C: RCPT TO:<jo...@localhost>
+S: 250 2.1.5 Recipient <jo...@localhost> OK
+C: DATA
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: Date: 12 Dec 2008 GMT
+C: From: <jo...@example.org>
+C: To: <jo...@localhost>
+C: Subject: Hello
+C:
+C: Hello, John!
+C:
+C: .
+S: 250 2.6.0 Message received
+C: QUIT
+S: 221 2.0.0 .* Service closing transmission channel

Added: james/server/trunk/spring-deployment/src/mpt/vut-pop3.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/vut-pop3.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/vut-pop3.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/vut-pop3.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,75 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: \+OK .* POP3 server \(JAMES POP3 Server .*
+C: USER john.smith
+S: \+OK
+C: PASS passwd
+S: \+OK Welcome john.smith
+C: STAT
+S: \+OK 2 .*
+C: RETR 1
+S: \+OK Message follows
+S: Message-ID: .*
+S: MIME-Version: 1.0
+S: Return-Path: <jo...@example.org>
+S: Content-Type: text/plain; charset=us-ascii
+S: Content-Transfer-Encoding: 7bit
+S: Delivered-To: john.smith@localhost
+S: Received: from localhost.*
+S: .*by localhost.*
+S: .*for <jo...@localhost>;
+S: .*
+S: Date: .*
+S: From: <jo...@example.org>
+S: To: <jo...@localhost>
+S: Subject: A Test Message
+S:
+S: Simple plain mail content
+S:
+S: .
+C: RETR 2
+S: \+OK Message follows
+S: Message-ID: .*
+S: MIME-Version: 1.0
+S: Return-Path: <al...@example.org>
+S: Content-Type: text/plain; charset=us-ascii
+S: Content-Transfer-Encoding: 7bit
+S: Delivered-To: john.smith@localhost
+S: Received: from localhost.*
+S: .*by localhost.*
+S: .*for <su...@example.org>;
+S: .*
+S: Date: 13 Dec 2008 GMT
+S: From: <al...@example.org>
+S: To: <su...@example.org>
+S: Subject: Virtual Host Test Message
+S:
+S: This message tests James virtual user mapping.
+S: support@example.org should be mapping to john.smith@localhost
+S: and delivered to that mailbox.
+S:
+S: .
+C: DELE 2
+S: \+OK Message deleted
+C: DELE 1
+S: \+OK Message deleted
+C: STAT
+S: \+OK 0 0
+C: QUIT
+S: \+OK Apache James POP3 Server signing off.

Added: james/server/trunk/spring-deployment/src/mpt/vut-smtp.mpt
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/mpt/vut-smtp.mpt?rev=897413&view=auto
==============================================================================
--- james/server/trunk/spring-deployment/src/mpt/vut-smtp.mpt (added)
+++ james/server/trunk/spring-deployment/src/mpt/vut-smtp.mpt Sat Jan  9 10:44:43 2010
@@ -0,0 +1,55 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+S: 220 .* SMTP Server \(JAMES SMTP Server .*
+C: HELO example.org
+S: 250 .* Hello example.org .*
+C: MAIL FROM:<jo...@example.org>
+S: 250 2.1.0 Sender <jo...@example.org> OK
+C: RCPT TO:<jo...@localhost>
+S: 250 2.1.5 Recipient <jo...@localhost> OK
+C: DATA
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: Date: 12 Dec 2008 GMT
+C: From: <jo...@example.org>
+C: To: <jo...@localhost>
+C: Subject: A Test Message
+C:
+C: Simple plain mail content
+C:
+C: .
+S: 250 2.6.0 Message received
+C: MAIL FROM:<al...@example.org>
+S: 250 2.1.0 Sender <al...@example.org> OK
+C: RCPT TO:<su...@example.org>
+S: 250 2.1.5 Recipient <su...@example.org> OK
+C: DATA
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: Date: 13 Dec 2008 GMT
+C: From: <al...@example.org>
+C: To: <su...@example.org>
+C: Subject: Virtual Host Test Message
+C:
+C: This message tests James virtual user mapping.
+C: support@example.org should be mapping to john.smith@localhost
+C: and delivered to that mailbox.
+C:
+C: .
+S: 250 2.6.0 Message received
+C: QUIT
+S: 221 2.0.0 .* Service closing transmission channel



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org