darrell 2003/02/17 05:09:32
Modified: . build.bat build.xml
proposals/imap2 build.xml
proposals/imap2/conf james-assembly.xml
proposals/imap2/java/org/apache/james JamesImap.java
JamesImap.xinfo
proposals/imap2/java/org/apache/james/imapserver
ImapServer.java ImapServer.xinfo
src/java/org/apache/james James.java
Log:
Fixes for Imap2 proposal with new Avalon stuff:
* Modified main build so that proposal source can be optionally compiled.
* Imap2 proposal now delegates build to main build.xml
* Minor fixes for Serviceable.
Revision Changes Path
1.10 +18 -18 jakarta-james/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-james/build.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.bat 8 Feb 2003 07:23:04 -0000 1.9
+++ build.bat 17 Feb 2003 13:09:31 -0000 1.10
@@ -1,18 +1,18 @@
-@echo off
-
-echo.
-echo James Build System
-echo -------------------
-
-set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=tools
-
-set OLD_CLASSPATH=%CLASSPATH%
-set
CLASSPATH=phoenix-bin\lib\xercesImpl-2.0.2.jar;phoenix-bin\lib\xml-apis.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar
-
-%ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
-goto cleanup
-
-:cleanup
-set ANT_HOME=%OLD_ANT_HOME%
-set CLASSPATH=%OLD_CLASSPATH%
+@echo off
+
+echo.
+echo James Build System
+echo -------------------
+
+set OLD_ANT_HOME=%ANT_HOME%
+set ANT_HOME=tools
+
+set OLD_CLASSPATH=%CLASSPATH%
+set
CLASSPATH=phoenix-bin\lib\xercesImpl-2.0.2.jar;phoenix-bin\lib\xml-apis.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar
+
+%ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
+goto cleanup
+
+:cleanup
+set ANT_HOME=%OLD_ANT_HOME%
+set CLASSPATH=%OLD_CLASSPATH%
1.128 +29 -3 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- build.xml 9 Feb 2003 15:18:52 -0000 1.127
+++ build.xml 17 Feb 2003 13:09:31 -0000 1.128
@@ -24,7 +24,7 @@
==============================================================================
-->
-<project default="main" basedir=".">
+<project name="James" default="main" basedir=".">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
@@ -196,8 +196,9 @@
===================================================================
compile
===================================================================
+ Compiles the main trunk.
-->
- <target name="compile" depends="prepare">
+ <target name="compile-main" depends="prepare">
<echo message="Compiling James Java sources"/>
<available property="jndi.present" classname="javax.naming.InitialContext"/>
<mkdir dir="${build.classes}"/>
@@ -217,6 +218,31 @@
</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}">
+ <classpath refid="project.class.path" />
+
+ <!-- The proposal source -->
+ <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>
+
+ <target name="compile" depends="compile-main, compile-proposal"/>
<!--
===================================================================
1.8 +7 -612 jakarta-james/proposals/imap2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap2/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 28 Jan 2003 17:31:29 -0000 1.7
+++ build.xml 17 Feb 2003 13:09:32 -0000 1.8
@@ -1,51 +1,6 @@
<?xml version="1.0"?>
-<!-- ==========================================================================
-
- James build file $Revision$ Committed on $Date$ by: $Author$
-
-Authors:
- Federico Barbieri <[EMAIL PROTECTED]>
- Serge
- Charles Benett <[EMAIL PROTECTED]>
- Peter Donald <[EMAIL PROTECTED]>
- Harmeet Bedi <[EMAIL PROTECTED]>
- Danny Angus <[EMAIL PROTECTED]>
- Peter M. Goldstein <[EMAIL PROTECTED]>
- Darrell DeBoer <[EMAIL PROTECTED]>
-
-Legal:
- Copyright (c) 1999-2002 The Apache Software Foundation. All Rights Reserved.
-
-
-==============================================================================
- -->
<project default="main" name="IMAP proposal v2" 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="${user.home}/.ant.properties"/>
- <property name="name" value="james"/>
- <property name="Name" value="James"/>
- <property name="version" value="3.0a1-imap2"/>
- <property name="year" value="1999-2003"/>
- <!-- There should be no need to override default compiler but need to change
- javac task to run without this -->
- <property name="build.compiler" value="modern"/>
- <!--
- these are here only for those who use jikes compiler. For other
- developers this part makes no difference.
- -->
- <property name="build.compiler.emacs" value="on"/>
- <property name="build.compiler.pedantic" value="true"/>
- <property name="build.compiler.depend" value="true"/>
- <property name="build.compiler.fulldepend" value="true"/>
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
- <property name="deprecation" value="off"/>
-
- <!--
===================================================================
Set the properties for proposal directories
===================================================================
@@ -57,572 +12,12 @@
<property name="java.proposal.dir" value="${proposal.dir}/java"/>
<property name="conf.proposal.dir" value="${proposal.dir}/conf"/>
-
- <!--
- ===================================================================
- Set the properties for intermediate directory
- ===================================================================
- -->
- <property name="build.dir" value="${proposal.dir}/build"/>
- <property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.javadocs" value="${build.dir}/javadocs"/>
- <property name="build.docs" value="${build.dir}/docs"/>
- <property name="build.mailetdocs" value="${build.dir}/mailetdocs"/>
- <property name="build.conf" value="${build.dir}/conf"/>
-
- <!--
- ===================================================================
- Set the properties for source directories and parameters
- ===================================================================
- -->
- <property name="src.dir" value="src"/>
- <property name="java.dir" value="${src.dir}/java"/>
- <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="constants.file" value="org/apache/james/Constants.java"/>
- <property name="poolconn.file"
value="org/apache/james/util/mordred/PoolConnEntry.java"/>
-
-
- <!--
- ===================================================================
- Set the properties for the distribution directories
- ===================================================================
- -->
- <property name="dist.base" value="${proposal.dir}/dist"/>
- <property name="dist.name" value="${name}-${version}"/>
- <property name="dist.dir" value="${dist.base}/${dist.name}"/>
-
- <!--
- ===================================================================
- Third party binary directories
- ===================================================================
- -->
- <property name="lib.dir" value="lib"/>
- <property name="phoenix.dir" value="phoenix-bin"/>
- <property name="phoenix.lib.dir" value="${phoenix.dir}/lib"/>
-
- <!--
- ===================================================================
- Set the properties for the website directories
- ===================================================================
- -->
- <property name="www.dir" value="${proposal.dir}/www"/>
-
- <!--
- ===================================================================
- Set the classpath
- ===================================================================
- -->
- <property name="xerces.jar" value="${lib.dir}/xerces-1.4.3.jar"/>
- <!--
- <property name="activation.jar" value="${lib.dir}/activation.jar"/>
- -->
- <path id="project.class.path">
- <pathelement location="${xerces.jar}"/>
- <pathelement path="${java.class.path}"/>
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- <exclude name="xerces.jar"/>
- </fileset>
- <fileset dir="${phoenix.lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${build.classes}"/>
- </path>
- <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
- <classpath refid="project.class.path"/>
- </taskdef>
- <!--
- ===================================================================
- Main target
- ===================================================================
- -->
- <target name="main" depends="dist-lite"/>
- <!--
- ===================================================================
- Prepare
- ===================================================================
- -->
- <target name="prepare">
- <echo message="preparing code"/>
-
- <tstamp/>
- <property name="dist.bin" value="${dist.dir}/bin"/>
- <property name="dist.apps" value="${dist.dir}/apps"/>
- <property name="dist.lib" value="${dist.dir}/lib"/>
- <property name="dist.docs" value="${dist.dir}/docs"/>
- <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
- <available property="jdbc3.present" classname="java.sql.Savepoint"/>
- <mkdir dir="${dist.dir}"/>
- <copy todir="${dist.dir}">
- <fileset dir="${phoenix.dir}">
- <exclude name="CVS/**"/>
- </fileset>
- <fileset dir=".">
- <include name="release-notes.txt"/>
- <include name="LICENSE.txt"/>
- <include name="README"/>
- </fileset>
- </copy>
- <fixcrlf srcdir="${java.proposal.dir}" includes="**/*.java" eol="lf"
tab="remove" tablength="4" />
- <fixcrlf srcdir="${java.proposal.dir}" includes="**/*.minfo" eol="lf"
tab="remove" tablength="4" />
- <fixcrlf srcdir="${java.proposal.dir}" includes="**/*.xinfo" eol="lf"
tab="remove" tablength="4" />
- <fixcrlf srcdir="${java.proposal.dir}" includes="**/*.html" eol="lf"
tab="remove" tablength="4" />
- <fixcrlf srcdir="${conf.proposal.dir}" includes="**/*.xml" eol="lf"
tab="remove" tablength="4" />
- <fixcrlf srcdir="${dist.dir}/bin" includes="run.sh" eol="lf"/>
- <fixcrlf srcdir="${dist.dir}/bin" includes="run.bat" eol="crlf"/>
- <fixcrlf srcdir="${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
- <chmod perm="+x">
- <fileset dir="${dist.dir}/bin">
- <include name="run.sh"/>
- <include name="phoenix.sh"/>
- </fileset>
- </chmod>
- <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
- <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
- <chmod perm="+x">
- <fileset dir=".">
- <include name="build.sh"/>
- </fileset>
- </chmod>
- <available classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present"/>
- <mkdir dir="${build.src}"/>
- <copy todir="${build.src}">
- <fileset dir="${java.dir}">
- <include name="${constants.file}"/>
- <include name="${poolconn.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>
- <!--
- ===================================================================
- jdbc3
- ===================================================================
- -->
- <target name="prepare-jdbc3" depends="prepare" if="jdbc3.present">
- <echo message="preparing for JDBC3"/>
- <replace file="${build.src}/${poolconn.file}" token="/* JDBC_3_ANT_KEY"
value=""/>
- <replace file="${build.src}/${poolconn.file}" token="JDBC_3_ANT_KEY */"
value=""/>
- </target>
-
-
- <!--
- ===================================================================
- compile
- ===================================================================
- -->
- <target name="compile" depends="prepare,prepare-jdbc3" description="Compiles
the source.">
- <!-- First compile the main James tree, leaving out any files that
- overlap with the IMAP proposal. -->
- <echo message="compiling James"/>
- <available property="jndi.present" classname="javax.naming.InitialContext"/>
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}"
deprecation="${deprecation}">
- <classpath refid="project.class.path"/>
- <src path="${build.src}"/>
- <src path="${java.dir}"/>
- <exclude name="${constants.file}"/>
- <exclude name="${poolconn.file}"/>
- <exclude
name="org/apache/james/userrepository/UsersLDAPRepository.java" unless="jndi.present"/>
- </javac>
-
- <!-- Copy .xinfo and .properties files from the core source, once again,
- exclude overlapping files. -->
- <copy todir="${build.classes}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties"/>
- <include name="**/*.xinfo"/>
- <include name="**/*.mxinfo"/>
- </fileset>
- </copy>
-
- <!-- Now build the proposal source over those classes -->
- <javac destdir="${build.classes}"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="${deprecation}">
- <classpath refid="project.class.path" />
-
- <!-- The proposal source -->
- <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>
- <!--
- ===================================================================
- Clean classes, then recompile
- ===================================================================
- -->
- <target name="recompile" depends="clean-classes, compile"/>
- <!--
- ===================================================================
- 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="${build.src}"
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://jakarta.apache.org/avalon/api"/>
- <param name="-link"
value="http://jakarta.apache.org/avalon/phoenix/api"/>
- <param name="-link"
value="http://jakarta.apache.org/avalon/cornerstone/api"/>
- <param name="-link"
value="http://jakarta.apache.org/avalon/logkit/api"/>
- <param name="-doctitle" value="${Name} ${version}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom" value=""Copyright © ${year} Apache
Jakarta Project. All Rights Reserved.""/>
- </doclet>
- </javadoc>
- <echo message="Making Mailet javadocs"/>
- <javadoc packagenames="org.apache.mailet.*" sourcepath="${build.src}"
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://jakarta.apache.org/avalon/api"/>
- <param name="-link"
value="http://jakarta.apache.org/avalon/phoenix/api"/>
- <param name="-link"
value="http://jakarta.apache.org/avalon/cornerstone/api"/>
- <param name="-link"
value="http://jakarta.apache.org/avalon/logkit/api"/>
- <param name="-doctitle" value="Apache Jakarta Mailet API"/>
- <param name="-windowtitle" value="Apache Jakarta Mailet API"/>
- <param name="-bottom" value=""Copyright © ${year} Apache
Jakarta Project. All Rights Reserved.""/>
- </doclet>
- </javadoc>
- </target>
- <!--
- ===================================================================
- build xdocs
- ===================================================================
- -->
- <target name="xdocs" depends="prepare,prepare-jdbc3">
- <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"/>
- </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}"/>
- <delete>
- <fileset dir="${www.dir}">
- <exclude name="CVS/**"/>
- <exclude name="rfclist/**"/>
- <exclude name="javadocs/**"/>
- <exclude name="mailet/**"/>
- </fileset>
- </delete>
- <mkdir dir="${www.dir}"/>
- <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>
- </target>
- <!--
- ===================================================================
- Build everything
- ===================================================================
- -->
- <target name="everything"
depends="clean,website,dist-bin,dist-src,dist-mailet-SDK"/>
- <!--
- ===================================================================
- Build all distributions
- ===================================================================
- -->
- <target name="dist" depends="dist-bin,dist-src,dist-mailet-SDK"/>
- <!--
- ===================================================================
- Make james.sar
- ===================================================================
- -->
- <target name="sar" depends="prepare,compile">
- <echo message="Making James.sar"/>
-
- <!-- builds james-sar-->
- <mkdir dir="${build.lib}"/>
- <!-- Make james.jar-->
- <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}"
manifest="${src.dir}/Manifest.mf">
- <include name="org/apache/james/**"/>
- <include name="org/apache/mailet/**"/>
- </jar>
- <!-- Make sar file-->
- <sar sarfile="${build.lib}/${name}.sar"
config="${conf.proposal.dir}/james-config.xml"
environment="${conf.proposal.dir}/james-server.xml"
assembly="${conf.proposal.dir}/james-assembly.xml">
- <lib dir="${build.lib}/">
- <include name="*.jar"/>
- </lib>
- <lib dir="lib">
- <include name="dnsjava-1.3.2.jar"/>
- <include name="jakarta-oro-2.0.1.jar"/>
- <include name="mm.mysql-2.0.14.jar"/>
- <include name="mm.mysql.LICENCE"/>
- <include name="avalon-framework-4.1.3.jar"/>
- <include name="cornerstone.jar"/>
- <include name="excalibur-datasource-1.0.jar"/>
- <include name="activation.jar"/>
- <include name="mail_1_3.jar"/>
- <include name="commons-net-1.0.0-dev.jar"/>
- </lib>
- <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
- <include name="sqlResources.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}/${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>
- <!--
- ===================================================================
- binary distributions
- ===================================================================
- -->
- <target name="dist-bin" depends="dist-lite,xdocs,javadocs">
- <echo message ="building binary distributions"/>
- <mkdir dir="${dist.dir}/downloads/bin"/>
- <!-- binary with phoenix -->
- <zip zipfile="${dist.dir}/downloads/bin/${name}-binary-${version}.zip">
- <fileset dir="dist">
- <include name="${name}-${version}/**"/>
- <exclude name="${name}-${version}/downloads/**"/>
- <include name="release-notes.txt"/>
- <include name="LICENSE.txt"/>
- </fileset>
- </zip>
- <tar longfile="gnu"
tarfile="${dist.dir}/downloads/bin/${name}-binary-${version}.tar">
- <tarfileset dir="dist" username="${name}" group="${name}">
- <include name="${name}-${version}/**"/>
- <exclude name="${name}-${version}/downloads/**"/>
- <include name="release-notes.txt"/>
- <include name="LICENSE.txt"/>
- </tarfileset>
- </tar>
- <gzip zipfile="${dist.dir}/downloads/bin/${name}-binary-${version}.tar.gz"
src="${dist.dir}/downloads/bin/${name}-binary-${version}.tar"/>
- <delete file="${dist.dir}/downloads/bin/${name}-binary-${version}.tar"/>
- <!-- Sar only-->
- <copy file="${dist.dir}/apps/${name}.sar"
todir="${dist.dir}/downloads/bin"/>
- </target>
- <!--
- ===================================================================
- source distributions
- ===================================================================
- -->
- <target name="dist-src" depends="dist-lite,xdocs,javadocs">
- <echo message ="building source distributions"/>
-
- <mkdir dir="${dist.dir}/downloads/src"/>
- <zip zipfile="${dist.dir}/downloads/src/${dist.name}-src.zip">
- <fileset dir=".">
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="proposals/**"/>
- <include name="www/**"/>
- <include name="tools/**"/>
- <include name="*.xml"/>
- <include name="*.txt"/>
- <include name="README"/>
- <include name="KEYS"/>
- <include name="build.*"/>
- </fileset>
- </zip>
- <tar longfile="gnu"
tarfile="${dist.dir}/downloads/src/${dist.name}-src.tar">
- <tarfileset dir="." username="${name}" group="${name}">
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="proposals/**"/>
- <include name="www/**"/>
- <include name="tools/**"/>
- <include name="*.xml"/>
- <include name="*.txt"/>
- <include name="README"/>
- <include name="KEYS"/>
- <include name="build.*"/>
- </tarfileset>
- </tar>
- <gzip zipfile="${dist.dir}/downloads/src/${dist.name}-src.tar.gz"
src="${dist.dir}/downloads/src/${dist.name}-src.tar"/>
- <delete file="${dist.dir}/downloads/src/${dist.name}-src.tar"/>
- <!--Source With Phoenix -->
- <zip
zipfile="${dist.dir}/downloads/src/${name}-with-phoenix-${version}-src.zip">
- <fileset dir=".">
- <include name="${dist.dir}/**"/>
- <exclude name="${dist.dir}/downloads/**"/>
- <exclude name="${dist.dir}/apps/*.sar"/>
- <exclude name=""/>
- <include name="*.txt"/>
- <include name="*.xml"/>
- <include name="KEYS"/>
- <include name="README"/>
- <include name="build.*"/>
- <include name="lib/**"/>
- <include name="proposals/**"/>
- <include name="src/**"/>
- <include name="tools/**"/>
- <include name="www/**"/>
- </fileset>
- </zip>
- <tar longfile="gnu"
tarfile="${dist.dir}/downloads/src/${name}-with-phoenix-${version}-src.tar">
- <tarfileset dir="." username="${name}" group="${name}">
- <include name="${dist.dir}/**"/>
- <exclude name="${dist.dir}/downloads/**"/>
- <exclude name="${dist.dir}/apps/*.sar"/>
- <include name="*.txt"/>
- <include name="*.xml"/>
- <include name="KEYS"/>
- <include name="README"/>
- <include name="build.*"/>
- <include name="lib/**"/>
- <include name="proposals/**"/>
- <include name="src/**"/>
- <include name="tools/**"/>
- <include name="www/**"/>
- </tarfileset>
- </tar>
- <gzip
zipfile="${dist.dir}/downloads/src/${name}-with-phoenix-${version}-src.tar.gz"
src="${dist.dir}/downloads/src/${name}-with-phoenix-${version}-src.tar"/>
- <delete
file="${dist.dir}/downloads/src/${name}-with-phoenix-${version}-src.tar"/>
- </target>
- <!--
- ===================================================================
- Mailet SDK distribution
- ===================================================================
- -->
- <target name="dist-mailet-SDK" depends="dist-lite,xdocs,javadocs">
- <echo message ="building mailet SDK distributions"/>
-
- <mkdir dir="${dist.dir}/MailetSDK/src"/>
- <mkdir dir="${dist.dir}/MailetSDK/javadocs"/>
- <copy todir="${dist.dir}/MailetSDK/src">
- <fileset dir="src">
- <include name="**/mailet/**"/>
- </fileset>
- </copy>
- <copy todir="${dist.dir}/MailetSDK/javadocs">
- <fileset dir="${build.dir}/mailet">
- <include name="**/*"/>
- </fileset>
- </copy>
- <zip zipfile="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.zip">
- <fileset dir="dist">
- <include name="${name}-${version}/**"/>
- <exclude name="${name}-${version}/downloads/**"/>
- </fileset>
- </zip>
- <tar longfile="gnu"
tarfile="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar">
- <tarfileset dir="dist" username="${name}" group="${name}">
- <include name="${name}-${version}/**"/>
- <exclude name="${name}-${version}/downloads/**"/>
- </tarfileset>
- </tar>
- <gzip
zipfile="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar.gz"
src="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar"/>
- <delete file="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar"/>
- <delete dir="${dist.dir}/MailetSDK"/>
- </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>
-
- <!--
- ===================================================================
- delete build/classes
- ===================================================================
- -->
- <target name="clean-classes">
- <echo message="deleting all java class files."/>
- <delete dir="${build.classes}"/>
- </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 name="main">
+ <ant antfile="build.xml" target="dist-lite">
+ <property name="build.dir" value="${proposal.dir}/build"/>
+ <property name="dist.base" value="${proposal.dir}/dist"/>
+ <property name="conf.dir" value="${conf.proposal.dir}"/>
+ <property name="version" value="3.0a1-imap2"/>
+ </ant>
</target>
- <target name="help" depends="usage"/>
</project>
1.4 +1 -1 jakarta-james/proposals/imap2/conf/james-assembly.xml
Index: james-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap2/conf/james-assembly.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- james-assembly.xml 8 Feb 2003 06:03:54 -0000 1.3
+++ james-assembly.xml 17 Feb 2003 13:09:32 -0000 1.4
@@ -175,7 +175,7 @@
<!-- The DataSourceSelector block -->
<block name="database-connections"
-
class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSelector" />
+
class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector" />
<!-- The ThreadManager block -->
<block name="thread-manager"
1.2 +5 -5
jakarta-james/proposals/imap2/java/org/apache/james/JamesImap.java
Index: JamesImap.java
===================================================================
RCS file:
/home/cvs/jakarta-james/proposals/imap2/java/org/apache/james/JamesImap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JamesImap.java 28 Jan 2003 12:55:22 -0000 1.1
+++ JamesImap.java 17 Feb 2003 13:09:32 -0000 1.2
@@ -15,7 +15,7 @@
import org.apache.james.userrepository.DefaultJamesUser;
import org.apache.mailet.MailAddress;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceManager;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -45,7 +45,7 @@
protected void initialiseInboxes( Configuration configuration,
- ComponentManager componentManager ) throws
Exception
+ ServiceManager manager ) throws Exception
{
try {
// Get storage config param
@@ -62,7 +62,7 @@
if ( useIMAPstorage ) {
try {
// We will need to use a no-args constructor for flexibility
- imapHost = ( ImapHost ) componentManager.lookup( ImapHost.ROLE );
+ imapHost = ( ImapHost ) manager.lookup( ImapHost.ROLE );
}
catch ( Exception e ) {
getLogger().error( "Exception in IMAP Storage init: " +
e.getMessage() );
@@ -70,7 +70,7 @@
}
}
else {
- super.initialiseInboxes(configuration, componentManager);
+ super.initialiseInboxes(configuration, manager);
}
}
1.3 +5 -5
jakarta-james/proposals/imap2/java/org/apache/james/JamesImap.xinfo
Index: JamesImap.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-james/proposals/imap2/java/org/apache/james/JamesImap.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JamesImap.xinfo 8 Feb 2003 06:03:54 -0000 1.2
+++ JamesImap.xinfo 17 Feb 2003 13:09:32 -0000 1.3
@@ -13,10 +13,10 @@
<service name="org.apache.mailet.MailetContext" version="1.0" />
</services>
- <!-- interfaces that may be exported to manange this block -->
- <management-access-points>
- <service name="org.apache.james.JamesMBean"/>
- </management-access-points>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.JamesMBean"/>
+ </management-access-points>
<dependencies>
@@ -30,7 +30,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
+ <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
</dependency>
<dependency>
1.3 +8 -10
jakarta-james/proposals/imap2/java/org/apache/james/imapserver/ImapServer.java
Index: ImapServer.java
===================================================================
RCS file:
/home/cvs/jakarta-james/proposals/imap2/java/org/apache/james/imapserver/ImapServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImapServer.java 27 Jan 2003 04:05:09 -0000 1.2
+++ ImapServer.java 17 Feb 2003 13:09:32 -0000 1.3
@@ -20,6 +20,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
import org.apache.mailet.UsersRepository;
@@ -87,22 +89,18 @@
private ImapHandlerConfigurationData theConfigData
= new IMAPHandlerConfigurationDataImpl();
- /**
- * @see Composable#compose(ComponentManager)
- */
- public void compose( final ComponentManager componentManager )
- throws ComponentException
+ public void service( ServiceManager manager ) throws ServiceException
{
- super.compose( componentManager );
- mailServer = ( MailServer ) componentManager.
+ super.service( manager );
+ mailServer = ( MailServer ) manager.
lookup( "org.apache.james.services.MailServer" );
- UsersStore usersStore = ( UsersStore ) componentManager.
+ UsersStore usersStore = ( UsersStore ) manager.
lookup( "org.apache.james.services.UsersStore" );
users = usersStore.getRepository( "LocalUsers" );
- imapHost = ( ImapHost ) componentManager.
+ imapHost = ( ImapHost ) manager.
lookup( "org.apache.james.imapserver.ImapHost" );
if ( users == null ) {
- throw new ComponentException( "The user repository could not be found."
);
+ throw new ServiceException( "The user repository could not be found." );
}
}
1.2 +0 -5
jakarta-james/proposals/imap2/java/org/apache/james/imapserver/ImapServer.xinfo
Index: ImapServer.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-james/proposals/imap2/java/org/apache/james/imapserver/ImapServer.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImapServer.xinfo 22 Nov 2002 02:09:50 -0000 1.1
+++ ImapServer.xinfo 17 Feb 2003 13:09:32 -0000 1.2
@@ -7,11 +7,6 @@
<version>1.0</version>
</block>
- <!-- services that are offered by this block -->
- <services>
- <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
- </services>
-
<dependencies>
<dependency>
<service name="org.apache.james.services.MailStore" version="1.0"/>
1.47 +2 -2 jakarta-james/src/java/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- James.java 8 Feb 2003 04:12:24 -0000 1.46
+++ James.java 17 Feb 2003 13:09:32 -0000 1.47
@@ -199,7 +199,7 @@
}
/**
- * @see org.apache.avalon.framework.service.Servicable#service(ServiceManager)
+ * @see
org.apache.avalon.framework.service.ServiceableServicable#service(ServiceManager)
*/
public void service( ServiceManager comp) {
compMgr = new DefaultServiceManager(comp);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
