svn commit: r651440 - in /james/server/trunk: ./ build-tools/ phoenix-deployment/ spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ spoolmanager-function/src/main/java/org/apache/james/transport/mailets/debug/ spoolmanager-functio...

[rd...@apache.org]

Author: rdonkin
Date: Thu Apr 24 15:24:10 2008
New Revision: 651440

URL: http://svn.apache.org/viewvc?rev=651440&view=rev
Log:
Moved mailets into standard-mailets. Unfortunately, some existing mailets are coupled to abstract superclasses which were moved. Perhaps these could be moved into mailets-base then standard-mailets could become a deployment dependency only.

Added:
    james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar   (with props)
Removed:
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AbstractAddFooter.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AddFooter.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/AddSubjectPrefix.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/MailAttributesToMimeHeaders.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/Null.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/OnlyText.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoveAllMailAttributes.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoveMailAttribute.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeader.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/SetMailAttribute.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/SetMimeHeader.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/debug/
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/All.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HasAttachment.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HasHeader.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HostIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/RecipientIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SenderIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SubjectIs.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java
    james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/matchers/UserIs.java
Modified:
    james/server/trunk/build-tools/base-build.xml
    james/server/trunk/include.properties
    james/server/trunk/phoenix-deployment/build.xml

Modified: james/server/trunk/build-tools/base-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/base-build.xml?rev=651440&r1=651439&r2=651440&view=diff
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Thu Apr 24 15:24:10 2008
@@ -216,6 +216,7 @@
                     <include name="${commons-configuration.jar}"/>
                     <include name="${jsieve.jar}"/>
                     <include name="${mailet.jar}"/>
+                    <include name="${std-mailet.jar}"/>   
                     <include name="${commons-digester.jar}"/>    
                     <include name="${concurrent.jar}"/>  
                     <include name="${mime4j.jar}"/>     

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=651440&r1=651439&r2=651440&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Thu Apr 24 15:24:10 2008
@@ -232,6 +232,8 @@
 # ----- mailet-----
 jarname.mailet.jar=mailet-3.0-SNAPSHOT.jar
 mailet.jar=${path.lib.james}/${jarname.mailet.jar}
+jarname.std-mailet.jar=apache-james-standard-mailets-1.0-SNAPSHOT.jar
+std-mailet.jar=${path.lib.james}/${jarname.std-mailet.jar}
 jarname.commons-io.jar=commons-io-1.2.jar
 commons-io.jar=${path.lib.commonsio}/${jarname.commons-io.jar}
 

Modified: james/server/trunk/phoenix-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=651440&r1=651439&r2=651440&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Thu Apr 24 15:24:10 2008
@@ -93,7 +93,7 @@
             <include name="${commons-logging.jar}"/>
             <include name="${jdom.jar}"/>
             <include name="${xstream.jar}"/>
-
+            <include name="${std-mailet.jar}"/>
             <include name="${torque.jar}"/>
             <include name="${village.jar}"/>
             <include name="${commons-lang.jar}"/>
@@ -565,6 +565,7 @@
             <lib dir="${lib.dir}/${path.lib.commonsdigester}" includes="${jarname.commons-digester.jar}" />
             <lib dir="${lib.dir}/${path.lib.commonsio}" includes="${jarname.commons-io.jar}" />
             <lib dir="${lib.dir}/${path.lib.james}" includes="${jarname.mime4j.jar}" />
+            <lib dir="${lib.dir}/${path.lib.james}" includes="${jarname.std-mailet.jar}"/>   
             <!-- include every api, library and function -->
             <!-- TODO this should list exactly the module defined, without wildcards -->
             <lib dir="${lib.dir}/${path.lib.james}">

Added: james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar?rev=651440&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/org.apache.james/jars/apache-james-standard-mailets-1.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



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