Changeset 182

Show
Ignore:
Timestamp:
02/23/08 00:25:23 (11 months ago)
Author:
jfp
Message:

changed tiger-javamail to javamail + activation
update dnsjava to 2.0.6

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/jsmtpd/.classpath

    r181 r182  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    55        <classpathentry kind="lib" path="etc"/> 
    6         <classpathentry kind="lib" path="lib/dnsjava-1.6.5.jar"/> 
    76        <classpathentry kind="lib" path="lib/commons-logging.jar"/> 
    87        <classpathentry kind="lib" path="lib/log4j-1.2.9.jar"/> 
    9         <classpathentry kind="lib" path="lib/tiger-javamail-1.0.jar"/> 
    108        <classpathentry kind="lib" path="lib/libclamav-1.0.jar"/> 
    119        <classpathentry kind="lib" path="lib/commons-io-1.3.1.jar"/> 
     10        <classpathentry kind="lib" path="lib/activation.jar"/> 
     11        <classpathentry kind="lib" path="lib/mail.jar"/> 
     12        <classpathentry kind="lib" path="lib/dnsjava-2.0.6.jar"/> 
    1213        <classpathentry kind="output" path="bin"/> 
    1314</classpath> 
  • trunk/jsmtpd/CHANGELOG

    r181 r182  
    11Version 0.x 
     2        changed tiger-javamail to javamail + activation 
     3        update dnsjava to 2.0.6 
    24        Removed old libs 
    35        Refact auth ldap plugin 
  • trunk/jsmtpd/build.xml

    r181 r182  
    11<project name="jsmptd" default="buildFullRelease"> 
    2  
    32        <description>Jsmtpd build file</description> 
    4  
    5         <!-- ################################################ --> 
    6         <!--                   SETTINGS                       --> 
    7         <!-- ################################################ --> 
    8  
    9  
    103         
    114        <property name="release.tmpPath" location="/tmp/jsmtpdtemp" /> 
    125        <property name="release.output" location="/tmp/" /> 
    13          
    146        <property file="build.prop"></property> 
    15          
    167        <property name="src.dir" location="src" /> 
    178        <property name="build.dir" location="bin/" /> 
    189        <property name="release.dir" location="${release.tmpPath}/Jsmtpd/" /> 
    19  
    2010        <tstamp prefix="start"/> 
    2111 
    22          
    23         <path id="libcore"> 
     12        <path id="lib"> 
    2413                <fileset dir="lib/"> 
    2514                        <include name="**/*.jar" /> 
     
    2716                </fileset> 
    2817        </path> 
    29                  
    30         <path id="libplugin"> 
    31                 <fileset dir="plugins/"> 
    32                         <include name="**/*.jar" /> 
    33                         <include name="**/*.zip" /> 
    34                 </fileset> 
    35         </path> 
    3618 
    37         <path id="wholeLibs"> 
    38                 <path refid="libplugin"></path> 
    39                 <path refid="libcore"></path> 
    40         </path> 
    41  
    42         <!-- ################################################ --> 
    43         <!--                  TARGETS                         --> 
    44         <!-- ################################################ --> 
    45          
    4619        <target name="cleanAll" description="deletes class files in the project"> 
    4720                <delete failonerror="false"> 
     
    5326        </target> 
    5427         
    55         <target name="jsmtpd-core-jar" description="package the core of jsmtpd"> 
    56                 <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="libcore" fork="yes"  
    57                         includes="org/jsmtpd/**" encoding="ISO8859_2" 
    58                         excludes="org/jsmtpd/plugins/**"></javac> 
    59                 <jar destfile="${release.dir}/lib/jsmtpd-core.jar" basedir="bin/" includes="org/jsmtpd/**" excludes="org/jsmtpd/plugins/**"/> 
     28        <target name="jsmtpd-jar" description="package jsmtpd"> 
     29                <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib" 
     30                        includes="org/jsmtpd/**" encoding="UTF-8"/> 
     31                <jar destfile="${release.dir}/lib/jsmtpd-core.jar" basedir="bin/" includes="org/jsmtpd/**"/> 
    6032        </target> 
    61                  
    62         <target name="jsmtpd-basicplugins-jar" description="package the basic plugins of jsmtpd"> 
    63                 <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="wholeLibs" fork="yes" encoding="ISO8859_2" 
    64                         includes="org/jsmtpd/plugins/GenericRBLFilter*,org/jsmtpd/plugins/smtpExtension/**,org/jsmtpd/plugins/acls/**,org/jsmtpd/plugins/deliveryServices/**,org/jsmtpd/plugins/dnsServices/**,org/jsmtpd/plugins/filters/builtin/**,org/jsmtpd/plugins/filters/ldap/**"> 
    65                 </javac> 
    66                 <jar destfile="${release.dir}/plugins/basicPlugins.jar" basedir="bin/"  
    67                         includes="org/jsmtpd/plugins/GenericRBLFilter*,org/jsmtpd/plugins/smtpExtension/**,org/jsmtpd/plugins/acls/**,org/jsmtpd/plugins/deliveryServices/**,org/jsmtpd/plugins/dnsServices/**,org/jsmtpd/plugins/filters/builtin/**,org/jsmtpd/plugins/filters/ldap/**" 
    68                 /> 
    69  
    70         </target> 
    71          
    72         <target name="jsmtpd-clamav" description="jsmtpd clamAV plugin"> 
    73                 <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="wholeLibs" fork="yes" encoding="ISO8859_2" 
    74                         includes="org/jsmtpd/plugins/filters/ClamAV/**"> 
    75                 </javac> 
    76                 <mkdir dir="${release.dir}/plugins/filters/ClamAV/"/> 
    77                 <jar destfile="${release.dir}/plugins/filters/ClamAV/jsmtpd-clamav.jar" basedir="bin/"  
    78                         includes="org/jsmtpd/plugins/filters/ClamAV/**"> 
    79                 </jar> 
    80         </target> 
    81                  
    82         <target name="jsmtpd-SA" description="jsmtpd spamassassin plugin"> 
    83                 <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="wholeLibs" fork="yes" encoding="ISO8859_2" 
    84                         includes="org/jsmtpd/plugins/filters/SA/**"> 
    85                 </javac> 
    86                 <mkdir dir="${release.dir}/plugins/filters/SA/"/> 
    87                 <jar destfile="${release.dir}/plugins/filters/SA/jsmtpd-SA.jar" basedir="bin/"  
    88                         includes="org/jsmtpd/plugins/filters/SA/**"> 
    89                 </jar> 
    90         </target> 
    91          
    92         <target name="jsmtpd-snippet" description="jsmtpd signature snippet plugin"> 
    93                 <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="wholeLibs" fork="yes" encoding="ISO8859_2" 
    94                         includes="org/jsmtpd/plugins/filters/snippets/**"> 
    95                 </javac> 
    96                 <jar destfile="${release.dir}/plugins/jsmtpd-snippet.jar" basedir="bin/"  
    97                         includes="org/jsmtpd/plugins/filters/snippets/**"> 
    98                 </jar> 
    99         </target> 
    100          
    101         <target name="jsmtpd-IPFIlters" description="jsmtpd ip check input filters (RBL, blacklist)"> 
    102                 <javac debug="on" srcdir="${src.dir}" destdir="${build.dir}" classpathref="wholeLibs" fork="yes" encoding="ISO8859_2" 
    103                         includes="org/jsmtpd/plugins/inputIPFilters/**"> 
    104                 </javac> 
    105                 <mkdir dir="${release.dir}/plugins/inputIPFilters/"/> 
    106                 <jar destfile="${release.dir}/plugins/inputIPFilters/jsmtpd-inputIPFilters.jar" basedir="bin/"  
    107                         includes="org/jsmtpd/plugins/inputIPFilters/**"> 
    108                 </jar> 
    109         </target> 
    110          
     33                         
    11134        <target name="cleanRelease" description="clean the release output folder"> 
    11235                <delete failonerror="false"> 
    11336                        <fileset dir="${release.dir}" includes="**/*"/> 
    11437                </delete> 
    115  
    11638                <mkdir dir="${build.dir}"/> 
    11739                <mkdir dir="${release.dir}"/> 
     
    17496         
    17597        <target name="packRelease" depends="buildFullRelease"> 
    176                 <!--<zip destfile="${release.output}/Jsmtpd-${start.DSTAMP}${start.TSTAMP}.zip" basedir="${release.tmpPath}"/>--> 
    17798                <tar tarfile="${release.output}/Jsmtpd-${start.DSTAMP}${start.TSTAMP}.tar.bz2" basedir="${release.tmpPath}" compression="bzip2"/> 
    17899                <tar tarfile="${release.output}/Jsmtpd-${start.DSTAMP}${start.TSTAMP}.tar.gz" basedir="${release.tmpPath}" compression="gzip"/> 
    179100        </target> 
    180101         
    181         <target name="buildFullRelease" 
    182                 depends="cleanAll,cleanRelease,jsmtpd-core-jar,jsmtpd-basicplugins-jar,baseRelease,jsmtpd-clamav,jsmtpd-SA,jsmtpd-IPFIlters,jsmtpd-snippet"> 
    183         </target> 
    184          
     102        <target name="buildFullRelease" depends="cleanAll,cleanRelease,jsmtpd-jar,baseRelease"/> 
    185103</project>