james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1024199 - in /james/server/trunk: ./ management/ remotemanager/ remotemanager/src/main/java/org/apache/james/remotemanager/core/ remotemanager/src/test/java/org/apache/james/remotemanager/ spring-deployment/ spring-deployment/src/main/conf...
Date Tue, 19 Oct 2010 10:59:27 GMT
Author: norman
Date: Tue Oct 19 10:59:26 2010
New Revision: 1024199

URL: http://svn.apache.org/viewvc?rev=1024199&view=rev
Log:
Cleanup remotemanager and remove the management module (which is not needed anymore)

Removed:
    james/server/trunk/management/
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java
Modified:
    james/server/trunk/pom.xml
    james/server/trunk/remotemanager/pom.xml
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java
    james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
    james/server/trunk/spring-deployment/pom.xml
    james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1024199&r1=1024198&r2=1024199&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Oct 19 10:59:26 2010
@@ -47,8 +47,7 @@
     <module>domain-jpa</module>
     <module>domain-xml</module>
     <module>domain-jdbc</module>
-     <module>core-library</module>
-    <module>management</module>
+    <module>core-library</module>
     <module>mail-file</module>
     <module>mail-jdbc</module>
     <module>mail-jcr</module>
@@ -482,11 +481,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-management</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-api</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -891,28 +885,7 @@
       <artifactId>oro</artifactId>
       <version>2.0.8</version>
     </dependency>
-    <dependency>
-      <groupId>mstor</groupId>
-      <artifactId>mstor</artifactId>
-      <version>0.9.9</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xstream</groupId>
-          <artifactId>xstream</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jdom</groupId>
-          <artifactId>jdom</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
-
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.2.2</version>
-    </dependency>
     
     <!-- Used by Mime4J -->
     <dependency>

Modified: james/server/trunk/remotemanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=1024199&r1=1024198&r2=1024199&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Tue Oct 19 10:59:26 2010
@@ -50,10 +50,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-management</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-api</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java?rev=1024199&r1=1024198&r2=1024199&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java
(original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java
Tue Oct 19 10:59:26 2010
@@ -27,29 +27,19 @@ import org.apache.james.protocols.api.Ha
 public class CoreCmdHandlerLoader implements HandlersPackage{
     private final List<String> commands = new LinkedList<String>();
     private final static String ADDDOMAINCMDHANDLER = AddDomainCmdHandler.class.getName();
-    private final static String ADDHAMCMDHANDLER = AddHamCmdHandler.class.getName();
     private final static String ADDMAPPINGCMDHANDLER = AddMappingCmdHandler.class.getName();
-    private final static String ADDSPAMCMDHANDLER = AddSpamCmdHandler.class.getName();
     private final static String ADDUSERCMDHANDLER = AddUserCmdHandler.class.getName();
     private final static String COUNTUSERSCMDHANDLER = CountUsersCmdHandler.class.getName();
-    //private final static String DELETESPOOLCMDHANDLER = DeleteSpoolCmdHandler.class.getName();
     private final static String DELUSERCMDHANDLER = DelUserCmdHandler.class.getName();
-    private final static String EXPORTBAYESIANDATACMDHANDLER = ExportBayesianDataCmdHandler.class.getName();
-    //private final static String FLUSHSPOOLCMDHANDLER = FlushSpoolCmdHandler.class.getName();
     private final static String HELPCMDHANDLER = HelpCmdHandler.class.getName();
-
-    private final static String IMPORTBAYESIANDATACMDHANDLER = ImportBayesianDataCmdHandler.class.getName();
     private final static String LISTALLMAPPINGSCMDHANDLER = ListAllMappingsCmdHandler.class.getName();
     private final static String LISTDOMAINSCMDHANDLER = ListDomainsCmdHandler.class.getName();
     private final static String LISTMAPPINGCMDHANDLER = ListMappingCmdHandler.class.getName();
-    //private final static String LISTSPOOLCMDHANDLER = ListSpoolCmdHandler.class.getName();
     private final static String LISTUSERSCMDHANDLER = ListUsersCmdHandler.class.getName();
     private final static String MEMSTATCMDHANDLER = MemStatCmdHandler.class.getName();
-    //private final static String MOVEMAILSCMDHANDLER = MoveMailsCmdHandler.class.getName();
     private final static String QUITCMDHANDLER = QuitCmdHandler.class.getName();
     private final static String REMOVEDOMAINCMDHANDLER = RemoveDomainCmdHandler.class.getName();
     private final static String REMOVEMAPPINGCMDHANDLER = RemoveMappingCmdHandler.class.getName();
-    private final static String RESETBAYESIANDATACMDHANDLER = ResetBayesianDataCmdHandler.class.getName();
     private final static String SETPASSWORDCMDHANDLER = SetPasswordCmdHandler.class.getName();
     private final static String SHOWALIASCMDHANDLER = ShowAliasCmdHandler.class.getName();
     private final static String SHOWFORWARDINGCMDHANDLER = ShowForwardingCmdHandler.class.getName();
@@ -68,28 +58,19 @@ public class CoreCmdHandlerLoader implem
         commands.add(AUTHORIZATIONHANDLER);
 
         commands.add(ADDDOMAINCMDHANDLER);
-        commands.add(ADDHAMCMDHANDLER);
         commands.add(ADDMAPPINGCMDHANDLER);
-        commands.add(ADDSPAMCMDHANDLER);
         commands.add(ADDUSERCMDHANDLER);
         commands.add(COUNTUSERSCMDHANDLER);
-        //commands.add(DELETESPOOLCMDHANDLER);
         commands.add(DELUSERCMDHANDLER);
-        commands.add(EXPORTBAYESIANDATACMDHANDLER);
-        //commands.add(FLUSHSPOOLCMDHANDLER);
         commands.add(HELPCMDHANDLER);
-        commands.add(IMPORTBAYESIANDATACMDHANDLER);
         commands.add(LISTALLMAPPINGSCMDHANDLER);
         commands.add(LISTDOMAINSCMDHANDLER);
         commands.add(LISTMAPPINGCMDHANDLER);
-        //commands.add(LISTSPOOLCMDHANDLER);
         commands.add(LISTUSERSCMDHANDLER);
         commands.add(MEMSTATCMDHANDLER);
-        //commands.add(MOVEMAILSCMDHANDLER);
         commands.add(QUITCMDHANDLER);
         commands.add(REMOVEDOMAINCMDHANDLER);
         commands.add(REMOVEMAPPINGCMDHANDLER);
-        commands.add(RESETBAYESIANDATACMDHANDLER);
         commands.add(SETPASSWORDCMDHANDLER);
         commands.add(SHOWALIASCMDHANDLER);
         commands.add(SHOWFORWARDINGCMDHANDLER);

Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1024199&r1=1024198&r2=1024199&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
(original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
Tue Oct 19 10:59:26 2010
@@ -45,11 +45,6 @@ import org.apache.james.dnsservice.api.D
 import org.apache.james.dnsservice.api.MockDNSService;
 import org.apache.james.lifecycle.LifecycleUtil;
 import org.apache.james.mailstore.MockMailStore;
-import org.apache.james.management.BayesianAnalyzerManagementException;
-import org.apache.james.management.BayesianAnalyzerManagementService;
-import org.apache.james.management.SpoolFilter;
-import org.apache.james.management.SpoolManagementException;
-import org.apache.james.management.SpoolManagementService;
 import org.apache.james.socket.JamesProtocolHandlerChain;
 import org.apache.james.test.mock.james.MockUsersStore;
 import org.apache.james.test.mock.james.MockVirtualUserTableManagementImpl;
@@ -197,84 +192,7 @@ public abstract class AbstractRemoteMana
 
 	
 		serviceManager.put("domainlistmanagement", xml);
-		serviceManager.put("bayesiananalyzermanagement",
-				new BayesianAnalyzerManagementService() {
 
-					public void resetData()
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-
-					}
-
-					public void importData(String file)
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-
-					}
-
-					public void exportData(String file)
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-
-					}
-
-					public int addSpamFromMbox(String file)
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-
-					public int addSpamFromDir(String dir)
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-
-					public int addHamFromMbox(String file)
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-
-					public int addHamFromDir(String dir)
-							throws BayesianAnalyzerManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-				});
-
-		serviceManager.put(SpoolManagementService.ROLE,
-				new SpoolManagementService() {
-
-					public int resendSpoolItems(String spoolRepositoryURL,
-							String key, List lockingFailures, SpoolFilter filter)
-							throws MessagingException, SpoolManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-
-					public int removeSpoolItems(String spoolRepositoryURL,
-							String key, List lockingFailures, SpoolFilter filter)
-							throws MessagingException, SpoolManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-
-					public int moveSpoolItems(String srcSpoolRepositoryURL,
-							String dstSpoolRepositoryURL, String dstState,
-							SpoolFilter filter) throws MessagingException,
-							SpoolManagementException {
-						// TODO Auto-generated method stub
-						return 0;
-					}
-
-					public List getSpoolItems(String spoolRepositoryURL,
-							SpoolFilter filter) throws MessagingException,
-							SpoolManagementException {
-						// TODO Auto-generated method stub
-						return null;
-					}
-				});
 		serviceManager.put("mailStore", new MockMailStore());
 	
 	}

Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=1024199&r1=1024198&r2=1024199&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Tue Oct 19 10:59:26 2010
@@ -483,11 +483,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-management</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-smtpserver</artifactId>
       <scope>runtime</scope>
     </dependency>

Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=1024199&r1=1024198&r2=1024199&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Tue Oct 19
10:59:26 2010
@@ -190,8 +190,6 @@
 
     <bean id="dnsservice" class="org.apache.james.dnsservice.dnsjava.DNSJavaService" />
 
-    <bean id="bayesiananalyzermanagement" class="org.apache.james.management.impl.BayesianAnalyzerManagement"
/>
-
     <!-- Async RemoteManager -->
     <bean id="remotemanager" class="org.apache.james.remotemanager.netty.NioRemoteManager"
>
         <property name="protocolHandlerChain" ref="remoteProtocolHandlerChain"/>



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


Mime
View raw message