Author: norman
Date: Sun Jan 3 17:09:54 2010
New Revision: 895447
URL: http://svn.apache.org/viewvc?rev=895447&view=rev
Log:
Add MBean implementations
Reformat xml
Modified:
james/server/sandbox/active/pure_spring_deployment/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerMBeanImpl.java
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
Modified:
james/server/sandbox/active/pure_spring_deployment/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerMBeanImpl.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerMBeanImpl.java?rev=895447&r1=895446&r2=895447&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerMBeanImpl.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerMBeanImpl.java
Sun Jan 3 17:09:54 2010
@@ -32,30 +32,34 @@
this.server = server;
}
- /**
- * @see
org.apache.james.remotemanager.RemoteManagerMBean#getNetworkInterface()
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.smtpserver.protocol.SMTPServerMBean#getNetworkInterface()
*/
public String getNetworkInterface() {
return server.getNetworkInterface();
}
- /**
- * @see org.apache.james.remotemanager.RemoteManagerMBean#getPort()
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.smtpserver.protocol.SMTPServerMBean#getPort()
*/
public int getPort() {
return server.getPort();
}
- /**
- * @see org.apache.james.remotemanager.RemoteManagerMBean#getSocketType()
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.smtpserver.protocol.SMTPServerMBean#getSocketType()
*/
public String getSocketType() {
return server.getSocketType();
}
- /**
+ /*
* (non-Javadoc)
- * @see org.apache.james.remotemanager.RemoteManagerMBean#isEnabled()
+ * @see org.apache.james.smtpserver.protocol.SMTPServerMBean#isEnabled()
*/
public boolean isEnabled() {
return server.isEnabled();
Modified:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml?rev=895447&r1=895446&r2=895447&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
Sun Jan 3 17:09:54 2010
@@ -20,20 +20,6 @@
<beans>
<!--
- replaces strings in configuration values <bean
- id="stringRemapperConfigurationInterceptor"
-
class="org.apache.james.container.spring.examples.configuration.StringRemapperConfigurationInterceptor">
- <property name="mappings"> <map> <entry key="../apps/"
- value="../var/"/> </map> </property> </bean>
- -->
-
- <!--
- <bean id="avalonContext"
- class="org.apache.james.container.spring.adaptor.AvalonContext"
>
- <property name="applicationHome" value="data" /> <property
- name="applicationName" value="Apache JAMES Server" /> </bean>
- -->
- <!--
** JMX part ** to enable exposure of JMX, activate the
following beans
NOTE: if you are running JDK < 1.5, you'd have to make a
MBeanServer
@@ -41,39 +27,41 @@
-->
<!--
- <bean id="exporter"
- class="org.springframework.jmx.export.MBeanExporter"
lazy-init="false"
- > <property name="autodetect" value="true" /> <property
- name="namingStrategy" ref="namingStrategy" /> </bean> <bean
- id="namingStrategy"
- class="org.springframework.jmx.export.naming.KeyNamingStrategy"
>
- <property name="mappings" ><props> <prop key="fetchmail"
- >bean:name=fetchmail</prop> <prop key="smtpserver"
- >bean:name=smtpserver</prop> <prop key="James"
>bean:name=James</prop>
- <prop key="dnsserver" >bean:name=dnsserver</prop> <prop
- key="remotemanager" >bean:name=remotemanager</prop> <prop
- key="pop3server" >bean:name=pop3server</prop> <prop
key="nntpserver"
- >bean:name=nntpserver</prop> <prop
key="virtualusertablemanagement"
- >bean:name=virtualusertablemanagement</prop> <prop
- key="spoolmanagement" >bean:name=spoolmanagement</prop> <prop
- key="domainlistmanagement"
>bean:name=domainlistmanagement</prop>
- <prop key="processormanagement"
>bean:name=processormanagement</prop>
- <prop key="bayesiananalyzermanagement"
- >bean:name=bayesiananalyzermanagement</prop> <prop
- key="usermanagement" >bean:name=usermanagement</prop> <prop
- key="serverConnector" >bean:name=serverConnector</prop>
- </props></property> </bean> <bean id="mbeanServer"
- class="org.springframework.jmx.support.MBeanServerFactoryBean"
/>
-
- <bean id="registry"
- class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
- <property name="port" value="1099" /> </bean> <bean
- id="serverConnector"
-
class="org.springframework.jmx.support.ConnectorServerFactoryBean"
- depends-on="registry"> <property name="objectName"
- value="connector:name=rmi" /> <property name="serviceUrl"
-
value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/jamesmailserver"
- /> </bean>
+ <bean id="exporter"
class="org.springframework.jmx.export.MBeanExporter" lazy-init="false">
+ <property name="autodetect" value="true" />
+ <property name="namingStrategy" ref="namingStrategy" />
+ </bean>
+ <bean id="namingStrategy"
class="org.springframework.jmx.export.naming.KeyNamingStrategy" >
+ <property name="mappings" >
+ <props>
+ <prop key="fetchmail">
bean:name=fetchmail</prop>
+ <prop
key="smtpserver">bean:name=smtpserver</prop>
+ <prop key="James"
>bean:name=James</prop>
+ <prop key="dnsserver"
>bean:name=dnsserver</prop>
+ <prop key="remotemanager"
>bean:name=remotemanager</prop>
+ <prop key="pop3server"
>bean:name=pop3server</prop>
+ <prop
key="nntpserver">bean:name=nntpserver</prop>
+ <prop
key="virtualusertablemanagement">bean:name=virtualusertablemanagement</prop>
+ <prop key="spoolmanagement"
>bean:name=spoolmanagement</prop>
+ <prop key="domainlistmanagement"
>bean:name=domainlistmanagement</prop>
+ <prop key="processormanagement"
>bean:name=processormanagement</prop>
+ <prop
key="bayesiananalyzermanagement">bean:name=bayesiananalyzermanagement</prop>
+ <prop key="usermanagement"
>bean:name=usermanagement</prop>
+ <prop key="serverConnector"
>bean:name=serverConnector</prop>
+ </props>
+ </property>
+ </bean>
+
+ <bean id="mbeanServer"
class="org.springframework.jmx.support.MBeanServerFactoryBean" />
+
+ <bean id="registry"
class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
+ <property name="port" value="1099" />
+ </bean>
+
+ <bean id="serverConnector"
class="org.springframework.jmx.support.ConnectorServerFactoryBean"
depends-on="registry">
+ <property name="objectName" value="connector:name=rmi"
/>
+ <property name="serviceUrl"
value="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/jamesmailserver"
/>
+ </bean>
-->
<bean
@@ -168,7 +156,6 @@
<bean id="mailetpackages"
class="org.apache.james.transport.JamesMailetLoader" />
-
<bean id="dnsserver" class="org.apache.james.dnsserver.DNSServer" />
<!-- The Spool Management block -->
@@ -187,6 +174,10 @@
<property name="protocolHandlerFactory"
ref="remotemanager.protocolhandlerfactory" />
</bean>
+ <bean id="remotemanager"
class="org.apache.james.remotemanager.RemoteManagerMBeanImpl">
+ <property name="protocolServer"
ref="remotemanager.protocolserver" />
+ </bean>
+
<!-- The User Management block -->
<bean id="usermanagement"
class="org.apache.james.impl.user.UserManagement" />
@@ -198,6 +189,10 @@
<property name="protocolHandlerFactory"
ref="pop3server.protocolhandlerfactory" />
</bean>
+ <bean id="pop3server"
class="org.apache.james.pop3server.POP3ServerMBeanImpl">
+ <property name="protocolServer" ref="pop3server.protocolserver"
/>
+ </bean>
+
<!-- SMTP Server Beans-->
<bean id="smtpserver.protocolhandlerfactory"
class="org.apache.james.smtpserver.SMTPServerProtocolHandlerFactory" />
@@ -205,7 +200,10 @@
<bean id="smtpserver.protocolserver"
class="org.apache.james.socket.AvalonProtocolServer">
<property name="protocolHandlerFactory"
ref="smtpserver.protocolhandlerfactory" />
</bean>
-
+
+ <bean id="smtpserver"
class="org.apache.james.smtpserver.SMTPServerMBeanImpl">
+ <property name="protocolServer" ref="smtpserver.protocolserver"
/>
+ </bean>
<!-- Async SMTP Server -->
<!-- enable this to use the MINA based SMTP Server which uses NIO -->
@@ -225,6 +223,9 @@
<property name="protocolHandlerFactory"
ref="nntpserver.protocolhandlerfactory" />
</bean>
+ <bean id="nntpserver"
class="org.apache.james.nntpserver.NNTPServerMBeanImpl">
+ <property name="protocolServer" ref="nntpserver.protocolserver"
/>
+ </bean>
<!-- NNTP Repository -->
<bean id="nntp-repository"
@@ -307,7 +308,7 @@
<bean id="imapserver.protocolserver"
class="org.apache.james.socket.AvalonProtocolServer">
<property name="protocolHandlerFactory"
ref="imapserver.protocolhandlerfactory" />
</bean>
-
+
<!--
####################################################################
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
