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 no...@apache.org on 2010/12/30 18:44:41 UTC
svn commit: r1053952 - in /james/server/trunk: ./ container-spring/
container-spring/src/main/config/james/
container-spring/src/main/config/james/context/ remotemanager/
user-api/src/main/java/org/apache/james/user/api/
Author: norman
Date: Thu Dec 30 17:44:40 2010
New Revision: 1053952
URL: http://svn.apache.org/viewvc?rev=1053952&view=rev
Log:
Remove RemoteManager as all management stuff is now exposed via JMX. See JAMES-1084
Removed:
james/server/trunk/container-spring/src/main/config/james/remotemanager.xml
james/server/trunk/remotemanager/
Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/container-spring/src/main/config/james/log4j.properties
james/server/trunk/pom.xml
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
Modified: james/server/trunk/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1053952&r1=1053951&r2=1053952&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Thu Dec 30 17:44:40 2010
@@ -638,11 +638,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-remotemanager</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<scope>runtime</scope>
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1053952&r1=1053951&r2=1053952&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml Thu Dec 30 17:44:40 2010
@@ -232,19 +232,6 @@
<bean id="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" />
- <!--
- ===========================================================================
- Remote Manager
- ===========================================================================
- -->
-
- <bean id="remotemanager" class="org.apache.james.remotemanager.netty.RemoteManager" >
- <property name="protocolHandlerChain" ref="remoteProtocolHandlerChain"/>
- </bean>
- <bean id="remoteProtocolHandlerChain" class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
- <property name="coreHandlersPackage" value="org.apache.james.remotemanager.core.CoreCmdHandlerLoader"/>
- <property name="beanName" value="remotemanager"/>
- </bean>
<!--
===========================================================================
@@ -395,7 +382,6 @@
<entry key="org.apache.james:type=server,name=lmtpserver" value-ref="lmtpserver"/>
<entry key="org.apache.james:type=server,name=pop3server" value-ref="pop3server"/>
<entry key="org.apache.james:type=server,name=imapserver" value-ref="imapserver"/>
- <entry key="org.apache.james:type=server,name=remotemanager" value-ref="remotemanager"/>
<entry key="org.apache.james:type=component,name=domainlist" value-ref="domainlistmanagement"/>
<entry key="org.apache.james:type=component,name=dnsservice" value-ref="dnsservice"/>
<entry key="org.apache.james:type=component,name=virtualusertable" value-ref="virtualusertablemanagement"/>
@@ -408,7 +394,7 @@
</property>
<property name="assembler">
<bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces" value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.remotemanager.netty.RemoteManagerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean"/>
+ <property name="managedInterfaces" value="org.apache.james.smtpserver.netty.SMTPServerMBean,org.apache.james.pop3server.netty.POP3ServerMBean,org.apache.james.imapserver.netty.IMAPServerMBean,org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.vut.api.VirtualUserTableManagementMBean,org.apache.james.user.api.UserManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean"/>
</bean>
</property>
</bean>
Modified: james/server/trunk/container-spring/src/main/config/james/log4j.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/log4j.properties?rev=1053952&r1=1053951&r2=1053952&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/log4j.properties (original)
+++ james/server/trunk/container-spring/src/main/config/james/log4j.properties Thu Dec 30 17:44:40 2010
@@ -64,12 +64,6 @@ log4j.appender.DNSSERVER.DatePattern='.'
log4j.appender.DNSSERVER.layout=org.apache.log4j.PatternLayout
log4j.appender.DNSSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-log4j.appender.REMOTEMANAGER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.REMOTEMANAGER.File=../log/remotemanager.log
-log4j.appender.REMOTEMANAGER.DatePattern='.'yyyy-MM-dd
-log4j.appender.REMOTEMANAGER.layout=org.apache.log4j.PatternLayout
-log4j.appender.REMOTEMANAGER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
log4j.appender.POP3SERVER=org.apache.log4j.DailyRollingFileAppender
log4j.appender.POP3SERVER.File=../log/pop3server.log
log4j.appender.POP3SERVER.DatePattern='.'yyyy-MM-dd
@@ -130,7 +124,6 @@ log4j.logger.james.mailserver=INFO, MAIL
log4j.logger.james.mailetcontext=INFO, MAILET
log4j.logger.james.mailetcontainer=INFO, MAILETCONTAINER
log4j.logger.james.dnsserver=INFO, DNSSERVER
-log4j.logger.james.remotemanager=INFO, REMOTEMANAGER
log4j.logger.james.pop3server=INFO, POP3SERVER
log4j.logger.james.smtpserver=INFO, SMTPSERVER
log4j.logger.james.lmtpserver=INFO, LMTPSERVER
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1053952&r1=1053951&r2=1053952&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Dec 30 17:44:40 2010
@@ -59,7 +59,6 @@
<module>nio-netty</module>
<module>osgi</module>
<module>pop3server</module>
- <module>remotemanager</module>
<module>repository-api</module>
<module>repository-file</module>
<module>smtpserver</module>
@@ -685,11 +684,7 @@
<artifactId>james-server-mailets</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-remotemanager</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java?rev=1053952&r1=1053951&r2=1053952&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/UsersRepository.java Thu Dec 30 17:44:40 2010
@@ -35,12 +35,6 @@ import org.apache.james.user.api.model.U
*/
public interface UsersRepository {
- /**
- * The component role used by components implementing this service
- */
- String ROLE = "org.apache.james.api.user.UsersRepository";
-
- String USER = "USER";
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org