You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by sb...@apache.org on 2004/04/17 19:23:19 UTC
cvs commit: james-server/src/java/org/apache/james/util/mail/handlers multipart_report.java AbstractDataContentHandler.java message_disposition_notification.java
sbrewin 2004/04/17 10:23:19
Modified: . Tag: branch_2_1_fcs build.xml
Added: src/java/org/apache/james/util/mail/mdn Tag: branch_2_1_fcs
ModifierExpired.java TypeDispatched.java
ActionModeManual.java TypeFailed.java
TypeDisplayed.java ModifierFailed.java
DispositionModifier.java MDNFactory.java
DispositionType.java TypeDenied.java
ModifierSuperseded.java SendingModeManual.java
TypeDeleted.java DispositionActionMode.java
ModifierError.java TypeProcessed.java
ActionModeAutomatic.java
ModifierMailboxTerminated.java ModifierWarning.java
SendingModeAutomatic.java
DispositionSendingMode.java Disposition.java
src/java/org/apache/james/util/mail Tag: branch_2_1_fcs
package.html MimeMultipartReport.java
src/meta-inf Tag: branch_2_1_fcs mailcap
src/java/org/apache/james/util/mail/handlers Tag:
branch_2_1_fcs multipart_report.java
AbstractDataContentHandler.java
message_disposition_notification.java
Log:
Added support for MimeMultiPart/report and RFC 2298 Message Delivery Notifications (MDNs).
Revision Changes Path
No revision
No revision
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ModifierExpired.java
Index: ModifierExpired.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ModifierExpired.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/TypeDispatched.java
Index: TypeDispatched.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/TypeDispatched.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ActionModeManual.java
Index: ActionModeManual.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ActionModeManual.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/TypeFailed.java
Index: TypeFailed.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/TypeFailed.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/TypeDisplayed.java
Index: TypeDisplayed.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/TypeDisplayed.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ModifierFailed.java
Index: ModifierFailed.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ModifierFailed.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/DispositionModifier.java
Index: DispositionModifier.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/DispositionModifier.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/MDNFactory.java
Index: MDNFactory.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/MDNFactory.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/DispositionType.java
Index: DispositionType.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/DispositionType.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/TypeDenied.java
Index: TypeDenied.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/TypeDenied.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ModifierSuperseded.java
Index: ModifierSuperseded.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ModifierSuperseded.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/SendingModeManual.java
Index: SendingModeManual.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/SendingModeManual.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/TypeDeleted.java
Index: TypeDeleted.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/TypeDeleted.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/DispositionActionMode.java
Index: DispositionActionMode.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/DispositionActionMode.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ModifierError.java
Index: ModifierError.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ModifierError.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/TypeProcessed.java
Index: TypeProcessed.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/TypeProcessed.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ActionModeAutomatic.java
Index: ActionModeAutomatic.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ActionModeAutomatic.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ModifierMailboxTerminated.java
Index: ModifierMailboxTerminated.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ModifierMailboxTerminated.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/ModifierWarning.java
Index: ModifierWarning.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/ModifierWarning.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/SendingModeAutomatic.java
Index: SendingModeAutomatic.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/SendingModeAutomatic.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/DispositionSendingMode.java
Index: DispositionSendingMode.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/DispositionSendingMode.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/mdn/Disposition.java
Index: Disposition.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/mdn/Disposition.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.116.2.27 +20 -2 james-server/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/james-server/build.xml,v
retrieving revision 1.116.2.26
retrieving revision 1.116.2.27
diff -u -r1.116.2.26 -r1.116.2.27
--- build.xml 16 Apr 2004 21:02:04 -0000 1.116.2.26
+++ build.xml 17 Apr 2004 17:23:18 -0000 1.116.2.27
@@ -75,6 +75,7 @@
<property name="build.docs" value="${build.dir}/docs"/>
<property name="build.mailetdocs" value="${build.dir}/mailetdocs"/>
<property name="build.conf" value="${build.dir}/conf"/>
+ <property name="build.metainf" value="${build.dir}/meta-inf"/>
<!--
===================================================================
@@ -94,6 +95,7 @@
<property name="conf.dir" value="${src.dir}/conf"/>
<property name="xdocs.dir" value="${src.dir}/xdocs"/>
<property name="docs.src" value="${xdocs.dir}"/>
+ <property name="metainf.dir" value="${src.dir}/meta-inf"/>
<property name="constants.file" value="org/apache/james/Constants.java"/>
<property name="poolconn.file" value="org/apache/james/util/mordred/PoolConnEntry.java"/>
@@ -191,6 +193,7 @@
<fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${xdocs.dir}" includes="**/*.xml" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${conf.dir}" includes="**/*.xml" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${metainf.dir}" includes="**/*" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="." includes="build.sh" eol="lf"/>
<fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
<fixcrlf srcdir="." includes="build.xml" eol="lf"/>
@@ -246,6 +249,20 @@
</target>
<!--
===================================================================
+ meta-inf
+
+ Currently a straight copy from source to build.
+ Add augmentions as required.
+ ===================================================================
+ -->
+ <target name="prepare-metainf">
+ <copy todir="${build.metainf}">
+ <fileset dir="${metainf.dir}"/>
+ </copy>
+ </target>
+
+ <!--
+ ===================================================================
jdbc3
===================================================================
-->
@@ -260,7 +277,7 @@
Prepare target
===================================================================
-->
- <target name="prepare" depends="prepare-common,prepare-phoenix,prepare-jdbc3,prepare-mxinfo"/>
+ <target name="prepare" depends="prepare-common,prepare-phoenix,prepare-jdbc3,prepare-mxinfo,prepare-metainf"/>
<!--
===================================================================
@@ -417,6 +434,7 @@
<jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}" manifest="${src.dir}/Manifest.mf">
<include name="org/apache/james/**"/>
<include name="org/apache/mailet/**"/>
+ <metainf dir="${build.metainf}"/>
</jar>
<!-- Make sar file-->
<sar sarfile="${build.lib}/${name}.sar" config="${conf.dir}/james-config.xml" environment="${conf.dir}/james-server.xml" assembly="${conf.dir}/james-assembly.xml">
No revision
No revision
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/package.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/MimeMultipartReport.java
Index: MimeMultipartReport.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/MimeMultipartReport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +0 -0 james-server/src/meta-inf/mailcap
Index: mailcap
===================================================================
RCS file: /home/cvs/james-server/src/meta-inf/mailcap,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/handlers/multipart_report.java
Index: multipart_report.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/handlers/multipart_report.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/handlers/AbstractDataContentHandler.java
Index: AbstractDataContentHandler.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/handlers/AbstractDataContentHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 james-server/src/java/org/apache/james/util/mail/handlers/message_disposition_notification.java
Index: message_disposition_notification.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mail/handlers/message_disposition_notification.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org