james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r535161 - in /james/server/trunk: build-tools/base-build.xml include.properties mailet-api/ mailet/ phoenix-deployment/build.xml stage/org.apache.james/jars/mailet-2.3-SNAPSHOT.jar
Date Fri, 04 May 2007 10:50:33 GMT
Author: danny
Date: Fri May  4 03:50:31 2007
New Revision: 535161

URL: http://svn.apache.org/viewvc?view=rev&rev=535161
Log:
fixing the build

Added:
    james/server/trunk/stage/org.apache.james/jars/mailet-2.3-SNAPSHOT.jar   (with props)
Removed:
    james/server/trunk/mailet/
    james/server/trunk/mailet-api/
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?view=diff&rev=535161&r1=535160&r2=535161
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Fri May  4 03:50:31 2007
@@ -182,6 +182,7 @@
                     <include name="${commons-lang.jar}"/>
                     <include name="${commons-configuration.jar}"/>
                     <include name="${jsieve.jar}"/>
+					<include name="${mailet.jar}"/>
                     <include name="${commons-digester.jar}"/>           
                 </fileset>   
             </path>   

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?view=diff&rev=535161&r1=535160&r2=535161
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Fri May  4 03:50:31 2007
@@ -204,6 +204,11 @@
 jarname.commons-digester.jar=commons-digester-1.8.jar
 commons-digester.jar=${path.lib.commonsdigester}/${jarname.commons-digester.jar}
 
+# ----- mailet-----
+jarname.mailet.jar=mailet-2.3-SNAPSHOT.jar
+mailet.jar=${path.lib.james}/${jarname.mailet.jar}
+
+
 # ----- Logging
 jarname.avalon-logkit.jar=avalon-logkit-2.1.jar
 avalon-logkit.jar=${path.lib.logkit}/${jarname.avalon-logkit.jar}

Modified: james/server/trunk/phoenix-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?view=diff&rev=535161&r1=535160&r2=535161
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Fri May  4 03:50:31 2007
@@ -98,6 +98,7 @@
             <include name="${commons-configuration.jar}"/>
 
             <include name="${jsieve.jar}"/>
+			<include name="${mailet.jar}"/>
             <include name="${commons-digester.jar}"/>
             <!-- TODO: include libraries without wildcards -->
             <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
@@ -367,28 +368,7 @@
                 <param name="-tag" value="phoenix\:mx\-isWriteable:X"/>
             </doclet>
         </javadoc>
-        <!-- TODO enable javadoc creation for mailets inside their module!? -->
-        <!--
-        <echo message="Making Mailet Javadocs"/>
-        <javadoc packagenames="org.apache.mailet.*" sourcepath="${java.dir}" destdir="${build.dir}/mailet">
-            <classpath refid="project.class.path"/>
-            <doclet name="com.sun.tools.doclets.standard.Standard">
-                <param name="-author"/>
-                <param name="-version"/>
-                <param name="-breakiterator"/>
-                <param name="-use"/>
-                <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
-                <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
-                <param name="-link" value="http://avalon.apache.org/api"/>
-                <param name="-link" value="http://avalon.apache.org/phoenix/api"/>
-                <param name="-link" value="http://avalon.apache.org/cornerstone/api"/>
-                <param name="-link" value="http://avalon.apache.org/logkit/api"/>
-                <param name="-doctitle" value="Apache Jakarta Mailet API"/>
-                <param name="-windowtitle" value="Apache Jakarta Mailet API"/>
-                <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache
James Project. All Rights Reserved.&quot;"/>
-            </doclet>
-        </javadoc>
-        -->
+        
     </target>
 
     <!--
@@ -479,20 +459,8 @@
 
         <mkdir dir="${build.lib}"/>
 
-        <!-- Make mailet api jar-->
-        <echo message="Making Mailet API Jar (mailet-api-${mailet-api-version}.jar)"/>
-        <jar jarfile="${build.lib}/mailet-api-${mailet-api-version}.jar"
-                 basedir="${build.classes}"
-                 includes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User,org/apache/mailet/MailetException"/>
-
-        <!-- Make mailet implementation jar-->
-        <echo message="Making Mailet Jar (mailet-${mailet-version}.jar)"/>
-        <jar jarfile="${build.lib}/mailet-${mailet-version}.jar"
-                 basedir="${build.classes}"
-                 includes="org/apache/mailet/**"
-                 excludes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User,org/apache/mailet/MailetException"/>
-
-        <!-- Make james jar-->
+        
+        
         <echo message="Making James Jar (${name}-${version}.jar)"/>
         <jar jarfile="${build.lib}/${name}-${version}.jar" basedir="${build.classes}"
manifest="${src.dir}/Manifest.mf">
             <include name="org/apache/james/**"/>
@@ -516,8 +484,6 @@
         <sar sarfile="${build.lib}/${sar-name}.sar" config="${conf.dir}/james-config.xml"
                environment="${conf.dir}/james-server.xml" assembly="${conf.dir}/james-assembly.xml">
             <lib dir="${build.lib}/">
-                <include name="mailet-api-${mailet-api-version}.jar"/>
-                <include name="mailet-${mailet-version}.jar"/>
                 <include name="${name}-${version}.jar"/>
             </lib>
             <lib dir="${lib.dir}/${path.lib.dns}" includes="${jarname.dns.jar}" />
@@ -558,6 +524,7 @@
             <lib dir="${lib.dir}/${path.lib.commonsconfiguration}" includes="${jarname.commons-configuration.jar}"
/>
             <lib dir="${lib.dir}/${path.lib.commonsbeanutils}" includes="${jarname.commons-beanutils.jar}"
/>
             <lib dir="${lib.dir}/${path.lib.james}" includes="${jarname.jsieve.jar}" />
+            <lib dir="${lib.dir}/${path.lib.james}" includes="${jarname.mailet.jar}" />
             <lib dir="${lib.dir}/${path.lib.commonsdigester}" includes="${jarname.commons-digester.jar}"
/>
             <!-- include every api, library and function -->
             <!-- TODO this should list exactly the module defined, without wildcards -->
@@ -604,13 +571,6 @@
 
         <!--installs sar into ./dist/ ready to test-->
         <copy file="${build.lib}/${sar-name}.sar" todir="${dist.dir}/apps"/>
-
-        <!-- Make mailet.jar-->
-        <!-- jar jarfile="${build.lib}/mailet.jar"
-                 basedir="${build.classes}"
-                 manifest="${src.dir}/Manifest.mf"
-                 includes="org/apache/mailet/**"/ -->
-            <!-- copy file="${build.lib}/mailet.jar" todir="${dist.dir}/lib"/ -->
     </target>
 
     <target name='prepare-master-dist'>

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

Propchange: james/server/trunk/stage/org.apache.james/jars/mailet-2.3-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


Mime
View raw message