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 ba...@apache.org on 2008/08/16 15:29:23 UTC

svn commit: r686498 - in /james/server/trunk: ./ javamail-util/src/main/resources/meta-inf/ sar-deployment/ sar-deployment/phoenix-bin/ sar-deployment/src/ sar-deployment/src/conf/ sar-deployment/src/java/ sar-deployment/src/main/ sar-deployment/src/ma...

Author: bago
Date: Sat Aug 16 06:29:22 2008
New Revision: 686498

URL: http://svn.apache.org/viewvc?rev=686498&view=rev
Log:
sar-deployment is intended to only generate the james.sar file, so
- there's no need to have phoenix-bin included
- we can try to use the common deployment build mechanism.

Added:
    james/server/trunk/javamail-util/src/main/resources/meta-inf/
      - copied from r686488, james/server/trunk/sar-deployment/src/meta-inf/
    james/server/trunk/sar-deployment/src/main/
    james/server/trunk/sar-deployment/src/main/conf/
      - copied from r686488, james/server/trunk/sar-deployment/src/conf/
    james/server/trunk/sar-deployment/src/main/java/
      - copied from r686488, james/server/trunk/sar-deployment/src/java/
    james/server/trunk/sar-deployment/src/main/resources/
    james/server/trunk/sar-deployment/src/test/conf/
    james/server/trunk/sar-deployment/src/test/java/
    james/server/trunk/sar-deployment/src/test/java/org/
      - copied from r686488, james/server/trunk/sar-deployment/src/test/org/
    james/server/trunk/sar-deployment/src/test/resources/
Removed:
    james/server/trunk/sar-deployment/BUILDING.txt
    james/server/trunk/sar-deployment/JAMES_PHOENIX.txt
    james/server/trunk/sar-deployment/README.txt
    james/server/trunk/sar-deployment/UPGRADE.txt
    james/server/trunk/sar-deployment/check-targets.ent
    james/server/trunk/sar-deployment/check-targets.properties
    james/server/trunk/sar-deployment/mailetsdk-build-src.xml
    james/server/trunk/sar-deployment/mailetsdk.properties.sample
    james/server/trunk/sar-deployment/phoenix-bin/
    james/server/trunk/sar-deployment/src/Manifest-mailet.mf
    james/server/trunk/sar-deployment/src/Manifest.mf
    james/server/trunk/sar-deployment/src/conf/
    james/server/trunk/sar-deployment/src/java/
    james/server/trunk/sar-deployment/src/meta-inf/
    james/server/trunk/sar-deployment/src/python/
    james/server/trunk/sar-deployment/src/schema/
    james/server/trunk/sar-deployment/src/test/org/
Modified:
    james/server/trunk/pom.xml
    james/server/trunk/sar-deployment/build.xml
    james/server/trunk/sar-deployment/pom.xml

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=686498&r1=686497&r2=686498&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sat Aug 16 06:29:22 2008
@@ -64,6 +64,7 @@
     <module>experimental-seda-imap-function</module>
     <module>experimental-activemq-function</module>
     <module>jcr-backend-function</module>
+    <module>sar-deployment</module>
     <module>phoenix-deployment</module>
     <module>spring-deployment</module>
   </modules>

Modified: james/server/trunk/sar-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/build.xml?rev=686498&r1=686497&r2=686498&view=diff
==============================================================================
--- james/server/trunk/sar-deployment/build.xml (original)
+++ james/server/trunk/sar-deployment/build.xml Sat Aug 16 06:29:22 2008
@@ -1,9 +1,4 @@
-<?xml version="1.0"?>
-  <!DOCTYPE project [
-    <!ENTITY check-targets SYSTEM "./check-targets.ent">
-  ]>
-
-<!-- James build file -->
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -20,1085 +15,10 @@
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
-  under the License.
+  under the License.    
 -->
-
-<project default="main" basedir=".">
-    <!--
-    Give user a chance to override without editing this file
-    (and without typing -D each time he compiles it)
-    -->
-    <property file=".ant.properties"/>
-    <property file="../.ant.properties"/>
-    <property file="${user.home}/.ant.properties"/>
-    <property file="check-targets.properties"/>
-    <property file="../include.properties"/>
-    <property file="../default.properties"/>
-
-    <!--
-    ===================================================================
-    Set the properties for proposal directories
-    ===================================================================
-    -->
-
-    <property name="proposal.base" value="proposals"/>
-    <property name="proposal.dir" value="${proposal.base}/${proposal.name}"/>
-    <property name="java.proposal.dir" value="${proposal.dir}/java"/>
-    <property name="conf.proposal.dir" value="${proposal.dir}/conf"/>
-
-    <!--
-    ===================================================================
-    Set the properties for build tools directory
-    ===================================================================
-     -->
-
-    <property name="tools.dir" value="tools"/>
-    <property name="tools.lib.dir" value="${tools.dir}/lib"/>
-
-    <!--
-    ===================================================================
-    Set the classpath
-    ===================================================================
-    -->
-
-    <path id="project.class.path">
-        <fileset dir="${lib.dir}">
-            <include name='${jms-spec.jar}'/>
-            <include name='${activemq-core.jar}'/>    
-            <include name="${avalon-framework.jar}"/>
-            <include name="${avalon-framework-impl.jar}"/>
-            <include name="${dns.jar}"/>
-            <include name="${commons-collections.jar}"/>
-            <include name="${commons-dbcp.jar}"/>
-            <include name="${commons-pool.jar}"/>
-            <include name="${jakarta-oro.jar}"/>
-            <include name="${excalibur-pool-api.jar}"/>
-            <include name="${excalibur-pool-impl.jar}"/>
-            <include name="${excalibur-thread-api.jar}"/>
-            <include name="${excalibur-datasource.jar}"/>
-            <include name="${cornerstone-threads-api.jar}"/>
-            <include name="${cornerstone-connection-api.jar}"/>
-            <include name="${cornerstone-connection-impl.jar}"/>
-            <include name="${cornerstone-store-api.jar}"/>
-            <include name="${cornerstone-scheduler-api.jar}"/>
-            <include name="${cornerstone-sockets-api.jar}"/>
-            <include name="${cornerstone-datasources-api.jar}"/>
-            <include name="${javax-mail.jar}"/>
-            <include name="${javax-activation.jar}"/>
-            <include name="${bcmail.jar}"/>
-            <include name="${bcmail-workaround.jar}"/>
-            <include name="${javax.management}"/>
-            <include name="${jspf.jar}"/>
-            <include name="${mstor.jar}"/>
-            <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}"/>
-            <include name="${commons-configuration.jar}"/>
-            <include name="${base-mailet.jar}"/>
-            <include name="${jsieve.jar}"/>
-            <include name="${mailet.jar}"/>
-            <include name="${commons-digester.jar}"/>
-            <include name="${mime4j.jar}"/>
-            <include name="${commons-io.jar}"/>   
-            <include name="${jackrabbit-api.jar}"/>
-            <include name="${jackrabbit-commons.jar}"/>
-            <include name="${jackrabbit-rmi.jar}"/>
-            <include name="${jcr.jar}"/>
-            <!-- TODO: include libraries without wildcards -->
-            <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
-            <include name="${path.lib.james}/${jars-prefix}*-util-${version}.jar"/>
-            <include name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
-            <include name="${path.lib.james}/${jars-prefix}*-function-${version}.jar"/>
-        </fileset>
-        <pathelement path="${java.class.path}" />
-        <pathelement path="${build.classes}" />
-    </path>
-
-    <path id="tools.class.path">
-        <fileset dir="${tools.lib.dir}">
-            <include name="*.jar"/>
-        </fileset>
-    </path>
-
-    <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
-        <classpath refid="tools.class.path"/>
-    </taskdef>
-
-    <property name='name.module' value='phoenix-deployment'/>
-    <import file='../build-tools/module-build.xml' optional='no'/>
-
-    <!--
-    ===================================================================
-                                Dependency Check
-    ===================================================================
-    -->
-
-    &check-targets;
-    <target name="check-dependencies" depends="javamail-check,activation-check"/>
-
-    <!--
-    ===================================================================
-                                  Main target
-    ===================================================================
-    -->
-    <target name="main" depends="dist-lite"/>
-
-    <!--
-    ===================================================================
-    Prepare-common target - common tasks executed in preparation for
-    all targets
-    ===================================================================
-    -->
-    <target name="prepare-common" depends="check-dependencies">
-
-        <echo message="Preparing code"/>
-
-        <tstamp/>
-        <available file="${james.dir}/${phoenix.dir}/bin" type="dir" property="phoenix.bin.present"/>
-        <mkdir dir="${dist.dir}"/>
-        <copy todir="${dist.dir}">
-            <fileset dir=".">
-                <include name="LICENSE.txt"/>
-                <include name="README.txt"/>
-                <include name="NOTICE.txt"/>
-                <include name="UPGRADE.txt"/>
-            </fileset>
-        </copy>
-        <!-- TODO fixcrlf should be done in each submodule -->
-        <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
-        <fixcrlf srcdir="${java.dir}" includes="**/*.minfo" eol="lf" tab="remove" tablength="4" />
-        <fixcrlf srcdir="${java.dir}" includes="**/*.xinfo" eol="lf" tab="remove" tablength="4" />
-        <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
-        <fixcrlf srcdir="${junitjava.dir}" includes="**/*.java" 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.xml" eol="lf"/>
-        <!-- moved to core-library/build.xml -->
-        <!--
-        <mkdir dir="${build.src}"/>
-        <copy todir="${build.src}">
-            <fileset dir="${java.dir}">
-                <include name="${constants.file}"/>
-            </fileset>
-        </copy>
-        <replace file="${build.src}/${constants.file}" token="@@VERSION@@" value="${version}"/>
-        <replace file="${build.src}/${constants.file}" token="@@NAME@@" value="${Name}"/>
-        <replace file="${build.src}/${constants.file}" token="@@DATE@@" value="${TODAY}"/>
-        -->
-
-    </target>
-
-    <!--
-    ===================================================================
-    Copy files, set permissions and line feeds for the packaged Phoenix distribution
-    ===================================================================
-    -->
-    <target name="prepare-phoenix" depends="prepare-common" if="phoenix.bin.present">
-        <echo message="Phoenix distribution present - adjusting linefeeds and permissions, copying files"/>
-        <property name="dist.bin" value="${dist.dir}/bin"/>
-        <fixcrlf srcdir="${james.dir}/${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
-
-        <copy todir="${dist.dir}">
-            <fileset dir="${phoenix.dir}">
-            </fileset>
-        </copy>
-
-        <copy todir="${dist.dir}/lib" flatten="true">
-            <fileset dir="${lib.dir}">
-                <include name="${excalibur-thread-api.jar}"/>
-                <include name="${excalibur-thread-impl.jar}"/>
-                <include name="${excalibur-pool-impl.jar}"/>
-                <include name="${excalibur-pool-api.jar}"/>
-                <include name="${commons-collections.jar}"/>
-                <!-- needed by excalibur-pool-impl-2.1.jar -->
-                <include name="${concurrent.jar}"/>
-            </fileset>
-        </copy>
-
-        <fixcrlf srcdir="${james.dir}/${phoenix.dir}/bin" includes="james-server.sh" eol="lf"/>
-        <fixcrlf srcdir="${dist.bin}" includes="run.sh" eol="lf"/>
-        <fixcrlf srcdir="${dist.bin}" includes="run.bat" eol="crlf"/>
-        <chmod perm="+x">
-            <fileset dir="${dist.bin}">
-                <include name="run.sh"/>
-                <include name="phoenix.sh"/>
-                <include name="james-server.sh"/>
-            </fileset>
-        </chmod>
-
-        <!--
-        ===================================================================
-        Copy files, set permissions and line feeds for sendmail wrapper
-        ===================================================================
-        -->
-
-        <copy todir="${dist.bin}">
-          <fileset dir="./src/python/">
-            <include name="sendmail.py"/>
-          </fileset>
-        </copy>
-
-        <fixcrlf srcdir="${dist.bin}" includes="sendmail.py" eol="lf"/>
-        <chmod perm="+x">
-          <fileset dir="${dist.bin}">
-              <include name="sendmail.py"/>
-          </fileset>
-        </chmod>
-
-    </target>
-
-    <!--
-    ===================================================================
-                                   jmx
-    ===================================================================
-    -->
-
-    <!-- Make .xinfo, .mxinfo and manifest automatically for blocks -->
-    <target name="prepare-mxinfo">
-        <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
-            <classpath refid="tools.class.path"/>
-        </taskdef>
-
-        <mkdir dir="${build.classes}" />
-
-        <generatemeta dest="${build.classes}">
-            <fileset dir="${java.dir}">
-                <include name="**/*.java"/>
-            </fileset>
-        </generatemeta>
-
-    </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>
-
-    <!--
-    ===================================================================
-                                  Prepare target
-    ===================================================================
-    -->
-    <target name="prepare" depends="prepare-common,prepare-phoenix,prepare-mxinfo,prepare-metainf"/>
-
-    <!--
-    ===================================================================
-                                  compile
-    ===================================================================
-    -->
-    <target name="compile" depends="compile-main, compile-proposal"/>
-
-    <target name="compile-main" depends="prepare">
-        <echo message="Compiling James Java sources"/>
-        <mkdir dir="${build.classes}"/>
-        <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" target="${jdk.target}" source="${jdk.source}">
-            <classpath refid="project.class.path"/>
-            <!--
-            <src path="${build.src}"/>
-             -->
-            <src path="${java.dir}"/>
-            <!--
-            <exclude name="${constants.file}"/>
-             -->
-        </javac>
-        <copy todir="${build.classes}">
-            <fileset dir="${java.dir}">
-                <include name="**/*.properties"/>
-                <include name="**/*.xinfo"/>
-                <include name="**/*.xml"/>
-                <include name="**/*.mxinfo"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Compiles the proposal source, only if proposal.name is specified. -->
-    <target name="compile-proposal" depends="prepare" if="proposal.name">
-        <echo message="Compiling the ${proposal.name} proposal."/>
-        <!-- Now build the proposal source over those classes -->
-        <javac destdir="${build.classes}"
-               debug="${debug}"
-               optimize="${optimize}"
-               deprecation="${deprecation}" target="${jdk.target}" source="${jdk.source}">
-            <classpath refid="project.class.path" />
-            <src path="${java.proposal.dir}"/>
-        </javac>
-
-        <!-- Copy .xinfo and .properties files from the proposal source -->
-        <copy todir="${build.classes}" overwrite="on">
-             <fileset dir="${java.proposal.dir}">
-                 <include name="**/*.properties"/>
-                 <include name="**/*.xinfo"/>
-             </fileset>
-        </copy>
-    </target>
-
-
-    <!--
-    ===================================================================
-                                  Javadocs, and mailet javadocs
-    ===================================================================
-    -->
-    <target name="javadocs">
-
-        <echo message="Making James Javadocs"/>
-<!--
-        <delete dir="${build.javadocs}"/>
-        <mkdir dir="${build.javadocs}"/>
-        <javadoc packagenames="org.apache.*" sourcepath="" destdir="${build.javadocs}">
-            <classpath refid="project.class.path"/>
-            <doclet name="com.sun.tools.doclets.standard.Standard">
-                <param name="-author"/>
-                <param name="-version"/>
-                <param name="-use"/>
-                <param name="-breakiterator"/>
-                <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="${Name} ${version}"/>
-                <param name="-windowtitle" value="${Name} API"/>
-                <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache James Project. All Rights Reserved.&quot;"/>
-                <param name="-tag" value="phoenix\:mx\-topic:X"/>
-                <param name="-tag" value="phoenix\:mx\-operation:X"/>
-                <param name="-tag" value="phoenix\:mx\-description:X"/>
-                <param name="-tag" value="phoenix\:mx\-attribute:X"/>
-                <param name="-tag" value="phoenix\:mx\-isWriteable:X"/>
-            </doclet>
-            <sourcefiles>
-              <fileset dir='${java.dir}'>
-                <include name='**/*.java'/> 
-              </fileset>
-              <fileset dir='..'>
-                <include name='*/${dir.src.java}/**/*.java'/> 
-              </fileset>
-            </sourcefiles>
-        </javadoc>
-    -->    
-    </target>
-
-    <!--
-    ===================================================================
-                                  build xdocs
-    ===================================================================
-    -->
-    <target name="xdocs" depends="prepare">
-        <mkdir dir="${build.docs}" />
-        <style style="${docs.src}/stylesheets/site.xsl"
-                  basedir="${docs.src}/"
-                  destdir="${build.docs}/"
-                  includes="**/*.xml" >
-        </style>
-        <copy todir="${build.docs}" filtering="no">
-            <fileset dir="${docs.src}">
-                <include name="**/*.css"/>
-            </fileset>
-        </copy>
-        <copy todir="${build.docs}/images" filtering="no">
-            <fileset dir="${docs.src}/images">
-                <include name="**/*.gif"/>
-                <include name="**/*.jpeg"/>
-                <include name="**/*.jpg"/>
-                <include name="**/*.png"/>
-            </fileset>
-        </copy>
-        <mkdir dir="${dist.dir}/docs"/>
-        <copy todir="${dist.dir}/docs" filtering="no">
-            <fileset dir="${build.docs}"/>
-        </copy>
-    </target>
-
-    <!--
-    ===================================================================
-                                build   website
-    ===================================================================
-    -->
-    
-    <target name="website" depends="xdocs,javadocs">
-
-        <echo message="preparing website in ${www.dir}"/>
-        <mkdir dir='${www.dir}'/>
-        <delete>
-            <fileset dir="${www.dir}">
-                <exclude name="rfclist/**"/>
-                <exclude name="javadocs/**"/>
-                <exclude name="mailet/**"/>
-            </fileset>
-        </delete>
-
-        <copy todir="${www.dir}" filtering="no">
-            <fileset dir="${build.docs}"/>
-        </copy>
-        <copy todir="${www.dir}" filtering="no">
-            <fileset dir="${build.dir}">
-                <include name="javadocs/**"/>
-                <include name="mailet/**"/>
-            </fileset>
-        </copy>
-        <fixcrlf srcdir="${www.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
-        <fixcrlf srcdir="${www.dir}" includes="**/*.css" eol="lf" tab="remove" tablength="4" />
-    </target>
-
-    <!--
-    ===================================================================
-                Build everything
-    ===================================================================
-    -->
-    <!-- removed website from depends list: it does not belong to the phoenix deployment -->
-    <target name="everything" depends="clean,run-unit-tests,dist-bin,dist-src,dist-mailet-SDK"/>
-    
-
-    <!--
-    ===================================================================
-                                  Build all distributions
-    ===================================================================
-    -->
-    <target name="dist" depends="clean,run-unit-tests,dist-bin,dist-src,dist-mailet-SDK"/>
-
-    <!--
-    ===================================================================
-                                  Make james and mailet jars
-    ===================================================================
-    -->
-
-    <target name="jar" depends="compile">
-
-        <mkdir dir="${build.lib}"/>
-
-        
-        
-        <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/**"/>
-            <include name="*.xml"/>
-            <metainf dir="${build.metainf}"/>
-        </jar>
-
-    </target>
-
-    <!--
-    ===================================================================
-                                  Make james.sar
-    ===================================================================
-    -->
-
-    <target name="sar" depends="jar">
-
-        <echo message="Making James Sarfile (james.sar)"/>
-
-        <!-- Make sar file-->
-        <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="${name}-${version}.jar"/>
-            </lib>
-            <lib dir='${lib.dir}/${path.lib.activeio}' includes='${jarname.activeio}'/>
-            <lib dir='${lib.dir}/${path.lib.geronimo}'>
-                <include name='${jarname.j2ee-management-spec}'/>
-                <include name='${jarname.jms-spec}'/>
-            </lib>   
-            <lib dir='${lib.dir}/${path.lib.activemq}'>
-                <include name='${jarname.activemq-web}'/>
-                <include name='${jarname.activemq-console}'/>
-                <include name='${jarname.activemq-core}'/>
-                <include name='${jarname.activemq-jaas}'/>    
-             </lib>   
-             <lib dir='${lib.dir}/${path.lib.jackrabbit}'>
-                <include name='${jarname.jackrabbit-api}'/>
-                <include name='${jarname.jackrabbit-commons}'/>
-                <include name='${jarname.jackrabbit-rmi}'/>    
-             </lib>   
-            <lib dir="${lib.dir}/${path.lib.jcr}" includes="${jarname.jcr}" />   
-            <lib dir='${lib.dir}/concurrent/jars'>
-                <include name='backport-util-concurrent-2.1.jar'/>
-            </lib>    
-            <lib dir="${lib.dir}/${path.lib.dns}" includes="${jarname.dns.jar}" />
-            <lib dir="${lib.dir}/${path.lib.oro}" includes="${jarname.jakarta-oro.jar}" />
-            <lib dir="${lib.dir}/${path.lib.derby}" includes="${jarname.derby.jar}" />
-            <lib dir="${lib.dir}/${path.lib.excaliburdatasource}" includes="${jarname.excalibur-datasource.jar}" />
-            <lib dir="${lib.dir}/${path.lib.activation}" includes="${jarname.javax-activation.jar}" />
-            <lib dir="${lib.dir}/${path.lib.javamail}" includes="${jarname.javax-mail.jar}" />
-            <lib dir="${lib.dir}/${path.lib.commonsdbcp}" includes="${jarname.commons-dbcp.jar}" />
-            <lib dir="${lib.dir}/${path.lib.commonspool}" includes="${jarname.commons-pool.jar}" />
-            <lib dir="${lib.dir}/${path.lib.excaliburthread}" includes="${jarname.excalibur-thread-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.excaliburthread}" includes="${jarname.excalibur-thread-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.excaliburpool}" includes="${jarname.excalibur-pool-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.excaliburpool}" includes="${jarname.excalibur-pool-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.commonscollections}" includes="${jarname.commons-collections.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonethreads}" includes="${jarname.cornerstone-threads-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonethreads}" includes="${jarname.cornerstone-threads-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstoneconnection}" includes="${jarname.cornerstone-connection-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstoneconnection}" includes="${jarname.cornerstone-connection-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonestore}" includes="${jarname.cornerstone-store-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonescheduler}" includes="${jarname.cornerstone-scheduler-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonescheduler}" includes="${jarname.cornerstone-scheduler-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonesockets}" includes="${jarname.cornerstone-sockets-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonesockets}" includes="${jarname.cornerstone-sockets-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonedatasources}" includes="${jarname.cornerstone-datasources-api.jar}" />
-            <lib dir="${lib.dir}/${path.lib.cornerstonedatasources}" includes="${jarname.cornerstone-datasources-impl.jar}" />
-            <lib dir="${lib.dir}/${path.lib.concurrent}" includes="${jarname.concurrent.jar}" />
-            <lib dir="${lib.dir}/${path.lib.james}" includes="${jarname.jspf.jar}" />
-            <lib dir="${lib.dir}/${path.lib.mstor}" includes="${jarname.mstor.jar}" />
-            <lib dir="${lib.dir}/${path.lib.commonslogging}" includes="${jarname.commons-logging.jar}" />
-            <lib dir="${lib.dir}/${path.lib.jdom}" includes="${jarname.jdom.jar}" />
-            <lib dir="${lib.dir}/${path.lib.xstream}" includes="${jarname.xstream.jar}" />
-            <lib dir="${lib.dir}/${path.lib.torque}" includes="${jarname.torque.jar}" />
-            <lib dir="${lib.dir}/${path.lib.village}" includes="${jarname.village.jar}" />
-            <lib dir="${lib.dir}/${path.lib.commonslang}" includes="${jarname.commons-lang.jar}" />
-            <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}" />
-            <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}"/>   
-            <lib dir="${lib.dir}/${path.lib.james}" includes="${jarname.base-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}">
-              <include name="${jars-prefix}*-api-${version}.jar" />
-              <include name="${jars-prefix}*-util-${version}.jar" />
-              <include name="${jars-prefix}*-library-${version}.jar" />
-              <include name="${jars-prefix}*-function-${version}.jar" />
-            </lib>
-            <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
-                <include name="sqlResources.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/mailboxManagerSqlResources.xml">
-                <include name="mailboxManagerSqlResources.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/james-fetchmail.xml">
-                <include name="james-fetchmail.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/james-smtphandlerchain.xml">
-                <include name="james-smtphandlerchain.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/miResources.xml">
-                <include name="miResources.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/james-listmanager.xml">
-                <include name="james-listmanager.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/james-liststores.xml">
-                <include name="james-liststores.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}" fullpath="conf/james-jms.xml">
-                <include name="james-jms.xml"/>
-            </zipfileset>
-            <zipfileset dir="${conf.dir}/samples/fetchmail" prefix="conf/samples/fetchmail">
-                <include name="*.xml"/>
-            </zipfileset>
-        </sar>
-    </target>
-
-    <!--
-    ===================================================================
-                                  Make dist directory with unpacked dist ready to run
-    ===================================================================
-    -->
-    <target name="dist-lite" depends="sar">
-
-        <echo message="Installing James to ${dist.dir}"/>
-
-        <!--installs sar into ./dist/ ready to test-->
-        <copy file="${build.lib}/${sar-name}.sar" todir="${dist.dir}/apps"/>
-    </target>
-
-    <target name='prepare-master-dist'>
-        <mkdir dir='${dir.master.dist}'/>
-        <mkdir dir='${dir.master.dist}/bin'/>
-        <mkdir dir='${dir.master.dist}/src'/>
-    </target>
-
-    <!--
-    ===================================================================
-                                  binary distributions
-    ===================================================================
-    -->
-
-    <target name="dist-bin-phoenix-warn" depends="dist-bin-common, prepare-master-dist" unless="phoenix.bin.present">
-        <echo message ="The Phoenix distribution is not present - the James w/Phoenix binary distribution will not be built."/>
-    </target>
-
-    <target name="dist-bin-phoenix" depends="dist-bin-common" if="phoenix.bin.present">
-        <echo message ="Building binary w/Phoenix distributions"/>
-        <property
-            name='dist.binary.file.zip'
-            value='${dist.binary.dir}/${name}-binary-${version}.zip'/>
-        <zip zipfile="${dist.binary.file.zip}">
-            <fileset dir="dist">
-                <include name="${name}-${version}/**"/>
-                <exclude name="${name}-${version}/downloads/**"/>
-                <include name="LICENSE.txt"/>
-                <include name="README.txt"/>
-                <include name="NOTICE.txt"/>
-                <include name="UPGRADE.txt"/>
-            </fileset>
-        </zip>
-        <copy todir='${dir.master.dist}/bin' file='${dist.binary.file.zip}'/>
-        <property
-            name='dist.binary.file.tgz'
-            value='${dist.binary.dir}/${name}-binary-${version}.tar.gz'/>
-        <tar longfile="gnu" tarfile="${dist.binary.dir}/${name}-binary-${version}.tar">
-            <tarfileset dir="dist" username="${name}" group="${name}">
-                <include name="${name}-${version}/**"/>
-                <exclude name="${name}-${version}/downloads/**"/>
-                <include name="LICENSE.txt"/>
-                <include name="README.txt"/>
-                <include name="NOTICE.txt"/>
-                <include name="UPGRADE.txt"/>
-            </tarfileset>
-        </tar>
-        <gzip zipfile="${dist.binary.file.tgz}"
-            src="${dist.binary.dir}/${name}-binary-${version}.tar"/>
-        <delete file="${dist.binary.dir}/${name}-binary-${version}.tar"/>
-        <copy todir='${dir.master.dist}/bin' file='${dist.binary.file.tgz}'/>
-    </target>
-
-    <!-- removed xdocs from depends list -->
-    <!-- target name="dist-bin-common" depends="dist-lite,javadocs" -->
-    <target name="dist-bin-common" depends="dist-lite">
-        <echo message ="Building binary distributions"/>
-        <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
-        <mkdir dir="${dist.binary.dir}"/>
-        <!-- Sar only-->
-        <copy file="${dist.dir}/apps/${sar-name}.sar" todir="${dist.binary.dir}"/>
-    </target>
-
-    <target name="dist-bin" depends="dist-bin-common,dist-bin-phoenix-warn,dist-bin-phoenix"/>
-
-    <!--
-    ===================================================================
-                                  source distributions
-    ===================================================================
-    -->
-    <target name="dist-src-phoenix-warn" depends="dist-src-common" unless="phoenix.bin.present">
-        <echo message ="The Phoenix distribution is not present - the James source distribution with Phoenix binaries will not be built."/>
-    </target>
-
-    <target name="dist-src-phoenix" depends="dist-src-common, prepare-master-dist" if="phoenix.bin.present">
-        <!--Source With Phoenix -->
-        <echo message ="Building source distributions with Phoenix binaries"/>
-        <property
-            name='dist.src.file.zip'
-            value='${dist.source.dir}/${name}-with-phoenix-${version}-src.zip'/>
-        <zip zipfile="${dist.src.file.zip}">
-            <fileset dir="..">
-                <include name='build-tools/*.xml'/>   
-                <include name="*.txt"/>
-                <include name="*/*.txt"/>   
-                <include name="build.*"/>
-                <include name="*/build.*"/>   
-                <include name="lib/**"/>
-                <include name="*/lib/**"/>   
-                <include name="sar-deployment/${phoenix.dir}/**"/>
-                <include name="src/**"/>
-                <include name="*/src/**"/>   
-                <include name="tools/**"/>
-                <include name="*/tools/**"/>   
-                <include name="*/*.properties" />   
-                <include name="*.properties" />
-                <include name="*/*.ent" />
-                <include name="*.ent" />  
-            </fileset>
-        </zip>
-        <copy todir='${dir.master.dist}/src' file='${dist.src.file.zip}'/>
-        <property
-            name='dist.src.file.tgz'
-            value='${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz'/>
-        <tar longfile="gnu" tarfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar">
-            <tarfileset dir=".." username="${name}" group="${name}">
-                <include name='build-tools/*.xml'/>   
-                <include name="*.txt"/>
-                <include name="*/*.txt"/>   
-                <include name="build.*"/>
-                <include name="*/build.*"/>   
-                <include name="lib/**"/>
-                <include name="*/lib/**"/>   
-                <include name="sar-deployment/${phoenix.dir}/**"/>
-                <include name="src/**"/>
-                <include name="*/src/**"/>   
-                <include name="tools/**"/>
-                <include name="*/tools/**"/>   
-                <include name="*/*.properties" />   
-                <include name="*.properties" />
-                <include name="*/*.ent" />
-                <include name="*.ent" />   
-            </tarfileset>
-        </tar>
-        <gzip zipfile="${dist.src.file.tgz}"
-             src="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
-        <copy todir='${dir.master.dist}/src' file='${dist.src.file.tgz}'/>
-        <delete file="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
-    </target>
-
-    <!-- removed xdocs from depends list -->
-    <target name="dist-src-common" depends="dist-lite,javadocs">
-        <echo message ="Building source distributions"/>
-
-        <property name="dist.source.dir" value="${dist.dir}/downloads/src"/>
-        <mkdir dir="${dist.source.dir}"/>
-        <zip zipfile="${dist.source.dir}/${dist.name}-src.zip">
-            <fileset dir="..">
-                <include name='build-tools/*.xml'/>   
-                <include name="*/src/**"/>
-                <include name="*/lib/**"/>
-                <include name="*/tools/**"/>
-                <include name="*.txt"/>
-                <include name="*/*.txt"/>   
-                <include name="build.*"/>
-                <include name="*/build.*"/>   
-                <include name="*.properties" />
-                <include name="*/*.properties" />
-                <include name="*.ent" />   
-                <include name="*/*.ent" />
-            </fileset>
-        </zip>
-        <tar longfile="gnu" tarfile="${dist.source.dir}/${dist.name}-src.tar">
-            <tarfileset dir=".." username="${name}" group="${name}">
-                <include name='build-tools/*.xml'/>   
-                <include name="*/src/**"/>
-                <include name="*/lib/**"/>
-                <include name="*/tools/**"/>
-                <include name="*.txt"/>
-                <include name="*/*.txt"/>   
-                <include name="build.*"/>
-                <include name="*/build.*"/>   
-                <include name="*.properties" />
-                <include name="*/*.properties" />
-                <include name="*.ent" />   
-                <include name="*/*.ent" />
-            </tarfileset>
-        </tar>
-        <gzip zipfile="${dist.source.dir}/${dist.name}-src.tar.gz" src="${dist.source.dir}/${dist.name}-src.tar"/>
-        <delete file="${dist.source.dir}/${dist.name}-src.tar"/>
-    </target>
-
-    <target name="dist-src" depends="dist-src-common,dist-src-phoenix-warn,dist-src-phoenix"/>
-
-    <!--
-    ===================================================================
-                                  Mailet SDK distribution
-    ===================================================================
-    -->
-    <!-- removed xdocs from depends list -->
-    <target name="dist-mailet-SDK" depends="dist-lite,javadocs, prepare-master-dist">
-
-        <echo message ="building mailet SDK distributions"/>
-
-        <property name='sdk' value='MailetSDK'/>
-        <property name='sdk.dir' value='${dist.dir}/${sdk}'/>
-        <property name='sdk.stem' value='${name}-${sdk}-${version}'/>
-        <property name='sdk.lib' value='${sdk.dir}/lib'/>
-        <property name='sdk.lib.build' value='${sdk.lib}/build'/>
-        <property name='sdk.lib.mailet' value='${sdk.lib}/mailet'/>
-        <property name='sdk.lib.user' value='${sdk.lib}/user'/>
-        <property name='sdk.lib.test' value='${sdk.lib}/test'/>
-        <property name='api.src' value='${sdk.dir}/api/src'/>
-        <property name='sdk.samples.src' value='${sdk.dir}/samples/java'/>
-        <property name='sdk.usr.src' value='${sdk.dir}/src'/>
-        <property name='sdk.conf' value='${sdk.usr.src}/conf'/>
-        <property name='api.docs' value='${sdk.dir}/api/javadocs'/>
-        <property name='dist.downloads.bin' value='${dist.dir}/downloads/bin'/>
-
-        <mkdir dir="${dist.downloads.bin}"/>
-        <mkdir dir="${api.src}"/>
-        <mkdir dir="${api.docs}"/>
-        <mkdir dir="${sdk.samples.src}"/>
-        <mkdir dir='${sdk.usr.src}/java'/>
-        <mkdir dir='${sdk.usr.src}/test'/>
-        <mkdir dir='${sdk.lib.build}'/>
-        <mkdir dir='${sdk.lib.mailet}'/>
-        <mkdir dir="${sdk.lib.user}"/>
-        <mkdir dir="${sdk.lib.test}"/>
-        <mkdir dir='${sdk.conf}'/>
-
-        <echo file='${sdk.usr.src}/README.txt'>Mailet SDK is an environment aimed at Mailet developers.
-        It contains a basic framework for developing mailets and deploying them as part of James.</echo>
-
-        <!-- TODO reenable copying of api source and docs -->
-        <!--
-        <copy todir="${api.src}">
-            <fileset dir="src">
-                <include name="**/mailet/**"/>
-            </fileset>
-        </copy>
-        <copy todir="${api.docs}">
-            <fileset dir="${build.dir}/mailet">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-         -->
-        <copy todir='${sdk.samples.src}'>
-            <fileset dir="${junitjava.dir}">
-                <include name="org/apache/james/samples/**/*"/>
-            </fileset>
-        </copy>
-        <copy tofile="${sdk.dir}/build.properties.sample" file='mailetsdk.properties.sample'/>
-        <copy tofile="${sdk.dir}/build.xml" file='mailetsdk-build-src.xml'/>
-        <echo file='${sdk.usr.src}/java/README.txt'>User source under this directory</echo>
-        <echo file='${sdk.usr.src}/test/README.txt'>User test source under this directory</echo>
-        <copy todir='${sdk.conf}'>
-            <fileset dir='${conf.dir}'>
-               <include name='**/*.*'/>
-            </fileset>
-        </copy>
-        <echo file='${sdk.lib.build}/README.txt'>Libraries required by the build in this directory</echo>
-        <echo file='${sdk.lib.user}/README.txt'>Libraries required by user source in this directory</echo>
-        <echo file='${sdk.lib.test}/README.txt'>Libraries required by user tests in this directory</echo>
-        <copy todir='${sdk.lib.mailet}'>
-            <fileset dir='${build.lib}'>
-                <include name='mailet-api-${mailet-api-version}.jar'/>
-            </fileset>
-            <fileset dir='${lib.dir}'>
-                <include name='${javax-mail.jar}'/>
-            </fileset>
-        </copy>
-        <property
-            name='dist.mailetsdk.file.zip'
-            value='${dist.downloads.bin}/${sdk.stem}.zip'/>
-        <zip zipfile="${dist.mailetsdk.file.zip}">
-            <fileset dir="dist">
-                <include name="${name}-${version}/**"/>
-                <exclude name="${name}-${version}/downloads/**"/>
-            </fileset>
-        </zip>
-        <copy todir='${dir.master.dist}/bin' file='${dist.mailetsdk.file.zip}'/>
-        <property
-            name='dist.mailetsdk.file.tgz'
-            value='${dist.downloads.bin}/${sdk.stem}.tar.gz'/>
-        <tar longfile="gnu" tarfile="${dist.downloads.bin}/${sdk.stem}.tar">
-            <tarfileset dir="dist" username="${name}" group="${name}">
-                <include name="${name}-${version}/**"/>
-                <exclude name="${name}-${version}/downloads/**"/>
-            </tarfileset>
-        </tar>
-        <gzip zipfile="${dist.mailetsdk.file.tgz}"
-            src="${dist.downloads.bin}/${sdk.stem}.tar"/>
-        <delete file="${dist.downloads.bin}/{sdk.stem}.tar"/>
-        <copy todir='${dir.master.dist}/bin' file='${dist.mailetsdk.file.tgz}'/>
-
-        <delete dir="${sdk.dir}"/>
-    </target>
-
-    <!--
-    ===================================================================
-                                  delete dist/ and build/
-    ===================================================================
-    -->
-    <target name="clean">
-        <echo message ="deleting working directories ready for a clean build"/>
-        <delete dir="${dist.dir}"/>
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <!--
-    ===================================================================
-                                  unit tests
-    ===================================================================
-    -->
-    <target name="unit-tests-classpath" depends="compile">
-        <path id="unittest.class.path">
-            <fileset dir="${lib.dir}">
-                <include name="${junit.jar}"/>
-                <include name="${commons-net.jar}"/>
-                <include name="${jmock.jar}"/>
-            </fileset>
-            <fileset dir="${lib.dir}">
-                <include name="${avalon-logkit.jar}"/>
-                <include name='${excalibur-thread-impl.jar}'/>
-                <include name='${cornerstone-scheduler-impl.jar}'/>
-                <include name="${cornerstone-threads-impl.jar}"/>
-                <include name="${cornerstone-sockets-impl.jar}"/>
-                <include name="${cornerstone-datasources-impl.jar}"/>
-                <include name="${concurrent.jar}"/>
-                <include name='${derby.jar}'/>
-                <include name='${commons-beanutils.jar}'/>
-                <include name='${base-mailet.tests.jar}'/>
-                <include name='${std-mailet.tests.jar}'/>
-            </fileset>
-            <fileset dir="${lib.dir}/${path.lib.james}">
-                  <include name="${jars-prefix}*-api-test-${version}.jar" />
-                  <include name="${jars-prefix}*-util-test-${version}.jar" />
-                  <include name="${jars-prefix}*-library-test-${version}.jar" />
-                  <include name="${jars-prefix}*-function-test-${version}.jar" />
-            </fileset>   
-        </path>
-    </target>
-
-    <target name="compile-unit-tests" depends="unit-tests-classpath">
-        <echo message="Compiling James Unit Test Java sources"/>
-        <mkdir dir="${build.test}"/>
-        <mkdir dir="${build.test.classes}"/>
-        <javac destdir="${build.test.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" target="${jdk.target}" source="${jdk.source}">
-            <classpath refid="unittest.class.path"/>
-            <classpath refid="project.class.path"/>
-            <src path="${junitjava.dir}"/>
-            <exclude name="${constants.file}"/>
-        </javac>
-        <copy todir="${build.test.classes}">
-            <fileset dir="${junitjava.dir}" includes="**/*.zone" />
-            <fileset dir="${junitjava.dir}" includes="**/*.xml" />
-            <fileset dir="${junitjava.dir}" includes="**/Inbox" />
-        </copy>
-        <copy todir="${build.test.classes}">
-            <fileset dir="${conf.dir}" includes="**/*.xml" />
-            <fileset dir="${conf.dir}" includes="*.xml" />
-        </copy>
-    </target>
-
-    <target name="run-unit-tests" depends="compile-unit-tests">
-        <echo message="Running James Unit Tests in directory ${basedir}"/>
-        <mkdir dir="${build.test}"/>
-        <mkdir dir="${build.test.reports}"/>
-        <junit printsummary="yes" haltonfailure="yes"  dir='${basedir}'>
-            <classpath refid="unittest.class.path"/>
-            <classpath refid="project.class.path"/>
-            <classpath>
-              <pathelement location="${build.test.classes}"/>
-            </classpath>
-
-            <formatter type="plain"/>
-
-            <batchtest fork="yes" todir="${build.test.reports}">
-              <fileset dir="${junitjava.dir}">
-                <include name="**/*Test.java"/>
-                <include name="**/*TestCase.java"/>
-                <exclude name="**/AllTests.java"/>
-                <exclude name="**/Abstract*.java"/>
-              </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="ensure-test-name" unless="test">
-        <fail message="You must run this target with -Dtest=TestName"/>
-    </target>
-
-    <target name="run-unit-test" depends="compile-unit-tests, ensure-test-name">
-        <echo message="Running A Single James Unit Test"/>
-        <mkdir dir="${build.test}"/>
-        <mkdir dir="${build.test.reports}"/>
-        <junit printsummary="yes" haltonfailure="yes"  >
-            <classpath refid="unittest.class.path"/>
-            <classpath refid="project.class.path"/>
-            <classpath>
-              <pathelement location="${build.test.classes}"/>
-            </classpath>
-
-            <formatter type="plain"/>
-
-            <batchtest fork="yes" todir="${build.test.reports}">
-                <fileset dir="${junitjava.dir}">
-                    <include name="**/${test}.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-	<target 
-		name='eclipse'
-		depends=''>
-		<echoxml file=".project">
-            <projectDescription>
-                <name>sar-deployment</name>
-                <comment></comment>
-                <projects>
-                </projects>
-                <buildSpec>
-                    <buildCommand>
-                        <name>org.eclipse.jdt.core.javabuilder</name>
-                        <arguments>
-                        </arguments>
-                    </buildCommand>
-                </buildSpec>
-                <natures>
-                    <nature>org.eclipse.jdt.core.javanature</nature>
-                </natures>
-            </projectDescription>
-        </echoxml>
-        <echoxml file=".classpath">
-            <classpath>
-                <classpathentry kind="src" path="src/java"/>
-                <classpathentry kind="src" output="target/test-classes" path="src/test"/>
-                <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-                <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/james"/>
-                <classpathentry combineaccessrules="false" kind='src' path='/common-util'/>
-                <classpathentry combineaccessrules="false" kind='src' path='/javamail-util'/>
-                <classpathentry combineaccessrules="false" kind='src' path='/core-api'/>
-                <classpathentry combineaccessrules="false" kind='src' path='/domain-api'/>
-                <classpathentry combineaccessrules="false" kind='src' path='/imap-api'/>
-                <classpathentry combineaccessrules="false" kind="src" path="/user-api"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/core-library"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/management-library"/>
-                <classpathentry combineaccessrules="false" kind='src' path='/avalon-socket-library'/>
-                <classpathentry combineaccessrules="false" kind="src" path="/imap-codec-library"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/imap-command-library"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/imapmailbox-library"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/mordred-library"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/avalon-user-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/basic-user-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/experimental-activemq-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/experimental-seda-imap-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/fetchmail-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/imap-mailbox-processor-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/jcr-backend-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/sar-deployment"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/pop3server-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/remotemanager-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/core-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/smtpserver-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/spoolmanager-function"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/spring-deployment"/>
-                <classpathentry combineaccessrules="false" kind="src" path="/torque-mailboxmanager-function"/>
-                <classpathentry kind="output" path="target/classes"/>
-            </classpath>
-        </echoxml>
-    </target>
-
-    <!--
-    ===================================================================
-                                   Help on usage
-    ===================================================================
-    -->
-    <target name="usage">
-        <echo message=""/>
-        <echo message=""/>
-        <echo message="James Build file"/>
-        <echo message="-------------------------------------------------------------"/>
-        <echo message=""/>
-        <echo message=" available targets are:"/>
-        <echo message=""/>
-        <echo message="   dist-lite --> generates unpacked distribution (default)"/>
-        <!-- <echo message="   website   - - > makes all the docs and javadocs"/> -->
-        <echo message="   compile   --> compiles the source code"/>
-        <echo message="   dist      --> generates all the James distributions, packed"/>
-        <echo message="   clean     --> cleans up the directory"/>
-        <!-- <echo message="   xdocs     - - > creates the documentaion for James"/> -->
-        <echo message="   javadocs  --> creates the Javadoc"/>
-        <echo message=""/>
-        <echo message=" See the comments inside the build.xml file for more details."/>
-        <echo message="-------------------------------------------------------------"/>
-        <echo message=""/>
-        <echo message=""/>
-    </target>
-
+<project default="main" name="sar-deployment">
+  <description>Builds sar-deployment module. This is an deployment module.</description>
+  <property name="name.module" value="sar-deployment" />
+  <import file="../build-tools/deployment-build.xml" optional="no" />
 </project>

Modified: james/server/trunk/sar-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/sar-deployment/pom.xml?rev=686498&r1=686497&r2=686498&view=diff
==============================================================================
--- james/server/trunk/sar-deployment/pom.xml (original)
+++ james/server/trunk/sar-deployment/pom.xml Sat Aug 16 06:29:22 2008
@@ -28,24 +28,6 @@
   <artifactId>james-server-sar-deployment</artifactId>
   <name>Apache JAMES Server SAR Deployment</name>
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <includes>
-          <include>**/*.zone</include>
-          <include>**/*.xml</include>
-          <include>**/Inbox</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>src/conf</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>



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