james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r167870 - /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/listservcommands /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers
Date Tue, 03 May 2005 06:47:43 GMT
Author: noel
Date: Mon May  2 23:47:42 2005
New Revision: 167870

URL: http://svn.apache.org/viewcvs?rev=167870&view=rev
Log:
merger for matchers and mailets.  just adjust for Mailet API package change

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractNotify.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/Bounce.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/DSNBounce.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/FromRepository.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/GenericListserv.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/LocalDelivery.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/NESSpamCheck.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/RelayLimit.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractNotify.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractNotify.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractNotify.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractNotify.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractRedirect.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/AbstractRedirect.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -39,8 +39,8 @@
 import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.AddressException;
 
-import org.apache.james.util.RFC2822Headers;
-import org.apache.james.util.RFC822DateFormat;
+import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.dates.RFC822DateFormat;
 import org.apache.james.core.MailImpl;
 
 import org.apache.mailet.GenericMailet;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/Bounce.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/Bounce.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/Bounce.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/Bounce.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/ClamAVScan.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.Mail;
 

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/CommandListservProcessor.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -22,7 +22,7 @@
 import org.apache.james.Constants;
 import org.apache.james.services.UsersRepository;
 import org.apache.james.services.UsersStore;
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.james.util.XMLResources;
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.Mail;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/DSNBounce.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/DSNBounce.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/DSNBounce.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/DSNBounce.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -42,8 +42,8 @@
 import org.apache.james.core.MailImpl;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-import org.apache.james.util.RFC2822Headers;
-import org.apache.james.util.RFC822DateFormat;
+import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.dates.RFC822DateFormat;
 import org.apache.james.Constants;
 import org.apache.james.util.mail.MimeMultipartReport;
 

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/FromRepository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/FromRepository.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/FromRepository.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/FromRepository.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -24,7 +24,7 @@
 import org.apache.james.core.MailImpl;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailStore;
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mail;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/GenericListserv.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/GenericListserv.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/GenericListserv.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/GenericListserv.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/LocalDelivery.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/LocalDelivery.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 
 import org.apache.mailet.GenericMailet;
 import org.apache.mailet.Mail;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -21,7 +21,7 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.james.services.UsersRepository;
 import org.apache.james.transport.mailets.ICommandListservManager;
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailets.RFC2822Headers;
 import org.apache.james.util.XMLResources;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/FileRegexMatcher.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -18,7 +18,7 @@
 package org.apache.james.transport.matchers;
 
 import org.apache.oro.text.regex.MalformedPatternException;
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import javax.mail.MessagingException;
 
 /**

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.oro.text.regex.MalformedPatternException;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/NESSpamCheck.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/NESSpamCheck.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/NESSpamCheck.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/NESSpamCheck.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 1999-2004 The Apache Software Foundation.             *
+ * Copyright (c) 1999-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.Mail;
 import org.apache.oro.text.regex.MalformedPatternException;
 

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/RelayLimit.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/RelayLimit.java?rev=167870&r1=167869&r2=167870&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/RelayLimit.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/matchers/RelayLimit.java
Mon May  2 23:47:42 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.james.util.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
 import org.apache.mailet.GenericMatcher;
 import org.apache.mailet.Mail;
 



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


Mime
View raw message