You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/08/11 16:30:11 UTC

svn commit: r684758 - in /james/server/trunk: core-library/src/main/java/org/apache/james/management/ core-library/src/main/java/org/apache/james/services/ core-library/src/main/resources/org/apache/james/management/ phoenix-deployment/src/conf/ remote...

Author: bago
Date: Mon Aug 11 07:30:08 2008
New Revision: 684758

URL: http://svn.apache.org/viewvc?rev=684758&view=rev
Log:
Move interfaces for management services to from services to management package.

Added:
    james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagementService.java
      - copied, changed from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/BayesianAnalyzerManagementService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagementService.java   (contents, props changed)
      - copied, changed from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/DomainListManagementService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagementService.java
      - copied, changed from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/ProcessorManagementService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java   (contents, props changed)
      - copied, changed from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/SpoolManagementService.java
Removed:
    james/server/trunk/core-library/src/main/java/org/apache/james/services/BayesianAnalyzerManagementService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/services/DomainListManagementService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/services/ProcessorManagementService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/services/SpoolManagementService.java
Modified:
    james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagement.java
    james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java
    james/server/trunk/core-library/src/main/resources/org/apache/james/management/BayesianAnalyzerManagement.xinfo
    james/server/trunk/core-library/src/main/resources/org/apache/james/management/DomainListManagement.xinfo
    james/server/trunk/core-library/src/main/resources/org/apache/james/management/ProcessorManagement.xinfo
    james/server/trunk/core-library/src/main/resources/org/apache/james/management/SpoolManagement.xinfo
    james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
    james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
    james/server/trunk/remotemanager-function/src/main/resources/org/apache/james/remotemanager/RemoteManager.xinfo
    james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
    james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
    james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java Mon Aug 11 07:30:08 2008
@@ -46,7 +46,6 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.services.BayesianAnalyzerManagementService;
 import org.apache.james.services.FileSystem;
 import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
 
@@ -135,7 +134,7 @@
     }
     
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#addHamFromDir(String)
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#addHamFromDir(String)
      */
     public int addHamFromDir(String dir) throws BayesianAnalyzerManagementException {
         if (repos == null) throw new BayesianAnalyzerManagementException("RepositoryPath not configured");
@@ -144,7 +143,7 @@
     }
 
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#addSpamFromDir(String)
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#addSpamFromDir(String)
      */
     public int addSpamFromDir(String dir) throws BayesianAnalyzerManagementException {
         if (repos == null) throw new BayesianAnalyzerManagementException("RepositoryPath not configured");
@@ -153,7 +152,7 @@
     }
     
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#addHamFromMbox(String)
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#addHamFromMbox(String)
      */
     public int addHamFromMbox(String file) throws BayesianAnalyzerManagementException {
         if (repos == null) throw new BayesianAnalyzerManagementException("RepositoryPath not configured");
@@ -161,7 +160,7 @@
     }
 
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#addSpamFromMbox(String)
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#addSpamFromMbox(String)
      */
     public int addSpamFromMbox(String file) throws BayesianAnalyzerManagementException {
         if (repos == null) throw new BayesianAnalyzerManagementException("RepositoryPath not configured");
@@ -301,7 +300,7 @@
     }
     
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#exportData(String)
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#exportData(String)
      */
     public void exportData(String file) throws BayesianAnalyzerManagementException {
         if (repos == null) throw new BayesianAnalyzerManagementException("RepositoryPath not configured");
@@ -333,7 +332,7 @@
     }
     
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#importData(String)
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#importData(String)
      */
     public void importData(String file) throws BayesianAnalyzerManagementException {
         if (repos == null) throw new BayesianAnalyzerManagementException("RepositoryPath not configured");
@@ -374,7 +373,7 @@
     
 
     /**
-     * @see org.apache.james.services.BayesianAnalyzerManagementService#resetData()
+     * @see org.apache.james.management.BayesianAnalyzerManagementService#resetData()
      */
     public void resetData() throws BayesianAnalyzerManagementException {
         synchronized(JDBCBayesianAnalyzer.DATABASE_LOCK) {

Copied: james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagementService.java (from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/BayesianAnalyzerManagementService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagementService.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagementService.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/BayesianAnalyzerManagementService.java&r1=684545&r2=684758&rev=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/services/BayesianAnalyzerManagementService.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagementService.java Mon Aug 11 07:30:08 2008
@@ -19,9 +19,8 @@
 
 
 
-package org.apache.james.services;
+package org.apache.james.management;
 
-import org.apache.james.management.BayesianAnalyzerManagementException;
 
 public interface BayesianAnalyzerManagementService {
 

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagement.java Mon Aug 11 07:30:08 2008
@@ -27,7 +27,6 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.james.api.domainlist.DomainList;
-import org.apache.james.services.DomainListManagementService;
 import org.apache.james.services.ManageableDomainList;
 
 /**
@@ -48,7 +47,7 @@
     }
     
     /**
-     * @see org.apache.james.services.DomainListManagementService#addDomain(java.lang.String)
+     * @see org.apache.james.management.DomainListManagementService#addDomain(java.lang.String)
      */
     public boolean addDomain(String domain) throws DomainListManagementException {
         if (domList instanceof ManageableDomainList) {
@@ -64,7 +63,7 @@
     }
 
     /**
-     * @see org.apache.james.services.DomainListManagementService#removeDomain(java.lang.String)
+     * @see org.apache.james.management.DomainListManagementService#removeDomain(java.lang.String)
      */
     public boolean removeDomain(String domain) throws DomainListManagementException {
         if (domList instanceof ManageableDomainList) {
@@ -80,14 +79,14 @@
     }
 
     /**
-     * @see org.apache.james.services.DomainListManagementService#containsDomain(java.lang.String)
+     * @see org.apache.james.management.DomainListManagementService#containsDomain(java.lang.String)
      */
     public boolean containsDomain(String domain) {
         return domList.containsDomain(domain);
     }
 
     /**
-     * @see org.apache.james.services.DomainListManagementService#getDomains()
+     * @see org.apache.james.management.DomainListManagementService#getDomains()
      */
     public List getDomains() {
         return domList.getDomains();

Copied: james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagementService.java (from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/DomainListManagementService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagementService.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagementService.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/DomainListManagementService.java&r1=684545&r2=684758&rev=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/services/DomainListManagementService.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagementService.java Mon Aug 11 07:30:08 2008
@@ -19,11 +19,10 @@
 
 
 
-package org.apache.james.services;
+package org.apache.james.management;
 
 import java.util.List;
 
-import org.apache.james.management.DomainListManagementException;
 
 public interface DomainListManagementService {
 

Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/management/DomainListManagementService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagement.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagement.java Mon Aug 11 07:30:08 2008
@@ -21,7 +21,6 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.services.ProcessorManagementService;
 import org.apache.james.services.SpoolManager;
 import org.apache.james.management.mbean.MatcherManagement;
 import org.apache.james.management.mbean.ProcessorDetail;

Copied: james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagementService.java (from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/ProcessorManagementService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagementService.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagementService.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/ProcessorManagementService.java&r1=684545&r2=684758&rev=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/services/ProcessorManagementService.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/ProcessorManagementService.java Mon Aug 11 07:30:08 2008
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.services;
+package org.apache.james.management;
 
-import org.apache.james.management.ProcessorManagementMBean;
 
 public interface ProcessorManagementService extends ProcessorManagementMBean {
 

Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagement.java Mon Aug 11 07:30:08 2008
@@ -28,7 +28,6 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.services.SpoolManagementService;
 import org.apache.james.services.SpoolRepository;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
@@ -258,7 +257,7 @@
     }
 
     /**
-     * @see org.apache.james.services.SpoolManagementService#getSpoolItems(String, SpoolFilter)
+     * @see org.apache.james.management.SpoolManagementService#getSpoolItems(String, SpoolFilter)
      */
     public List getSpoolItems(String spoolRepositoryURL, SpoolFilter filter)
             throws ServiceException, MessagingException, SpoolManagementException {
@@ -314,7 +313,7 @@
 
 
     /**
-     * @see org.apache.james.services.SpoolManagementService#removeSpoolItems(String, String, List, SpoolFilter)
+     * @see org.apache.james.management.SpoolManagementService#removeSpoolItems(String, String, List, SpoolFilter)
      */
     public int removeSpoolItems(String spoolRepositoryURL, String key, List lockingFailures, SpoolFilter filter) throws ServiceException, MessagingException {
         int count = 0;
@@ -377,7 +376,7 @@
 
 
     /**
-     * @see org.apache.james.services.SpoolManagementService#resendSpoolItems(String, String, List, SpoolFilter)
+     * @see org.apache.james.management.SpoolManagementService#resendSpoolItems(String, String, List, SpoolFilter)
      */
     public int resendSpoolItems(String spoolRepositoryURL, String key, List lockingFailures, SpoolFilter filter)
             throws ServiceException, MessagingException, SpoolManagementException {

Copied: james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java (from r684545, james/server/trunk/core-library/src/main/java/org/apache/james/services/SpoolManagementService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/SpoolManagementService.java&r1=684545&r2=684758&rev=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/services/SpoolManagementService.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java Mon Aug 11 07:30:08 2008
@@ -20,11 +20,9 @@
 
 
 
-package org.apache.james.services;
+package org.apache.james.management;
 
 import org.apache.avalon.framework.service.ServiceException;
-import org.apache.james.management.SpoolManagementException;
-import org.apache.james.management.SpoolFilter;
 
 import javax.mail.MessagingException;
 import java.util.List;

Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/management/SpoolManagementService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: james/server/trunk/core-library/src/main/resources/org/apache/james/management/BayesianAnalyzerManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/resources/org/apache/james/management/BayesianAnalyzerManagement.xinfo?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/resources/org/apache/james/management/BayesianAnalyzerManagement.xinfo (original)
+++ james/server/trunk/core-library/src/main/resources/org/apache/james/management/BayesianAnalyzerManagement.xinfo Mon Aug 11 07:30:08 2008
@@ -26,7 +26,7 @@
   </block>
 
   <services>
-    <service name="org.apache.james.services.BayesianAnalyzerManagementService" version="1.0" />
+    <service name="org.apache.james.management.BayesianAnalyzerManagementService" version="1.0" />
   </services>
   
   <!-- interfaces that may be exported to manange this block -->

Modified: james/server/trunk/core-library/src/main/resources/org/apache/james/management/DomainListManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/resources/org/apache/james/management/DomainListManagement.xinfo?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/resources/org/apache/james/management/DomainListManagement.xinfo (original)
+++ james/server/trunk/core-library/src/main/resources/org/apache/james/management/DomainListManagement.xinfo Mon Aug 11 07:30:08 2008
@@ -26,7 +26,7 @@
   </block>
 
   <services>
-    <service name="org.apache.james.services.DomainListManagementService" version="1.0" />
+    <service name="org.apache.james.management.DomainListManagementService" version="1.0" />
   </services>
   
   <!-- interfaces that may be exported to manange this block -->

Modified: james/server/trunk/core-library/src/main/resources/org/apache/james/management/ProcessorManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/resources/org/apache/james/management/ProcessorManagement.xinfo?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/resources/org/apache/james/management/ProcessorManagement.xinfo (original)
+++ james/server/trunk/core-library/src/main/resources/org/apache/james/management/ProcessorManagement.xinfo Mon Aug 11 07:30:08 2008
@@ -26,7 +26,7 @@
   </block>
 
   <services>
-    <service name="org.apache.james.services.ProcessorManagementService" version="1.0" />
+    <service name="org.apache.james.management.ProcessorManagementService" version="1.0" />
   </services>
     
   <!-- interfaces that may be exported to manange this block -->

Modified: james/server/trunk/core-library/src/main/resources/org/apache/james/management/SpoolManagement.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/resources/org/apache/james/management/SpoolManagement.xinfo?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/resources/org/apache/james/management/SpoolManagement.xinfo (original)
+++ james/server/trunk/core-library/src/main/resources/org/apache/james/management/SpoolManagement.xinfo Mon Aug 11 07:30:08 2008
@@ -26,7 +26,7 @@
   </block>
 
   <services>
-    <service name="org.apache.james.services.SpoolManagementService" version="1.0" />
+    <service name="org.apache.james.management.SpoolManagementService" version="1.0" />
   </services>
     
   <!-- interfaces that may be exported to manange this block -->

Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Mon Aug 11 07:30:08 2008
@@ -109,13 +109,13 @@
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     <provide name="spoolmanagement" 
-             role="org.apache.james.services.SpoolManagementService"/>
+             role="org.apache.james.management.SpoolManagementService"/>
     <provide name="bayesiananalyzermanagement"
-             role="org.apache.james.services.BayesianAnalyzerManagementService"/>
+             role="org.apache.james.management.BayesianAnalyzerManagementService"/>
     <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/>
-    <provide name="processormanagement" role="org.apache.james.services.ProcessorManagementService"/>
+    <provide name="processormanagement" role="org.apache.james.management.ProcessorManagementService"/>
     <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/>
-    <provide name="domainlistmanagement" role="org.apache.james.services.DomainListManagementService"/>
+    <provide name="domainlistmanagement" role="org.apache.james.management.DomainListManagementService"/>
 </block>
 
   <!-- The User Management block  -->

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java Mon Aug 11 07:30:08 2008
@@ -31,11 +31,11 @@
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
 import org.apache.james.api.vut.management.VirtualUserTableManagementService;
-import org.apache.james.services.BayesianAnalyzerManagementService;
-import org.apache.james.services.DomainListManagementService;
+import org.apache.james.management.BayesianAnalyzerManagementService;
+import org.apache.james.management.DomainListManagementService;
+import org.apache.james.management.ProcessorManagementService;
+import org.apache.james.management.SpoolManagementService;
 import org.apache.james.services.MailServer;
-import org.apache.james.services.ProcessorManagementService;
-import org.apache.james.services.SpoolManagementService;
 import org.apache.james.socket.AbstractJamesService;
 
 import java.util.ArrayList;

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandler.java Mon Aug 11 07:30:08 2008
@@ -41,8 +41,8 @@
 import org.apache.james.api.vut.management.VirtualUserTableManagementException;
 import org.apache.james.management.BayesianAnalyzerManagementException;
 import org.apache.james.management.DomainListManagementException;
+import org.apache.james.management.ProcessorManagementService;
 import org.apache.james.management.SpoolFilter;
-import org.apache.james.services.ProcessorManagementService;
 import org.apache.james.socket.AbstractJamesHandler;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java (original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerConfigurationData.java Mon Aug 11 07:30:08 2008
@@ -25,11 +25,11 @@
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
 import org.apache.james.api.vut.management.VirtualUserTableManagementService;
-import org.apache.james.services.BayesianAnalyzerManagementService;
-import org.apache.james.services.DomainListManagementService;
+import org.apache.james.management.BayesianAnalyzerManagementService;
+import org.apache.james.management.DomainListManagementService;
+import org.apache.james.management.ProcessorManagementService;
+import org.apache.james.management.SpoolManagementService;
 import org.apache.james.services.MailServer;
-import org.apache.james.services.ProcessorManagementService;
-import org.apache.james.services.SpoolManagementService;
 
 import java.util.HashMap;
 

Modified: james/server/trunk/remotemanager-function/src/main/resources/org/apache/james/remotemanager/RemoteManager.xinfo
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/resources/org/apache/james/remotemanager/RemoteManager.xinfo?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/resources/org/apache/james/remotemanager/RemoteManager.xinfo (original)
+++ james/server/trunk/remotemanager-function/src/main/resources/org/apache/james/remotemanager/RemoteManager.xinfo Mon Aug 11 07:30:08 2008
@@ -52,22 +52,22 @@
       <service name="org.apache.avalon.cornerstone.services.threads.ThreadManager" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.SpoolManagementService" version="1.0"/>
+      <service name="org.apache.james.management.SpoolManagementService" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.BayesianAnalyzerManagementService" version="1.0"/>
+      <service name="org.apache.james.management.BayesianAnalyzerManagementService" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.james.api.dnsservice.DNSService" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.ProcessorManagementService" version="1.0"/>
+      <service name="org.apache.james.management.ProcessorManagementService" version="1.0"/>
     </dependency>
     <dependency>
       <service name="org.apache.james.api.vut.management.VirtualUserTableManagementService" version="1.0"/>
     </dependency>
     <dependency>
-      <service name="org.apache.james.services.DomainListManagementService" version="1.0"/>
+      <service name="org.apache.james.management.DomainListManagementService" version="1.0"/>
     </dependency>
   </dependencies>
 </blockinfo>

Modified: james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java Mon Aug 11 07:30:08 2008
@@ -33,8 +33,8 @@
 import org.apache.james.domain.XMLDomainList;
 import org.apache.james.impl.vut.VirtualUserTableManagement;
 import org.apache.james.management.DomainListManagement;
+import org.apache.james.management.DomainListManagementService;
 import org.apache.james.services.AbstractDNSServer;
-import org.apache.james.services.DomainListManagementService;
 import org.apache.james.services.MailServer;
 import org.apache.james.socket.JamesConnectionManager;
 import org.apache.james.test.mock.avalon.MockLogger;

Modified: james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml Mon Aug 11 07:30:08 2008
@@ -109,13 +109,13 @@
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     <provide name="spoolmanagement" 
-             role="org.apache.james.services.SpoolManagementService"/>
+             role="org.apache.james.management.SpoolManagementService"/>
     <provide name="bayesiananalyzermanagement"
-             role="org.apache.james.services.BayesianAnalyzerManagementService"/>
+             role="org.apache.james.management.BayesianAnalyzerManagementService"/>
     <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/>
-    <provide name="processormanagement" role="org.apache.james.services.ProcessorManagementService"/>
+    <provide name="processormanagement" role="org.apache.james.management.ProcessorManagementService"/>
     <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/>
-    <provide name="domainlistmanagement" role="org.apache.james.services.DomainListManagementService"/>
+    <provide name="domainlistmanagement" role="org.apache.james.management.DomainListManagementService"/>
 </block>
 
   <!-- The User Management block  -->

Modified: james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?rev=684758&r1=684757&r2=684758&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml (original)
+++ james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml Mon Aug 11 07:30:08 2008
@@ -124,13 +124,13 @@
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
     <provide name="spoolmanagement" 
-             role="org.apache.james.services.SpoolManagementService"/>
+             role="org.apache.james.management.SpoolManagementService"/>
     <provide name="bayesiananalyzermanagement"
-             role="org.apache.james.services.BayesianAnalyzerManagementService"/>
+             role="org.apache.james.management.BayesianAnalyzerManagementService"/>
     <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/>
-    <provide name="processormanagement" role="org.apache.james.services.ProcessorManagementService"/>
+    <provide name="processormanagement" role="org.apache.james.management.ProcessorManagementService"/>
     <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/>
-    <provide name="domainlistmanagement" role="org.apache.james.services.DomainListManagementService"/>
+    <provide name="domainlistmanagement" role="org.apache.james.management.DomainListManagementService"/>
 </block>
 
   <!-- The User Management block  -->



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