darrell 02/01/11 17:10:30
Modified: . build.xml
proposals/imap build.xml
proposals/rmi-remotemanager build.xml
src/java/org/apache/james BaseConnectionHandler.java
src/java/org/apache/james/nntpserver NNTPHandler.java
src/java/org/apache/james/services MailServer.java
UsersStore.java
src/java/org/apache/james/userrepository
AbstractJdbcUsersRepository.java
UsersLDAPRepository.java
Added: lib avalon-excalibur-20011120.jar
avalon-framework-20011115.jar
avalon-jmx-20011230.jar
avalon-scratchpad-20011122.jar
cornerstone-20011230.bar logkit-1.0.jar
phoenix-client-20011230.jar
phoenix-engine-20011230.jar
phoenix-loader-20011230.jar
Removed: lib avalon-excalibur-20010919.jar
avalon-framework-20010912.jar
avalon-jmx-20010919.jar
avalon-scratchpad-20010919.jar
cornerstone-20010925.bar logkit-20010912.jar
phoenix-client-20010925.jar
phoenix-engine-20010925.jar
phoenix-loader-20010925.jar
Log:
- Library upgrade
- Upgraded Avalon,Pheonix and Cornerstone libraries to more recent versions.
- Removed deprecated usage of o.a.a.phoenix.Service from
MailServer and UsersStore interfaces.
- Changed o.a.j.BaseConnectionHandler to use new Logging framework, so
that it can work with new version of Cornerstone. Also needed slight mods
to extensions to BaseConnectionHandler (NNTPHandler,
AbstractJdbcUsersRepository,
UsersLDAPRepository)
- Now get heaps of deprecation warnings for usage of o.a.log.Loggable
- Source tree is no longer copied to build/src before compiling,
source files are compiled directly from src/java
Revision Changes Path
1.87 +20 -38 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- build.xml 30 Oct 2001 14:07:50 -0000 1.86
+++ build.xml 12 Jan 2002 01:10:29 -0000 1.87
@@ -2,7 +2,7 @@
<!-- ==========================================================================
- James build file $Revision: 1.86 $ Committed on $Date: 2001/10/30 14:07:50 $ by:
$Author: serge $
+ James build file $Revision: 1.87 $ Committed on $Date: 2002/01/12 01:10:29 $ by:
$Author: darrell $
Authors:
Federico Barbieri <[EMAIL PROTECTED]>
@@ -106,15 +106,15 @@
===================================================================
-->
<property name="xerces.jar" value="${lib.dir}/xerces-1.4.3.jar"/>
- <property name="framework.jar" value="${lib.dir}/avalon-framework-20010912.jar"/>
- <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20010919.jar"/>
- <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-20010919.jar"/>
- <property name="logkit.jar" value="${lib.dir}/logkit-20010912.jar"/>
- <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20010925.bar"/>
- <property name="phoenix.client.jar"
value="${lib.dir}/phoenix-client-20010925.jar"/>
- <property name="phoenix-loader.jar"
value="${lib.dir}/phoenix-loader-20010925.jar"/>
- <property name="phoenix-engine.jar"
value="${lib.dir}/phoenix-engine-20010925.jar"/>
- <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20010919.jar"/>
+ <property name="framework.jar" value="${lib.dir}/avalon-framework-20011115.jar"/>
+ <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20011120.jar"/>
+ <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-20011122.jar"/>
+ <property name="logkit.jar" value="${lib.dir}/logkit-1.0.jar"/>
+ <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20011230.bar"/>
+ <property name="phoenix.client.jar"
value="${lib.dir}/phoenix-client-20011230.jar"/>
+ <property name="phoenix-loader.jar"
value="${lib.dir}/phoenix-loader-20011230.jar"/>
+ <property name="phoenix-engine.jar"
value="${lib.dir}/phoenix-engine-20011230.jar"/>
+ <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20011230.jar"/>
<!--
<property name="activation.jar" value="${lib.dir}/activation.jar"/>
@@ -210,12 +210,7 @@
<mkdir dir="${build.src}"/>
<copy todir="${build.src}">
<fileset dir="${java.dir}">
- <exclude name="**/*.properties"/>
- <exclude name="**/*.xinfo"/>
- </fileset>
- </copy>
- <copy todir="${build.conf}">
- <fileset dir="${conf.dir}">
+ <include name="${constants.file}"/>
</fileset>
</copy>
@@ -228,20 +223,6 @@
</target>
- <target name="prepare-proposal" depends="prepare" if="with.proposal">
- <echo>Building with proposal </echo>
- <copy todir="${build.src}" overwrite="on">
- <fileset dir="${java.proposal.dir}">
- <exclude name="**/*.properties"/>
- <exclude name="**/*.xinfo"/>
- </fileset>
- </copy>
- <copy todir="${build.conf}" overwrite="on">
- <fileset dir="${conf.proposal.dir}">
- </fileset>
- </copy>
- </target>
-
<target name="prepare-error" depends="prepare" unless="AnakiaTask.present">
<echo>
AnakiaTask is not present! Please check to make sure that
@@ -253,19 +234,19 @@
<!-- =================================================================== -->
<!-- Compiles the source directory -->
<!-- =================================================================== -->
- <target name="compile" depends="prepare-proposal">
+ <target name="compile" depends="prepare">
<!-- <mkdir dir="${build.dir}"/> -->
<available property="jndi.present" classname="javax.naming.InitialContext" />
<mkdir dir="${build.classes}"/>
- <javac srcdir="${build.src}"
- destdir="${build.classes}"
+ <javac destdir="${build.classes}"
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}">
<classpath refid="project.class.path" />
- <src path="${build.src}" />
+ <src path="${build.src}"/>
+ <src path="${java.dir}"/>
<exclude name="${constants.file}" />
<exclude name="org/apache/james/userrepository/UsersLDAPRepository.java"
unless="jndi.present" />
@@ -333,19 +314,19 @@
<include name="jakarta-oro-2.0.1.jar"/>
</zipfileset>
- <zipfileset dir="${build.conf}" fullpath="conf/config.xml">
+ <zipfileset dir="${conf.dir}" fullpath="conf/config.xml">
<include name="james-config.xml"/>
</zipfileset>
- <zipfileset dir="${build.conf}" fullpath="conf/assembly.xml">
+ <zipfileset dir="${conf.dir}" fullpath="conf/assembly.xml">
<include name="james-assembly.xml"/>
</zipfileset>
- <zipfileset dir="${build.conf}" fullpath="conf/server.xml">
+ <zipfileset dir="${conf.dir}" fullpath="conf/server.xml">
<include name="james-server.xml"/>
</zipfileset>
- <zipfileset dir="${build.conf}" fullpath="conf/sqlResources.xml">
+ <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml"/>
</zipfileset>
@@ -360,6 +341,7 @@
<target name="dist-lite" depends="sar">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/bin"/>
+ <mkdir dir="${dist.dir}/ext"/>
<delete dir="${dist.dir}/apps/${name}"/>
<copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
1.1 jakarta-james/lib/avalon-excalibur-20011120.jar
<<Binary file>>
1.1 jakarta-james/lib/avalon-framework-20011115.jar
<<Binary file>>
1.1 jakarta-james/lib/avalon-jmx-20011230.jar
<<Binary file>>
1.1 jakarta-james/lib/avalon-scratchpad-20011122.jar
<<Binary file>>
1.1 jakarta-james/lib/cornerstone-20011230.bar
<<Binary file>>
1.1 jakarta-james/lib/logkit-1.0.jar
<<Binary file>>
1.1 jakarta-james/lib/phoenix-client-20011230.jar
<<Binary file>>
1.1 jakarta-james/lib/phoenix-engine-20011230.jar
<<Binary file>>
1.1 jakarta-james/lib/phoenix-loader-20011230.jar
<<Binary file>>
1.2 +12 -13 jakarta-james/proposals/imap/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/imap/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 31 Oct 2001 14:06:57 -0000 1.1
+++ build.xml 12 Jan 2002 01:10:29 -0000 1.2
@@ -2,8 +2,6 @@
<!-- ==========================================================================
- James build file $Revision: 1.1 $ Committed on $Date: 2001/10/31 14:06:57 $ by:
$Author: serge $
-
Authors:
Federico Barbieri <[EMAIL PROTECTED]>
Serge
@@ -24,14 +22,14 @@
<!--
Give user a chance to override without editing this file
- (and without typing -D each time he <s it)
+ (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="2.0a1-dev"/>
+ <property name="version" value="2.0a2"/>
<property name="year" value="1999-2001"/>
<!-- There should be no need to override default compiler but need to change
@@ -108,15 +106,15 @@
===================================================================
-->
<property name="xerces.jar" value="${lib.dir}/xerces.jar"/>
- <property name="framework.jar" value="${lib.dir}/avalon-framework-20010912.jar"/>
- <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20010919.jar"/>
- <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-20010919.jar"/>
- <property name="logkit.jar" value="${lib.dir}/logkit-20010912.jar"/>
- <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20010925.bar"/>
- <property name="phoenix.client.jar"
value="${lib.dir}/phoenix-client-20010925.jar"/>
- <property name="phoenix-loader.jar"
value="${lib.dir}/phoenix-loader-20010925.jar"/>
- <property name="phoenix-engine.jar"
value="${lib.dir}/phoenix-engine-20010925.jar"/>
- <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20010919.jar"/>
+ <property name="framework.jar" value="${lib.dir}/avalon-framework-20011115.jar"/>
+ <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20011120.jar"/>
+ <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-20011122.jar"/>
+ <property name="logkit.jar" value="${lib.dir}/logkit-1.0.jar"/>
+ <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20011230.bar"/>
+ <property name="phoenix.client.jar"
value="${lib.dir}/phoenix-client-20011230.jar"/>
+ <property name="phoenix-loader.jar"
value="${lib.dir}/phoenix-loader-20011230.jar"/>
+ <property name="phoenix-engine.jar"
value="${lib.dir}/phoenix-engine-20011230.jar"/>
+ <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20011230.jar"/>
<!--
<property name="activation.jar" value="${lib.dir}/activation.jar"/>
@@ -365,6 +363,7 @@
<target name="dist-lite" depends="sar">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/bin"/>
+ <mkdir dir="${dist.dir}/ext"/>
<delete dir="${dist.dir}/apps/${name}"/>
<copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
1.2 +13 -12 jakarta-james/proposals/rmi-remotemanager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/proposals/rmi-remotemanager/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 26 Oct 2001 05:06:54 -0000 1.1
+++ build.xml 12 Jan 2002 01:10:29 -0000 1.2
@@ -2,7 +2,7 @@
<!-- ==========================================================================
- James build file $Revision: 1.1 $ Committed on $Date: 2001/10/26 05:06:54 $ by:
$Author: serge $
+ James build file $Revision: 1.2 $ Committed on $Date: 2002/01/12 01:10:29 $ by:
$Author: darrell $
Authors:
Federico Barbieri <[EMAIL PROTECTED]>
@@ -31,7 +31,7 @@
<property name="name" value="james"/>
<property name="Name" value="James"/>
- <property name="version" value="2.0a1-dev"/>
+ <property name="version" value="2.0a2"/>
<property name="year" value="1999-2001"/>
<!-- There should be no need to override default compiler but need to change
@@ -107,16 +107,16 @@
Set the classpath
===================================================================
-->
- <property name="xerces.jar" value="${lib.dir}/xerces.jar"/>
- <property name="framework.jar" value="${lib.dir}/avalon-framework-20010912.jar"/>
- <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20010919.jar"/>
- <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-20010919.jar"/>
- <property name="logkit.jar" value="${lib.dir}/logkit-20010912.jar"/>
- <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20010925.bar"/>
- <property name="phoenix.client.jar"
value="${lib.dir}/phoenix-client-20010925.jar"/>
- <property name="phoenix-loader.jar"
value="${lib.dir}/phoenix-loader-20010925.jar"/>
- <property name="phoenix-engine.jar"
value="${lib.dir}/phoenix-engine-20010925.jar"/>
- <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20010919.jar"/>
+ <property name="xerces.jar" value="${lib.dir}/xerces-1.4.3.jar"/>
+ <property name="framework.jar" value="${lib.dir}/avalon-framework-20011115.jar"/>
+ <property name="excalibur.jar" value="${lib.dir}/avalon-excalibur-20011120.jar"/>
+ <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-20011122.jar"/>
+ <property name="logkit.jar" value="${lib.dir}/logkit-1.0.jar"/>
+ <property name="cornerstone.bar" value="${lib.dir}/cornerstone-20011230.bar"/>
+ <property name="phoenix.client.jar"
value="${lib.dir}/phoenix-client-20011230.jar"/>
+ <property name="phoenix-loader.jar"
value="${lib.dir}/phoenix-loader-20011230.jar"/>
+ <property name="phoenix-engine.jar"
value="${lib.dir}/phoenix-engine-20011230.jar"/>
+ <property name="avalon-jmx.jar" value="${lib.dir}/avalon-jmx-20011230.jar"/>
<!--
<property name="activation.jar" value="${lib.dir}/activation.jar"/>
@@ -382,6 +382,7 @@
<target name="dist-lite" depends="sar">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/bin"/>
+ <mkdir dir="${dist.dir}/ext"/>
<delete dir="${dist.dir}/apps/${name}"/>
<copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
1.4 +2 -1
jakarta-james/src/java/org/apache/james/BaseConnectionHandler.java
Index: BaseConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/BaseConnectionHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseConnectionHandler.java 10 Nov 2001 22:59:24 -0000 1.3
+++ BaseConnectionHandler.java 12 Jan 2002 01:10:30 -0000 1.4
@@ -13,6 +13,7 @@
import java.util.*;
import javax.mail.internet.*;
import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
@@ -43,7 +44,7 @@
*
* @author Harmeet Bedi <[EMAIL PROTECTED]>
*/
-public class BaseConnectionHandler extends AbstractLoggable implements Configurable
{
+public class BaseConnectionHandler extends AbstractLogEnabled implements
Configurable {
protected int timeout;
protected String helloName;
1.10 +1 -1
jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java
Index: NNTPHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NNTPHandler.java 30 Nov 2001 09:12:31 -0000 1.9
+++ NNTPHandler.java 12 Jan 2002 01:10:30 -0000 1.10
@@ -31,12 +31,12 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.james.BaseConnectionHandler;
import org.apache.james.nntpserver.repository.NNTPArticle;
import org.apache.james.nntpserver.repository.NNTPGroup;
import org.apache.james.nntpserver.repository.NNTPLineReaderImpl;
import org.apache.james.nntpserver.repository.NNTPRepository;
-import org.apache.log.Logger;
/**
* The NNTP protocol is defined by RFC 977.
1.5 +3 -4 jakarta-james/src/java/org/apache/james/services/MailServer.java
Index: MailServer.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/services/MailServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailServer.java 31 Oct 2001 14:31:25 -0000 1.4
+++ MailServer.java 12 Jan 2002 01:10:30 -0000 1.5
@@ -13,7 +13,6 @@
import javax.mail.internet.*;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-import org.apache.avalon.phoenix.Service;
/**
* The interface for Phoenix blocks to the James MailServer
@@ -21,11 +20,11 @@
* @author Federico Barbieri <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]";>Charles Benett</a>
*
- * This is $Revision: 1.4 $
- * Committed on $Date: 2001/10/31 14:31:25 $ by: $Author: serge $
+ * This is $Revision: 1.5 $
+ * Committed on $Date: 2002/01/12 01:10:30 $ by: $Author: darrell $
*/
public interface MailServer
- extends Service {
+{
String ROLE = "org.apache.james.services.MailServer";
1.4 +1 -2 jakarta-james/src/java/org/apache/james/services/UsersStore.java
Index: UsersStore.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/services/UsersStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UsersStore.java 17 Nov 2001 15:52:39 -0000 1.3
+++ UsersStore.java 12 Jan 2002 01:10:30 -0000 1.4
@@ -8,7 +8,6 @@
package org.apache.james.services;
import java.util.Iterator;
-import org.apache.avalon.phoenix.Service;
/**
* Interface for Phoenix blocks to access a store of Users. A UserStore
@@ -20,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Charles Benett</a>
*/
public interface UsersStore
- extends Service {
+{
String ROLE = "org.apache.james.services.UsersStore";
1.3 +1 -1
jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
Index: AbstractJdbcUsersRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractJdbcUsersRepository.java 27 Sep 2001 21:12:47 -0000 1.2
+++ AbstractJdbcUsersRepository.java 12 Jan 2002 01:10:30 -0000 1.3
@@ -48,7 +48,7 @@
* @author Darrell DeBoer <[EMAIL PROTECTED]>
*/
public abstract class AbstractJdbcUsersRepository extends AbstractUsersRepository
- implements UsersRepository, Loggable, Component, Contextualizable, Composable,
Configurable, Initializable
+ implements Component, Contextualizable, Composable, Configurable, Initializable
{
protected Context context;
protected Map m_sqlParameters;
1.3 +2 -1
jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
Index: UsersLDAPRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UsersLDAPRepository.java 11 Jun 2001 09:29:36 -0000 1.2
+++ UsersLDAPRepository.java 12 Jan 2002 01:10:30 -0000 1.3
@@ -35,7 +35,8 @@
* @author Charles Bennett
*/
public class UsersLDAPRepository
- implements UsersRepository, Loggable, Configurable, Contextualizable,
Initializable{
+ implements UsersRepository, Loggable, Configurable, Contextualizable,
Initializable
+{
private ComponentManager comp;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
