You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by vi...@apache.org on 2005/05/03 17:15:57 UTC
svn commit: r167921 - in
/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james: core/
mailrepository/ smtpserver/ transport/mailets/
Author: vincenzo
Date: Tue May 3 08:15:56 2005
New Revision: 167921
URL: http://svn.apache.org/viewcvs?rev=167921&view=rev
Log:
Some fixes to get compiled
Modified:
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonUsersStore.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MailHeaders.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MimeMessageWrapper.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCAlias.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCListserv.java
james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonUsersStore.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonUsersStore.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonUsersStore.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/AvalonUsersStore.java Tue May 3 08:15:56 2005
@@ -41,7 +41,7 @@
*/
public class AvalonUsersStore
extends AbstractLogEnabled
- implements Contextualizable, Servicable, Configurable, Initializable, UsersStore {
+ implements Contextualizable, Serviceable, Configurable, Initializable, UsersStore {
/**
* A mapping of respository identifiers to actual repositories
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MailHeaders.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MailHeaders.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MailHeaders.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MailHeaders.java Tue May 3 08:15:56 2005
@@ -22,7 +22,7 @@
import java.io.*;
import java.util.Enumeration;
-import org.apache.james.mailet.RFC2822Headers;
+import org.apache.mailet.RFC2822Headers;
/**
* This interface defines a container for mail headers. Each header must use
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MimeMessageWrapper.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MimeMessageWrapper.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MimeMessageWrapper.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/core/MimeMessageWrapper.java Tue May 3 08:15:56 2005
@@ -47,8 +47,8 @@
import java.util.Enumeration;
import org.apache.james.util.InternetPrintWriter;
-import org.apache.james.mailet.RFC2822Headers;
-import org.apache.james.mailet.dates.RFC822DateFormat;
+import org.apache.mailet.RFC2822Headers;
+import org.apache.mailet.dates.RFC822DateFormat;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.excalibur.io.IOUtil;
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/JDBCMailRepository.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/JDBCMailRepository.java Tue May 3 08:15:56 2005
@@ -17,7 +17,7 @@
package org.apache.james.mailrepository;
-import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/smtpserver/SMTPServer.java Tue May 3 08:15:56 2005
@@ -50,7 +50,7 @@
* IMPORTANT: SMTPServer extends AbstractJamesService. If you implement ANY
* lifecycle methods, you MUST call super.<method> as well.
*/
-public class SMTPServer extends AbstractJamesService implements Component, SMTPServerMBean {
+public class SMTPServer extends AbstractJamesService implements SMTPServerMBean {
/**
* The mailet context - we access it here to set the hello name for the Mailet API
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCAlias.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCAlias.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCAlias.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCAlias.java Tue May 3 08:15:56 2005
@@ -17,7 +17,7 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.james.Constants;
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCListserv.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCListserv.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCListserv.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCListserv.java Tue May 3 08:15:56 2005
@@ -17,7 +17,7 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.james.Constants;
Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?rev=167921&r1=167920&r2=167921&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Tue May 3 08:15:56 2005
@@ -17,7 +17,7 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.cornerstone.services.datasource.DataSourceSelector;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.james.Constants;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org