james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r713949 [1/2] - in /james/mailet/standard/trunk: ./ src/main/java/org/apache/james/transport/mailets/ src/main/java/org/apache/james/transport/mailets/debug/ src/main/java/org/apache/james/transport/matchers/ src/test/java/org/apache/james/...
Date Fri, 14 Nov 2008 07:40:23 GMT
Author: rdonkin
Date: Thu Nov 13 23:40:21 2008
New Revision: 713949

URL: http://svn.apache.org/viewvc?rev=713949&view=rev
Log:
Updated to repackaged version of apache-mailet-base

Added:
    james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar   (with props)
    james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar   (with props)
Removed:
    james/mailet/standard/trunk/stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT-tests.jar
    james/mailet/standard/trunk/stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT.jar
Modified:
    james/mailet/standard/trunk/include.properties
    james/mailet/standard/trunk/pom.xml
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AbstractAddFooter.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddSubjectPrefix.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/LogMessage.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/Null.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/OnlyText.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ServerTime.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMailAttribute.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMimeHeader.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/WrapText.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Counter.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Identity.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHeader.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RelayLimit.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
    james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/UserIs.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java

Modified: james/mailet/standard/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/include.properties?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/include.properties (original)
+++ james/mailet/standard/trunk/include.properties Thu Nov 13 23:40:21 2008
@@ -30,11 +30,11 @@
 
 # ----- Mailet -----
 mailet.jar=stage/org.apache.james/jars/apache-mailet-2.4-SNAPSHOT.jar
-mailet-base.jar=stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT.jar
-mailet-base-tests.jar=stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT-tests.jar
+mailet-base.jar=stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar
+mailet-base-tests.jar=stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar
 
 # ----- JUnit ------
 junit.jar=stage/junit/jars/junit-3.8.1.jar
 
 #------ BND used to OSGi enable build
-bnd.jar=stage/biz.aQute/jars/bnd-0.0.249.jar
\ No newline at end of file
+bnd.jar=stage/biz.aQute/jars/bnd-0.0.249.jar

Modified: james/mailet/standard/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/pom.xml?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/pom.xml (original)
+++ james/mailet/standard/trunk/pom.xml Thu Nov 13 23:40:21 2008
@@ -34,13 +34,13 @@
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>
-    Apache JAMES Standard Mailets is a rich collection of general purpose mailets
+    Apache JAMES Standard Mailets is a rich collection of general purpose mailets
     with limited dependencies. These mailets can be used in any mailet container.
   </description>
   <parent>
-    <groupId>org.apache.james</groupId>
-    <artifactId>james-project</artifactId>
-    <version>1.3</version>
+    <groupId>org.apache.james</groupId>
+    <artifactId>james-project</artifactId>
+    <version>1.3</version>
     <relativePath>../james-project/project/pom.xml</relativePath>
   </parent>
   <url>http://james.apache.org/mailet/standard/</url>
@@ -78,12 +78,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailet-base</artifactId>
+      <artifactId>apache-mailet-base</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailet-base</artifactId>
+      <artifactId>apache-mailet-base</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
       <version>1.0-SNAPSHOT</version>
@@ -190,85 +190,85 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-doap-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>site</id>
-            <phase>site</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-         <doapOptions>
-           <programmingLanguage>java</programmingLanguage>
-           <category>mail</category>
-           <download-page>http://james.apache.org/download.cgi</download-page>
-         </doapOptions>
-
-         <asfExtOptions>
-           <included>true</included>
-           <pmc>http://james.apache.org</pmc>
-           <name>Apache JAMES</name>
-         </asfExtOptions>
-
-        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-doap-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>site</id>
+            <phase>site</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+         <doapOptions>
+           <programmingLanguage>java</programmingLanguage>
+           <category>mail</category>
+           <download-page>http://james.apache.org/download.cgi</download-page>
+         </doapOptions>
+
+         <asfExtOptions>
+           <included>true</included>
+           <pmc>http://james.apache.org</pmc>
+           <name>Apache JAMES</name>
+         </asfExtOptions>
+
+        </configuration>
       </plugin>
     </plugins>
   </build>
   
-   <reporting>
+   <reporting>
     <plugins>
       <plugin>
         <groupId>org.apache.james</groupId>
         <artifactId>maven-mailetdocs-plugin</artifactId>
         <version>1.0-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
-      </plugin> 
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-            <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-6</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <configuration>
-          <excludes>
-            <exclude>NOTICE.txt</exclude>
-            <exclude>LICENSE.txt</exclude>
-            <!-- Generated by Maven -->
-            <exclude>release.properties</exclude>
-            <exclude>dist/**/*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-    </plugins>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.3</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.4.3</version>
+      </plugin> 
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+            <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.0-beta-6</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <configuration>
+          <excludes>
+            <exclude>NOTICE.txt</exclude>
+            <exclude>LICENSE.txt</exclude>
+            <!-- Generated by Maven -->
+            <exclude>release.properties</exclude>
+            <exclude>dist/**/*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+    </plugins>
   </reporting>
   
-</project>
\ No newline at end of file
+</project>

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AbstractAddFooter.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AbstractAddFooter.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AbstractAddFooter.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AbstractAddFooter.java Thu Nov 13 23:40:21 2008
@@ -21,9 +21,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeBodyPart;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java Thu Nov 13 23:40:21 2008
@@ -22,7 +22,7 @@
 package org.apache.james.transport.mailets;
 
 import org.apache.james.transport.matchers.HasHabeasWarrantMark;
-import org.apache.mailet.GenericMailet ;
+import org.apache.mailet.base.GenericMailet ;
 import org.apache.mailet.Mail ;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddSubjectPrefix.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddSubjectPrefix.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddSubjectPrefix.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/AddSubjectPrefix.java Thu Nov 13 23:40:21 2008
@@ -24,9 +24,9 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
-import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.base.RFC2822Headers;
 
 /**
  * Add an prefix (tag) to the subject of a message <br>

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java Thu Nov 13 23:40:21 2008
@@ -21,8 +21,8 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/LogMessage.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/LogMessage.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/LogMessage.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/LogMessage.java Thu Nov 13 23:40:21 2008
@@ -25,7 +25,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import java.io.InputStream;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java Thu Nov 13 23:40:21 2008
@@ -28,7 +28,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/Null.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/Null.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/Null.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/Null.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/OnlyText.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/OnlyText.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/OnlyText.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/OnlyText.java Thu Nov 13 23:40:21 2008
@@ -19,7 +19,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetContext;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java Thu Nov 13 23:40:21 2008
@@ -1,6 +1,6 @@
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import javax.mail.MessagingException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 import java.util.Iterator;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java Thu Nov 13 23:40:21 2008
@@ -27,7 +27,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java Thu Nov 13 23:40:21 2008
@@ -19,8 +19,8 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.mailet.StringUtils;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.StringUtils;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ServerTime.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ServerTime.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ServerTime.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ServerTime.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMailAttribute.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMailAttribute.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMailAttribute.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMailAttribute.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 import java.io.Serializable;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMimeHeader.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMimeHeader.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMimeHeader.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/SetMimeHeader.java Thu Nov 13 23:40:21 2008
@@ -24,7 +24,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage ;
 
-import org.apache.mailet.GenericMailet ;
+import org.apache.mailet.base.GenericMailet ;
 import org.apache.mailet.Mail ;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/StripAttachment.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/StripAttachment.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/StripAttachment.java Thu Nov 13 23:40:21 2008
@@ -1,6 +1,6 @@
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ToProcessor.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ToProcessor.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/ToProcessor.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UnwrapText.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UnwrapText.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UnwrapText.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UnwrapText.java Thu Nov 13 23:40:21 2008
@@ -19,8 +19,8 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.mailet.FlowedMessageUtils;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.FlowedMessageUtils;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/WrapText.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/WrapText.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/WrapText.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/WrapText.java Thu Nov 13 23:40:21 2008
@@ -19,8 +19,8 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.james.util.mailet.FlowedMessageUtils;
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.FlowedMessageUtils;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Counter.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Counter.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Counter.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Counter.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets.debug;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/DumpSystemErr.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets.debug;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/ExceptionThrowingMailet.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets.debug;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetException;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Identity.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Identity.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Identity.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/mailets/debug/Identity.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.mailets.debug;
 
-import org.apache.mailet.GenericMailet;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java Thu Nov 13 23:40:21 2008
@@ -25,7 +25,7 @@
 import java.util.Collection;
 import java.util.ArrayList;
 import javax.mail.MessagingException;
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mail;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/All.java Thu Nov 13 23:40:21 2008
@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
  
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.internet.MimeMessage;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasAttachment.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasAttachment.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasAttachment.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHeader.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHeader.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHeader.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasHeader.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java Thu Nov 13 23:40:21 2008
@@ -22,7 +22,7 @@
 package org.apache.james.transport.matchers;
 
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MatcherConfig;
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java Thu Nov 13 23:40:21 2008
@@ -25,7 +25,7 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MatcherConfig;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetContext;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RelayLimit.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RelayLimit.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RelayLimit.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/RelayLimit.java Thu Nov 13 23:40:21 2008
@@ -21,8 +21,8 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.RFC2822Headers;
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.RFC2822Headers;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.Header;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java Thu Nov 13 23:40:21 2008
@@ -24,7 +24,7 @@
 import java.util.Collection;
 import java.util.StringTokenizer;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java Thu Nov 13 23:40:21 2008
@@ -20,7 +20,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.internet.MimeMessage;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/UserIs.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/UserIs.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/UserIs.java (original)
+++ james/mailet/standard/trunk/src/main/java/org/apache/james/transport/matchers/UserIs.java Thu Nov 13 23:40:21 2008
@@ -21,7 +21,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericRecipientMatcher;
+import org.apache.mailet.base.GenericRecipientMatcher;
 import org.apache.mailet.MailAddress;
 
 import java.util.StringTokenizer;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java Thu Nov 13 23:40:21 2008
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java Thu Nov 13 23:40:21 2008
@@ -21,9 +21,9 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-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.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java Thu Nov 13 23:40:21 2008
@@ -21,10 +21,10 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mailet;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java Thu Nov 13 23:40:21 2008
@@ -29,7 +29,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.mailet.base.test.MockMail;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java Thu Nov 13 23:40:21 2008
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java Thu Nov 13 23:40:21 2008
@@ -21,9 +21,9 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-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.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java Thu Nov 13 23:40:21 2008
@@ -21,9 +21,9 @@
 
 import junit.framework.TestCase;
 
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java Thu Nov 13 23:40:21 2008
@@ -24,11 +24,11 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-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.mailet.GenericMailet;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
+import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
 
 import junit.framework.TestCase;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java Thu Nov 13 23:40:21 2008
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java Thu Nov 13 23:40:21 2008
@@ -21,9 +21,9 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-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.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java Thu Nov 13 23:40:21 2008
@@ -21,10 +21,10 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mailet;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java Thu Nov 13 23:40:21 2008
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java Thu Nov 13 23:40:21 2008
@@ -20,9 +20,9 @@
 
 package org.apache.james.transport.mailets;
 
-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.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java Thu Nov 13 23:40:21 2008
@@ -29,11 +29,11 @@
 
 import junit.framework.TestCase;
 
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.james.test.mock.util.MailUtil;
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.MailUtil;
+import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Matcher;
 
 public abstract class AbstractHasMailAttributeTest extends TestCase {

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java Thu Nov 13 23:40:21 2008
@@ -26,9 +26,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java Thu Nov 13 23:40:21 2008
@@ -33,8 +33,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java Thu Nov 13 23:40:21 2008
@@ -21,11 +21,11 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMimeMessage;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java Thu Nov 13 23:40:21 2008
@@ -20,10 +20,10 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.MailUtil;
 
 import org.apache.mailet.Matcher;
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java Thu Nov 13 23:40:21 2008
@@ -21,10 +21,10 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java Thu Nov 13 23:40:21 2008
@@ -21,10 +21,10 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMailContext;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.james.test.mock.util.MailUtil;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMailContext;
+import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
 
 import javax.mail.MessagingException;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeTest.java Thu Nov 13 23:40:21 2008
@@ -20,7 +20,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 
 public class HasMailAttributeTest extends AbstractHasMailAttributeTest {
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java Thu Nov 13 23:40:21 2008
@@ -20,7 +20,7 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.GenericMatcher;
+import org.apache.mailet.base.GenericMatcher;
 
 import javax.mail.MessagingException;
 import java.util.Collection;

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java?rev=713949&r1=713948&r2=713949&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java Thu Nov 13 23:40:21 2008
@@ -20,8 +20,8 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.test.mock.mailet.MockMatcherConfig;
+import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.MockMatcherConfig;
 
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;



---------------------------------------------------------------------
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