Diff from a snapshtop that's probably a couple of weeks old against the current CVS HEAD. That will give you an idea of the changes - nothing interlectual - just replacements of CM with SM, CE with SE, etc. Pete basically did the same thing but against 1.2 so its doubtful that anything in the diff will help - but here it is anyway.
Cheers, Steve.
p.s. The modification to the testcase (the very last entry) is a hack to eliminate the problem of the testcase killing the test user while the spool is busy writing messages to that user.
[EMAIL PROTECTED] wrote:
Index: src/Manifest.mfCan you send the patch of your changes to list. It seems to be that the best course is commit to head, have a regression or two for some time, let everybody test and fix it. Infinite loop problem should be easy to track down.
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/Manifest.mf,v
retrieving revision 1.6
diff -r1.6 Manifest.mf
4,35d3
< Name: org/apache/james/James.class
< Avalon-Block: true
<
< Name: org/apache/james/core/AvalonMailStore.class
< Avalon-Block: true
<
< Name: org/apache/james/core/AvalonUsersStore.class
< Avalon-Block: true
<
< Name: org/apache/james/nntpserver/NNTPServer.class
< Avalon-Block: true
<
< Name: org/apache/james/nntpserver/repository/NNTPRepositoryImpl.class
< Avalon-Block: true
<
< Name: org/apache/james/smtpserver/SMTPServer.class
< Avalon-Block: true
<
< Name: org/apache/james/pop3server/POP3Server.class
< Avalon-Block: true
<
< Name: org/apache/james/remotemanager/RemoteManager.class
< Avalon-Block: true
<
< Name: org/apache/james/dnsserver/DNSServer.class
< Avalon-Block: true
<
< Name: org/apache/james/transport/JamesSpoolManager.class
< Avalon-Block: true
<
< Name: org/apache/james/nntpserver/AuthServiceImpl.class
< Avalon-Block: true
cvs server: Diffing src/conf
Index: src/conf/james-assembly.xml
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/conf/james-assembly.xml,v
retrieving revision 1.13
diff -r1.13 james-assembly.xml
37c37
< role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" />
---
> role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
117c117
< role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" />
---
> role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
126c126
< role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" />
---
> role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
158c158
< class="org.apache.avalon.cornerstone.blocks.datasource.DefaultDataSourceSelector" />
---
> class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector" />
cvs server: Diffing src/java
cvs server: Diffing src/java/org
cvs server: Diffing src/java/org/apache
cvs server: Diffing src/java/org/apache/james
Index: src/java/org/apache/james/James.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.43
diff -r1.43 James.java
35,39c35,38
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
< import org.apache.avalon.framework.component.DefaultComponentManager;
---
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.DefaultServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
79,80c78,79
< implements Contextualizable, Composable, Configurable, JamesMBean,
< Initializable, MailServer, MailetContext, Component {
---
> implements Contextualizable, Serviceable, Configurable, JamesMBean,
> Initializable, MailServer, MailetContext {
90c89
< private DefaultComponentManager compMgr; //Components shared
---
> private DefaultServiceManager compMgr; //Components shared
201c200
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Servicable#service(ServiceManager)
203,204c202,203
< public void compose(ComponentManager comp) {
< compMgr = new DefaultComponentManager(comp);
---
> public void service( ServiceManager comp) {
> compMgr = new DefaultServiceManager(comp);
344c343
< compMgr.put( "org.apache.mailet.UsersRepository", (Component)localusers);
---
> compMgr.put( "org.apache.mailet.UsersRepository", localusers);
369c368
< // For AVALON aware mailets and matchers, we put the Component object as
---
> // For AVALON aware mailets and matchers, we put the object as
577c576
< } catch ( final ComponentException cme ) {
---
> } catch ( final ServiceException cme ) {
876c875
< } catch (ComponentException cnfe) {
---
> } catch (ServiceException cnfe) {
Index: src/java/org/apache/james/James.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/James.xinfo,v
retrieving revision 1.4
diff -r1.4 James.xinfo
43c43
< <service name="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" version="1.0"/>
---
> <service name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" version="1.0"/>
cvs server: Diffing src/java/org/apache/james/context
cvs server: Diffing src/java/org/apache/james/core
Index: src/java/org/apache/james/core/AbstractJamesService.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/core/AbstractJamesService.java,v
retrieving revision 1.7
diff -r1.7 AbstractJamesService.java
24,27c24,26
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
---
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.Serviceable;
43c42
< implements Component,Composable,Configurable,Disposable,Initializable,
---
> implements Serviceable,Configurable,Disposable,Initializable,
118c117
< private ComponentManager compMgr;
---
> private ServiceManager compMgr;
130a130,134
> * Flag holding the disposed state of the component.
> */
> private boolean m_disposed = false;
>
> /**
148c152
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
150,151c154,155
< public void compose(ComponentManager comp) throws ComponentException {
< super.compose(comp);
---
> public void service(ServiceManager comp) throws ServiceException {
> super.service( comp );
305,308c309,316
< StringBuffer infoBuffer =
< new StringBuffer(64).append(getServiceType()).append(
< " dispose... ").append(connectionName);
< getLogger().debug(infoBuffer.toString());
---
> if( m_disposed )
> {
> if( getLogger().isWarnEnabled() )
> {
> getLogger().warn( "ignoring disposal request - already disposed" );
> }
> return;
> }
310c318,333
< try {
---
> if( getLogger().isDebugEnabled() )
> {
> getLogger().debug( "disposal" );
> }
>
> m_disposed = true;
> if( getLogger().isDebugEnabled() )
> {
> StringBuffer infoBuffer =
> new StringBuffer(64).append(getServiceType()).append(
> " dispose... ").append(connectionName);
> getLogger().debug(infoBuffer.toString());
> }
>
> try
> {
312,314c335,341
< } catch(final Exception e) {
< StringBuffer warnBuffer =
< new StringBuffer(64).append("Error disconnecting ")
---
> }
> catch(final Throwable e)
> {
> if( getLogger().isWarnEnabled() )
> {
> StringBuffer warnBuffer =
> new StringBuffer(64).append("Error disconnecting ")
316c343,344
< getLogger().warn(warnBuffer.toString(),e);
---
> getLogger().warn(warnBuffer.toString(),e);
> }
Index: src/java/org/apache/james/core/AvalonMailStore.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.21
diff -r1.21 AvalonMailStore.java
11,13d10
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
14a12,14
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.Serviceable;
37c37
< implements Contextualizable, Composable, Configurable, Initializable, MailStore {
---
> implements Contextualizable, Serviceable, Configurable, Initializable, MailStore {
68c68
< protected ComponentManager componentManager;
---
> protected ServiceManager m_manager;
81c81
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Servicable#service(ServiceManager)
83,84c83,84
< public void compose( final ComponentManager componentManager )
< throws ComponentException
---
> public void service( final ServiceManager manager )
> throws ServiceException
86c86
< this.componentManager = componentManager;
---
> this.m_manager = manager;
199,200c199,200
< * @throws ComponentException if any error occurs while parsing the
< * Configuration or retrieving the
---
> * @throws ServiceException if any error occurs while parsing the
> * Configuration or retrieving the
203c203
< public synchronized Component select(Object hint) throws ComponentException {
---
> public synchronized Object select(Object hint) throws ServiceException {
208c208
< throw new ComponentException(
---
> throw new ServiceException(
217c217
< throw new ComponentException(
---
> throw new ServiceException(
222c222
< throw new ComponentException(
---
> throw new ServiceException(
242c242
< return (Component)reply;
---
> return reply;
282a283,285
> if (reply instanceof Serviceable) {
> ((Serviceable) reply).service( m_manager );
> }
284c287,289
< ((Composable) reply).compose( componentManager );
---
> final String error = "no implementation in place to support Coposable";
> getLogger().error( error );
> throw new IllegalArgumentException( error );
302c307
< return (Component)reply;
---
> return reply;
310c315
< ComponentException("Cannot find or init repository",
---
> ServiceException("Cannot find or init repository",
315c320
< throw new ComponentException( "Malformed configuration", ce );
---
> throw new ServiceException( "Malformed configuration", ce );
357,358c362,363
< public boolean hasComponent( Object hint ) {
< Component comp = null;
---
> public boolean isSelectable( Object hint ) {
> Object comp = null;
361c366
< } catch(ComponentException ex) {
---
> } catch(ServiceException ex) {
413c418
< public void release(Component component) {}
---
> public void release(Object component) {}
Index: src/java/org/apache/james/core/AvalonMailStore.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.xinfo,v
retrieving revision 1.3
diff -r1.3 AvalonMailStore.xinfo
20c20
< <service name="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" version="1.0"/>
---
> <service name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" version="1.0"/>
Index: src/java/org/apache/james/core/AvalonUsersStore.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.16
diff -r1.16 AvalonUsersStore.java
11,13d10
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
14a12,14
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
34c34
< implements Component, Contextualizable, Composable, Configurable, Initializable, UsersStore {
---
> implements Contextualizable, Serviceable, Configurable, Initializable, UsersStore {
55c55
< protected ComponentManager componentManager;
---
> protected ServiceManager manager;
66c66
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#compose(ServiceManager)
68,70c68,70
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
< this.componentManager = componentManager;
---
> public void service( final ServiceManager manager )
> throws ServiceException {
> this.manager = manager;
108c108
< setupLogger((Component)rep);
---
> setupLogger(rep);
112a113,115
> if (rep instanceof Serviceable) {
> ((Serviceable) rep).service( manager );
> }
114c117,119
< ((Composable) rep).compose( componentManager );
---
> final String error = "no implementation in place to support Coposable";
> getLogger().error( error );
> throw new IllegalArgumentException( error );
Index: src/java/org/apache/james/core/AvalonUsersStore.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.xinfo,v
retrieving revision 1.3
diff -r1.3 AvalonUsersStore.xinfo
20c20
< <service name="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector" version="1.0"/>
---
> <service name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" version="1.0"/>
Index: src/java/org/apache/james/core/MailImpl.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/core/MailImpl.java,v
retrieving revision 1.21
diff -r1.21 MailImpl.java
492a493
>
cvs server: Diffing src/java/org/apache/james/dnsserver
cvs server: Diffing src/java/org/apache/james/fetchpop
Index: src/java/org/apache/james/fetchpop/FetchPOP.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/fetchpop/FetchPOP.java,v
retrieving revision 1.8
diff -r1.8 FetchPOP.java
17,20c17,19
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
< import org.apache.avalon.framework.component.DefaultComponentManager;
---
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.Serviceable;
115c114
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
117c116
< public void compose(final ComponentManager componentManager) throws ComponentException {
---
> public void compose(final ServiceManager componentManager) throws ServiceException {
124c123
< throw new ComponentException(errorBuffer.toString());
---
> throw new ServiceException(errorBuffer.toString());
Index: src/java/org/apache/james/fetchpop/FetchScheduler.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/fetchpop/FetchScheduler.java,v
retrieving revision 1.7
diff -r1.7 FetchScheduler.java
13,17c13,16
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
< import org.apache.avalon.framework.component.DefaultComponentManager;
---
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.DefaultServiceManager;
35c34
< implements Component, Composable, Configurable, Initializable, Disposable {
---
> implements Serviceable, Configurable, Initializable, Disposable {
45c44
< private ComponentManager compMgr;
---
> private ServiceManager compMgr;
60c59
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
62c61
< public void compose(ComponentManager comp) throws ComponentException {
---
> public void service(ServiceManager comp) throws ServiceException {
Index: src/java/org/apache/james/fetchpop/FetchScheduler.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/fetchpop/FetchScheduler.xinfo,v
retrieving revision 1.2
diff -r1.2 FetchScheduler.xinfo
10,14d9
< <!-- services that are offered by this block -->
< <services>
< <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
< </services>
<
cvs server: Diffing src/java/org/apache/james/mailrepository
Index: src/java/org/apache/james/mailrepository/AvalonMailRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.27
diff -r1.27 AvalonMailRepository.java
21,24c21,23
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
---
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.Serviceable;
50c49
< implements MailRepository, Component, Configurable, Composable, Initializable {
---
> implements MailRepository, Configurable, Serviceable, Initializable {
68c67
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#compose(ServiceManager )
70,71c69,70
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
---
> public void service( final ServiceManager componentManager )
> throws ServiceException {
Index: src/java/org/apache/james/mailrepository/JDBCMailRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java,v
retrieving revision 1.37
diff -r1.37 JDBCMailRepository.java
32c32
< import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
---
> import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
37,40c37,39
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
---
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
77c76
< implements MailRepository, Component, Contextualizable, Composable, Configurable, Initializable {
---
> implements MailRepository, Contextualizable, Serviceable, Configurable, Initializable {
87c86
< private ComponentManager componentManager;
---
> private ServiceManager componentManager;
168c167
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Servicable#service(ServiceManager)
170,171c169,170
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
---
> public void service( final ServiceManager componentManager )
> throws ServiceException {
cvs server: Diffing src/java/org/apache/james/mailrepository/filepair
Index: src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java,v
retrieving revision 1.3
diff -r1.3 AbstractFileRepository.java
26a27
> import org.apache.avalon.framework.context.ContextException;
31d31
< import org.apache.avalon.phoenix.BlockContext;
58d57
< protected BlockContext m_context;
62c61
< public void contextualize( final Context context )
---
> public void contextualize( final Context context ) throws ContextException
64,65c63
< final BlockContext blockContext = (BlockContext) context;
< m_baseDirectory = blockContext.getBaseDirectory();
---
> m_baseDirectory = (File) context.get( "app.home" );
Index: src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java,v
retrieving revision 1.3
diff -r1.3 RepositoryManager.java
16,18d15
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
19a17,19
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
34c34
< implements Store, Contextualizable, Composable, Configurable
---
> implements Store, Contextualizable, Serviceable, Configurable
42c42
< protected ComponentManager m_componentManager;
---
> protected ServiceManager m_componentManager;
50,51c50,51
< public void compose( final ComponentManager componentManager )
< throws ComponentException
---
> public void service( final ServiceManager componentManager )
> throws ServiceException
98c98
< public void release( final Component component )
---
> public void release( final Object component )
102c102
< public boolean hasComponent( final Object hint )
---
> public boolean isSelectable( final Object hint )
110,111c110,111
< public Component select( final Object hint )
< throws ComponentException
---
> public Object select( final Object hint )
> throws ServiceException
120c120
< throw new ComponentException( "Hint is of the wrong type. " +
---
> throw new ServiceException( "Hint is of the wrong type. " +
131c131
< throw new ComponentException( "Malformed configuration has no " +
---
> throw new ServiceException( "Malformed configuration has no " +
136c136
< throw new ComponentException( "destination is malformed. " +
---
> throw new ServiceException( "destination is malformed. " +
157c157
< throw new ComponentException( message );
---
> throw new ServiceException( message );
178c178
< if( reply instanceof Composable )
---
> if( reply instanceof Serviceable )
180c180,186
< ( (Composable)reply ).compose( m_componentManager );
---
> ( (Serviceable)reply ).service( m_componentManager );
> }
>
> if (reply instanceof Composable) {
> final String error = "no implementation in place to support Coposable";
> getLogger().error( error );
> throw new IllegalArgumentException( error );
204c210
< throw new ComponentException( message, e );
---
> throw new ServiceException( message, e );
210c216
< throw new ComponentException( "Malformed configuration", ce );
---
> throw new ServiceException( "Malformed configuration", ce );
cvs server: Diffing src/java/org/apache/james/nntpserver
Index: src/java/org/apache/james/nntpserver/NNTPServer.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.java,v
retrieving revision 1.15
diff -r1.15 NNTPServer.java
20,23d19
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
24a21,23
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
41c40
< public class NNTPServer extends AbstractJamesService implements Component {
---
> public class NNTPServer extends AbstractJamesService {
80c79
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
82,84c81,83
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
< super.compose(componentManager);
---
> public void service( final ServiceManager componentManager )
> throws ServiceException {
> super.service(componentManager);
88c87
< throw new ComponentException("The user repository could not be found.");
---
> throw new ServiceException("The user repository could not be found.");
Index: src/java/org/apache/james/nntpserver/NNTPServer.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.xinfo,v
retrieving revision 1.6
diff -r1.6 NNTPServer.xinfo
10,14d9
< <!-- services that are offered by this block -->
< <services>
< <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
< </services>
<
cvs server: Diffing src/java/org/apache/james/nntpserver/repository
cvs server: Diffing src/java/org/apache/james/pop3server
Index: src/java/org/apache/james/pop3server/POP3Server.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java,v
retrieving revision 1.15
diff -r1.15 POP3Server.java
20,23c20,22
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
---
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.Serviceable;
43c42
< public class POP3Server extends AbstractJamesService implements Component {
---
> public class POP3Server extends AbstractJamesService {
84c83
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#compose(ServiceManager)
86,88c85,87
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
< super.compose(componentManager);
---
> public void service( final ServiceManager componentManager )
> throws ServiceException {
> super.service(componentManager);
95c94
< throw new ComponentException("The user repository could not be found.");
---
> throw new ServiceException("The user repository could not be found.");
Index: src/java/org/apache/james/pop3server/POP3Server.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/pop3server/POP3Server.xinfo,v
retrieving revision 1.3
diff -r1.3 POP3Server.xinfo
10,14d9
< <!-- services that are offered by this block -->
< <services>
< <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
< </services>
<
cvs server: Diffing src/java/org/apache/james/remotemanager
Index: src/java/org/apache/james/remotemanager/RemoteManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java,v
retrieving revision 1.15
diff -r1.15 RemoteManager.java
19,21c19,20
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
---
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
41c40
< extends AbstractJamesService implements Component {
---
> extends AbstractJamesService {
85c84
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
87,89c86,88
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
< super.compose(componentManager);
---
> public void service( final ServiceManager componentManager )
> throws ServiceException {
> super.service(componentManager);
96c95
< throw new ComponentException("The user repository could not be found.");
---
> throw new ServiceException("The user repository could not be found.");
Index: src/java/org/apache/james/remotemanager/RemoteManager.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.xinfo,v
retrieving revision 1.5
diff -r1.5 RemoteManager.xinfo
10,14d9
< <!-- services that are offered by this block -->
< <services>
< <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
< </services>
<
cvs server: Diffing src/java/org/apache/james/security
cvs server: Diffing src/java/org/apache/james/services
cvs server: Diffing src/java/org/apache/james/smtpserver
Index: src/java/org/apache/james/smtpserver/SMTPServer.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java,v
retrieving revision 1.19
diff -r1.19 SMTPServer.java
18,19c18,19
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
---
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
22d21
< import org.apache.avalon.framework.component.Component;
47c46
< public class SMTPServer extends AbstractJamesService implements Component {
---
> public class SMTPServer extends AbstractJamesService {
114c113
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
116,119c115,118
< public void compose(final ComponentManager componentManager) throws ComponentException {
< super.compose(componentManager);
< mailetcontext = (MailetContext) componentManager.lookup("org.apache.mailet.MailetContext");
< mailServer = (MailServer) componentManager.lookup("org.apache.james.services.MailServer");
---
> public void service( final ServiceManager manager ) throws ServiceException {
> super.service( manager );
> mailetcontext = (MailetContext) manager.lookup("org.apache.mailet.MailetContext");
> mailServer = (MailServer) manager.lookup("org.apache.james.services.MailServer");
121c120
< (UsersStore) componentManager.lookup("org.apache.james.services.UsersStore");
---
> (UsersStore) manager.lookup("org.apache.james.services.UsersStore");
124c123
< throw new ComponentException("The user repository could not be found.");
---
> throw new ServiceException("The user repository could not be found.");
Index: src/java/org/apache/james/smtpserver/SMTPServer.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.xinfo,v
retrieving revision 1.5
diff -r1.5 SMTPServer.xinfo
10,14d9
< <!-- services that are offered by this block -->
< <services>
< <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
< </services>
<
cvs server: Diffing src/java/org/apache/james/transport
Index: src/java/org/apache/james/transport/JamesSpoolManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.25
diff -r1.25 JamesSpoolManager.java
16,20c16,20
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
< import org.apache.avalon.framework.component.DefaultComponentManager;
---
> import org.apache.avalon.framework.activity.Executable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.DefaultServiceManager;
47c47
< implements Composable, Configurable, Initializable, Runnable, Disposable, Component, Contextualizable {
---
> implements Serviceable, Configurable, Initializable, Runnable, Disposable, Contextualizable {
56c56
< private DefaultComponentManager compMgr;
---
> private DefaultServiceManager compMgr;
78a79
>
80c81
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
82c83
< public void compose(ComponentManager comp) throws ComponentException {
---
> public void service(ServiceManager comp) throws ServiceException {
84c85
< compMgr = new DefaultComponentManager(comp);
---
> compMgr = new DefaultServiceManager(comp);
85a87
>
244c246
< workerPool.execute(this);
---
> workerPool.execute( this);
245a248,256
>
> /**
> * Invokes run.
> */
> public void execute()
> {
> run();
> }
>
Index: src/java/org/apache/james/transport/JamesSpoolManager.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/JamesSpoolManager.xinfo,v
retrieving revision 1.3
diff -r1.3 JamesSpoolManager.xinfo
10,14d9
< <!-- services that are offered by this block -->
< <services>
< <service name="org.apache.avalon.framework.component.Component" version="1.0"/>
< </services>
<
Index: src/java/org/apache/james/transport/Loader.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/Loader.java,v
retrieving revision 1.4
diff -r1.4 Loader.java
21c21
< import org.apache.avalon.phoenix.BlockContext;
---
>
35a36
>
37,43c38,48
< * @see org.apache.avalon.framework.context.Contextualizable#contextualize(Context)
< */
< public void contextualize(final Context context) throws ContextException {
< try {
< baseDirectory = ((BlockContext) context).getBaseDirectory().getCanonicalPath();
< } catch (IOException e) {
< logger.error("cant get base directory for mailet loader");
---
> * @see org.apache.avalon.framework.context.Contextualizable#contextualize(Context)
> */
> public void contextualize(final Context context) throws ContextException
> {
> try
> {
> baseDirectory = ((File)context.get( "app.home") ).getCanonicalPath();
> }
> catch (Throwable e)
> {
> logger.error( "cant get base directory for mailet loader" );
46a52
>
Index: src/java/org/apache/james/transport/MailetLoader.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/MailetLoader.java,v
retrieving revision 1.10
diff -r1.10 MailetLoader.java
11d10
< import org.apache.avalon.framework.component.Component;
23c22
< public class MailetLoader extends Loader implements Component, Configurable {
---
> public class MailetLoader extends Loader implements Configurable {
Index: src/java/org/apache/james/transport/MatchLoader.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/MatchLoader.java,v
retrieving revision 1.12
diff -r1.12 MatchLoader.java
13d12
< import org.apache.avalon.framework.component.Component;
25c24
< public class MatchLoader extends Loader implements Component, Configurable {
---
> public class MatchLoader extends Loader implements Configurable {
cvs server: Diffing src/java/org/apache/james/transport/mailets
Index: src/java/org/apache/james/transport/mailets/JDBCAlias.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/mailets/JDBCAlias.java,v
retrieving revision 1.12
diff -r1.12 JDBCAlias.java
22c22
< import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
---
> import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
24c24
< import org.apache.avalon.framework.component.ComponentManager;
---
> import org.apache.avalon.framework.service.ServiceManager;
76c76
< ComponentManager componentManager = (ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
---
> ServiceManager componentManager = (ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
Index: src/java/org/apache/james/transport/mailets/JDBCListserv.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/mailets/JDBCListserv.java,v
retrieving revision 1.12
diff -r1.12 JDBCListserv.java
22c22
< import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
---
> import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
24c24
< import org.apache.avalon.framework.component.ComponentManager;
---
> import org.apache.avalon.framework.service.ServiceManager;
110c110
< ComponentManager componentManager = (ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
---
> ServiceManager componentManager = (ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
Index: src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java,v
retrieving revision 1.3
diff -r1.3 JDBCVirtualUserTable.java
22c22
< import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
---
> import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
24c24
< import org.apache.avalon.framework.component.ComponentManager;
---
> import org.apache.avalon.framework.service.ServiceManager;
122c122
< ComponentManager componentManager = (ComponentManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
---
> ServiceManager componentManager = (ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
cvs server: Diffing src/java/org/apache/james/transport/mailets/debug
cvs server: Diffing src/java/org/apache/james/transport/matchers
cvs server: Diffing src/java/org/apache/james/userrepository
Index: src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.18
diff -r1.18 AbstractJdbcUsersRepository.java
23c23
< import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
---
> import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
27,29d26
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
35a33,35
> import org.apache.avalon.framework.service.Serviceable;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
64c64
< implements Contextualizable, Composable, Configurable, Initializable
---
> implements Contextualizable, Serviceable, Configurable, Initializable
108c108
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#compose(ServiceManager)
110,111c110,111
< public void compose( final ComponentManager componentManager )
< throws ComponentException
---
> public void service( final ServiceManager componentManager )
> throws ServiceException
Index: src/java/org/apache/james/userrepository/AbstractUsersRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java,v
retrieving revision 1.12
diff -r1.12 AbstractUsersRepository.java
10d9
< import org.apache.avalon.framework.component.Component;
27c26
< implements UsersRepository, Component {
---
> implements UsersRepository {
Index: src/java/org/apache/james/userrepository/UsersFileRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java,v
retrieving revision 1.14
diff -r1.14 UsersFileRepository.java
13,16c13,15
< import org.apache.avalon.framework.component.Component;
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
---
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.Serviceable;
43,44c42,43
< implements UsersRepository, Component, Configurable, Composable, Initializable {
<
---
> implements UsersRepository, Configurable, Serviceable, Initializable {
> 62c61
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
64,65c63,64
< public void compose( final ComponentManager componentManager )
< throws ComponentException {
---
> public void service( final ServiceManager componentManager )
> throws ServiceException {
73c72
< throw new ComponentException( message, e );
---
> throw new ServiceException ( message, e );
Index: src/java/org/apache/james/userrepository/UsersLDAPRepository.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.13
diff -r1.13 UsersLDAPRepository.java
30c30
< import org.apache.avalon.framework.component.ComponentManager;
---
> import org.apache.avalon.framework.service.ServiceManager;
54c54
< private ComponentManager comp;
---
> private ServiceManager comp;
93c93
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
95c95
< public void compose(ComponentManager compMgr) {
---
> public void service(ServiceManager compMgr) {
cvs server: Diffing src/java/org/apache/james/util
cvs server: Diffing src/java/org/apache/james/util/connection
Index: src/java/org/apache/james/util/connection/ServerConnection.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/util/connection/ServerConnection.java,v
retrieving revision 1.5
diff -r1.5 ServerConnection.java
28d27
< import org.apache.avalon.framework.component.Component;
40c39
< implements Component, Initializable, Runnable {
---
> implements Initializable, Runnable {
335c334
< implements Component, Poolable, Runnable {
---
> implements Poolable, Runnable {
Index: src/java/org/apache/james/util/connection/SimpleConnectionManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/util/connection/SimpleConnectionManager.java,v
retrieving revision 1.4
diff -r1.4 SimpleConnectionManager.java
19,21c19,21
< import org.apache.avalon.framework.component.ComponentException;
< import org.apache.avalon.framework.component.ComponentManager;
< import org.apache.avalon.framework.component.Composable;
---
> import org.apache.avalon.framework.service.ServiceException;
> import org.apache.avalon.framework.service.ServiceManager;
> import org.apache.avalon.framework.service.Serviceable;
37c37
< implements ConnectionManager, Composable, Configurable, Disposable {
---
> implements ConnectionManager, Serviceable, Configurable, Disposable {
116c116
< * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
---
> * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
118,119c118,119
< public void compose(ComponentManager componentManager)
< throws ComponentException {
---
> public void service(ServiceManager componentManager)
> throws ServiceException {
126a127
>
cvs server: Diffing src/java/org/apache/james/util/mordred
cvs server: Diffing src/java/org/apache/james/util/watchdog
Index: src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java,v
retrieving revision 1.2
diff -r1.2 InaccurateTimeoutWatchdog.java
103,104c103,108
< if (watchdogThread != null) {
< getLogger().debug("Calling reset() " + watchdogThread.getName());
---
> if (watchdogThread != null)
> {
> if( getLogger().isDebugEnabled() )
> {
> getLogger().debug("Calling reset() " + watchdogThread.getName());
> }
106c110,113
< getLogger().debug("Calling reset() for inactive watchdog");
---
> if( getLogger().isDebugEnabled() )
> {
> getLogger().debug("Calling reset() for inactive watchdog");
> }
cvs server: Diffing src/java/org/apache/mailet
cvs server: Diffing src/java/org/apache/mailet/dates
cvs server: Diffing src/script
cvs server: Diffing src/xdocs
cvs server: Diffing src/xdocs/images
cvs server: Diffing src/xdocs/stylesheets
cvs server: Diffing tests
cvs server: Diffing tests/src
cvs server: Diffing tests/src/conf
cvs server: Diffing tests/src/java
cvs server: Diffing tests/src/java/org
cvs server: Diffing tests/src/java/org/apache
cvs server: Diffing tests/src/java/org/apache/james
cvs server: Diffing tests/src/java/org/apache/james/testing
Index: tests/src/java/org/apache/james/testing/DeliveryTests.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/tests/src/java/org/apache/james/testing/DeliveryTests.java,v
retrieving revision 1.1
diff -r1.1 DeliveryTests.java
42c42
< assert(false);
---
> assertTrue(false);
44c44
< assert(false);
---
> assertTrue(false);
46c46
< assert(true);
---
> assertTrue(true);
57c57
< assert(false);
---
> assertTrue(false);
59c59
< assert(false);
---
> assertTrue(false);
61c61
< assert(true);
---
> assertTrue(true);
Index: tests/src/java/org/apache/james/testing/EndToEnd.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/tests/src/java/org/apache/james/testing/EndToEnd.java,v
retrieving revision 1.3
diff -r1.3 EndToEnd.java
112,114c112,114
< client.connect("127.0.0.1", 4555);
< runTelnetScript(client, script2);
< client.disconnect();
---
> //client.connect("127.0.0.1", 4555);
> //runTelnetScript(client, script2);
> //client.disconnect();
--
Stephen J. McConnell
mailto:[EMAIL PROTECTED]
http://www.osm.net
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
