hilmer 2004/02/19 02:12:36
Modified: . build.xml
src/java/org/apache/james JamesMBean.java
src/java/org/apache/james/context
AvalonContextUtilities.java
src/java/org/apache/james/core AbstractJamesService.java
src/java/org/apache/james/dnsserver DNSServer.java
DNSServer.xinfo
src/java/org/apache/james/fetchmail FetchScheduler.java
FetchScheduler.xinfo
src/java/org/apache/james/fetchpop FetchScheduler.java
FetchScheduler.xinfo
src/java/org/apache/james/nntpserver NNTPServer.java
NNTPServer.xinfo
src/java/org/apache/james/pop3server POP3Server.java
POP3Server.xinfo
src/java/org/apache/james/remotemanager RemoteManager.java
RemoteManager.xinfo
src/java/org/apache/james/smtpserver SMTPServer.java
SMTPServer.xinfo
Added: src/java/org/apache/james/dnsserver DNSServerMBean.java
src/java/org/apache/james/fetchmail FetchSchedulerMBean.java
src/java/org/apache/james/fetchpop FetchSchedulerMBean.java
src/java/org/apache/james/nntpserver NNTPServerMBean.java
src/java/org/apache/james/pop3server POP3ServerMBean.java
src/java/org/apache/james/remotemanager
RemoteManagerMBean.java
src/java/org/apache/james/smtpserver SMTPServerMBean.java
tools/lib LICENSE.xdoclet.txt commons-logging.jar
log4j-core.jar xdoclet-20020825.jar
xjavadoc-20020825.jar
Removed: src/java/org/apache/james JamesMBean.mxinfo
Log:
Submitted by:Steve Short
Reviewed by:hilmer
More information are made available through JMX.
.mxinfo files are autogenerated by the build process.
needed tools for mxinfo generation are added to tools/lib these jars obtained from
Phoenix 4.0.3
Revision Changes Path
1.142 +36 -4 james-server/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/james-server/build.xml,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- build.xml 21 Oct 2003 01:49:58 -0000 1.141
+++ build.xml 19 Feb 2004 10:12:34 -0000 1.142
@@ -41,6 +41,15 @@
<!--
===================================================================
+ Set the properties for build tools directory
+ ===================================================================
+ -->
+
+ <property name="tools.dir" value="tools"/>
+ <property name="tools.lib.dir" value="${tools.dir}/lib"/>
+
+ <!--
+ ===================================================================
Set the classpath
===================================================================
-->
@@ -72,10 +81,19 @@
</path>
<path id="tools.class.path">
- <path refid="project.class.path"/>
- <pathelement location="${phoenix-client.jar}"/>
+ <fileset dir="${tools.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${phoenix.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
</path>
+
+ <taskdef name="phoenix-mxinfo"
classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet">
+ <classpath refid="tools.class.path"/>
+ </taskdef>
+
<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
<classpath refid="tools.class.path"/>
</taskdef>
@@ -184,6 +202,20 @@
<!--
===================================================================
+ jmx
+ ===================================================================
+ -->
+ <target name="prepare-mxinfo">
+ <phoenix-mxinfo destdir="${build.classes}">
+ <fileset dir="${java.dir}">
+ <include name="**" />
+ </fileset>
+ <mxinfo/>
+ </phoenix-mxinfo>
+ </target>
+
+ <!--
+ ===================================================================
jdbc3
===================================================================
-->
@@ -198,7 +230,7 @@
Prepare target
===================================================================
-->
- <target name="prepare" depends="prepare-common,prepare-phoenix,prepare-jdbc3"/>
+ <target name="prepare"
depends="prepare-common,prepare-phoenix,prepare-jdbc3,prepare-mxinfo"/>
<!--
===================================================================
1.6 +4 -0 james-server/src/java/org/apache/james/JamesMBean.java
Index: JamesMBean.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/JamesMBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JamesMBean.java 30 Jan 2004 02:22:07 -0000 1.5
+++ JamesMBean.java 19 Feb 2004 10:12:34 -0000 1.6
@@ -20,12 +20,16 @@
/**
* An interface to expose James management functionality through JMX. At
* the time of this writing, this interface is just an example.
+ *
+ * @phoenix:mx-topic name="MainJAMESServerManagement"
*/
public interface JamesMBean {
/**
* Adds a user to this mail server.
*
+ * @phoenix:mx-operation
+ * @phoenix:mx-description Add a new user
* @param userName the name of the user being added
* @param password the password of the user being added
*/
1.6 +1 -1
james-server/src/java/org/apache/james/context/AvalonContextUtilities.java
Index: AvalonContextUtilities.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/context/AvalonContextUtilities.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AvalonContextUtilities.java 30 Jan 2004 02:22:07 -0000 1.5
+++ AvalonContextUtilities.java 19 Feb 2004 10:12:34 -0000 1.6
@@ -100,5 +100,5 @@
* Private constructor to ensure that instances of this class aren't
* instantiated.
*/
- private AvalonContextUtilities() {};
+ private AvalonContextUtilities() {}
}
1.14 +32 -1
james-server/src/java/org/apache/james/core/AbstractJamesService.java
Index: AbstractJamesService.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/core/AbstractJamesService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractJamesService.java 16 Feb 2004 23:48:22 -0000 1.13
+++ AbstractJamesService.java 19 Feb 2004 10:12:34 -0000 1.14
@@ -443,7 +443,7 @@
*
* @return is the service enabled.
*/
- protected final boolean isEnabled() {
+ public final boolean isEnabled() {
return enabled;
}
@@ -490,5 +490,36 @@
*/
protected boolean isDefaultTLSEnabled() {
return false;
+ }
+
+ /**
+ * Returns the port that the service is bound to
+ *
+ * @return int The port number
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * Returns the address if the network interface the socket is bound to
+ *
+ * @return String The network interface name
+ */
+ public String getNetworkInterface() {
+ if (bindTo == null) {
+ return "All";
+ } else {
+ return bindTo.getHostAddress();
+ }
+ }
+
+ /**
+ * Returns the server socket type, plain or SSL
+ *
+ * @return String The scoekt type, plain or SSL
+ */
+ public String getSocketType() {
+ return serverSocketType;
}
}
1.24 +10 -1 james-server/src/java/org/apache/james/dnsserver/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DNSServer.java 30 Jan 2004 02:22:08 -0000 1.23
+++ DNSServer.java 19 Feb 2004 10:12:35 -0000 1.24
@@ -49,7 +49,7 @@
public class DNSServer
extends AbstractLogEnabled
implements Configurable, Initializable,
- org.apache.james.services.DNSServer {
+ org.apache.james.services.DNSServer, DNSServerMBean {
/**
* A resolver instance used to retrieve DNS records. This
@@ -157,6 +157,15 @@
getLogger().debug("DNSServer ...init end");
}
+ /**
+ * <p>Return the list of DNS servers in use by this service</p>
+ *
+ * @return an array of DNS server names
+ */
+ public String[] getDNSServers() {
+ return (String[])dnsServers.toArray(new String[0]);
+ }
+
/**
* <p>Return a prioritized unmodifiable list of MX records
* obtained from the server.</p>
1.4 +5 -0 james-server/src/java/org/apache/james/dnsserver/DNSServer.xinfo
Index: DNSServer.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/dnsserver/DNSServer.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DNSServer.xinfo 25 Sep 2001 04:51:19 -0000 1.3
+++ DNSServer.xinfo 19 Feb 2004 10:12:35 -0000 1.4
@@ -12,4 +12,9 @@
<service name="org.apache.james.services.DNSServer" version="1.0"/>
</services>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.dnsserver.DNSServerMBean"/>
+ </management-access-points>
+
</blockinfo>
1.2 +30 -0
james-server/src/java/org/apache/james/dnsserver/DNSServerMBean.java
1.11 +12 -2
james-server/src/java/org/apache/james/fetchmail/FetchScheduler.java
Index: FetchScheduler.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/fetchmail/FetchScheduler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FetchScheduler.java 11 Feb 2004 18:02:06 -0000 1.10
+++ FetchScheduler.java 19 Feb 2004 10:12:35 -0000 1.11
@@ -42,7 +42,7 @@
*/
public class FetchScheduler
extends AbstractLogEnabled
- implements Serviceable, Configurable, Initializable, Disposable {
+ implements Serviceable, Configurable, Initializable, Disposable,
FetchSchedulerMBean {
/**
* Configuration object for this service
@@ -138,4 +138,14 @@
getLogger().info("FetchMail ...dispose end");
}
}
+
+ /**
+ * Describes whether this service is enabled by configuration.
+ *
+ * @return is the service enabled.
+ */
+ public final boolean isEnabled() {
+ return enabled;
+ }
+
}
1.5 +5 -0
james-server/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
Index: FetchScheduler.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FetchScheduler.xinfo 11 Feb 2004 18:02:06 -0000 1.4
+++ FetchScheduler.xinfo 19 Feb 2004 10:12:35 -0000 1.5
@@ -10,6 +10,11 @@
<!-- services that are offered by this block -->
<services/>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.fetchmail.FetchSchedulerMBean"/>
+ </management-access-points>
+
<dependencies>
<dependency>
<service name="org.apache.james.services.MailServer" version="1.0"/>
1.2 +34 -0
james-server/src/java/org/apache/james/fetchmail/FetchSchedulerMBean.java
1.13 +9 -1
james-server/src/java/org/apache/james/fetchpop/FetchScheduler.java
Index: FetchScheduler.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/fetchpop/FetchScheduler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FetchScheduler.java 30 Jan 2004 02:22:08 -0000 1.12
+++ FetchScheduler.java 19 Feb 2004 10:12:35 -0000 1.13
@@ -39,7 +39,7 @@
*/
public class FetchScheduler
extends AbstractLogEnabled
- implements Serviceable, Configurable, Initializable, Disposable {
+ implements Serviceable, Configurable, Initializable, Disposable,
FetchSchedulerMBean {
/**
* Configuration object for this service
@@ -120,4 +120,12 @@
}
}
+ /**
+ * Describes whether this service is enabled by configuration.
+ *
+ * @return is the service enabled.
+ */
+ public final boolean isEnabled() {
+ return enabled;
+ }
}
1.4 +5 -0
james-server/src/java/org/apache/james/fetchpop/FetchScheduler.xinfo
Index: FetchScheduler.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/fetchpop/FetchScheduler.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FetchScheduler.xinfo 8 Feb 2003 04:12:25 -0000 1.3
+++ FetchScheduler.xinfo 19 Feb 2004 10:12:35 -0000 1.4
@@ -7,6 +7,11 @@
<version>1.0</version>
</block>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.fetchpop.FetchSchedulerMBean"/>
+ </management-access-points>
+
<dependencies>
<dependency>
<service name="org.apache.james.services.MailServer" version="1.0"/>
1.2 +34 -0
james-server/src/java/org/apache/james/fetchpop/FetchSchedulerMBean.java
1.21 +1 -1
james-server/src/java/org/apache/james/nntpserver/NNTPServer.java
Index: NNTPServer.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/nntpserver/NNTPServer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- NNTPServer.java 30 Jan 2004 02:22:09 -0000 1.20
+++ NNTPServer.java 19 Feb 2004 10:12:35 -0000 1.21
@@ -40,7 +40,7 @@
* NNTP Server
*
*/
-public class NNTPServer extends AbstractJamesService {
+public class NNTPServer extends AbstractJamesService implements NNTPServerMBean {
/**
* Whether authentication is required to access this NNTP server
1.9 +5 -0
james-server/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
Index: NNTPServer.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/nntpserver/NNTPServer.xinfo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NNTPServer.xinfo 16 Feb 2004 23:48:22 -0000 1.8
+++ NNTPServer.xinfo 19 Feb 2004 10:12:35 -0000 1.9
@@ -7,6 +7,11 @@
<version>1.0</version>
</block>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.nntpserver.NNTPServerMBean"/>
+ </management-access-points>
+
<dependencies>
<dependency>
<service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
1.2 +61 -0
james-server/src/java/org/apache/james/nntpserver/NNTPServerMBean.java
1.21 +1 -1
james-server/src/java/org/apache/james/pop3server/POP3Server.java
Index: POP3Server.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/pop3server/POP3Server.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- POP3Server.java 30 Jan 2004 02:22:10 -0000 1.20
+++ POP3Server.java 19 Feb 2004 10:12:35 -0000 1.21
@@ -42,7 +42,7 @@
*
* @version 1.0.0, 24/04/1999
*/
-public class POP3Server extends AbstractJamesService {
+public class POP3Server extends AbstractJamesService implements POP3ServerMBean {
/**
* The internal mail server service
1.6 +5 -0
james-server/src/java/org/apache/james/pop3server/POP3Server.xinfo
Index: POP3Server.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/pop3server/POP3Server.xinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- POP3Server.xinfo 16 Feb 2004 23:48:22 -0000 1.5
+++ POP3Server.xinfo 19 Feb 2004 10:12:35 -0000 1.6
@@ -7,6 +7,11 @@
<version>1.0</version>
</block>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.pop3server.POP3ServerMBean"/>
+ </management-access-points>
+
<dependencies>
<dependency>
<service name="org.apache.james.services.MailStore" version="1.0"/>
1.2 +61 -0
james-server/src/java/org/apache/james/pop3server/POP3ServerMBean.java
1.21 +1 -1
james-server/src/java/org/apache/james/remotemanager/RemoteManager.java
Index: RemoteManager.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/remotemanager/RemoteManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RemoteManager.java 30 Jan 2004 02:22:10 -0000 1.20
+++ RemoteManager.java 19 Feb 2004 10:12:35 -0000 1.21
@@ -47,7 +47,7 @@
* @version 1.0.0, 24/04/1999
*/
public class RemoteManager
- extends AbstractJamesService {
+ extends AbstractJamesService implements RemoteManagerMBean {
/**
* A HashMap of (user id, passwords) for James administrators
1.8 +5 -0
james-server/src/java/org/apache/james/remotemanager/RemoteManager.xinfo
Index: RemoteManager.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/remotemanager/RemoteManager.xinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RemoteManager.xinfo 16 Feb 2004 23:48:22 -0000 1.7
+++ RemoteManager.xinfo 19 Feb 2004 10:12:35 -0000 1.8
@@ -7,6 +7,11 @@
<version>1.0</version>
</block>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.remotemanager.RemoteManagerMBean"/>
+ </management-access-points>
+
<dependencies>
<dependency>
<service name="org.apache.james.services.MailStore" version="1.0"/>
1.2 +62 -0
james-server/src/java/org/apache/james/remotemanager/RemoteManagerMBean.java
1.26 +1 -1
james-server/src/java/org/apache/james/smtpserver/SMTPServer.java
Index: SMTPServer.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/smtpserver/SMTPServer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SMTPServer.java 30 Jan 2004 02:22:11 -0000 1.25
+++ SMTPServer.java 19 Feb 2004 10:12:36 -0000 1.26
@@ -48,7 +48,7 @@
*
* @version 1.1.0, 06/02/2001
*/
-public class SMTPServer extends AbstractJamesService {
+public class SMTPServer extends AbstractJamesService implements SMTPServerMBean {
/**
* The mailet context - we access it here to set the hello name for the Mailet
API
1.8 +5 -0
james-server/src/java/org/apache/james/smtpserver/SMTPServer.xinfo
Index: SMTPServer.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/smtpserver/SMTPServer.xinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SMTPServer.xinfo 16 Feb 2004 23:48:22 -0000 1.7
+++ SMTPServer.xinfo 19 Feb 2004 10:12:36 -0000 1.8
@@ -7,6 +7,11 @@
<version>1.0</version>
</block>
+ <!-- interfaces that may be exported to manange this block -->
+ <management-access-points>
+ <service name="org.apache.james.smtpserver.SMTPServerMBean"/>
+ </management-access-points>
+
<dependencies>
<dependency>
<service name="org.apache.mailet.MailetContext" version="1.0"/>
1.2 +60 -0
james-server/src/java/org/apache/james/smtpserver/SMTPServerMBean.java
1.2 +26 -0 james-server/tools/lib/LICENSE.xdoclet.txt
1.2 +93 -0 james-server/tools/lib/commons-logging.jar
<<Binary file>>
1.2 +324 -0 james-server/tools/lib/log4j-core.jar
<<Binary file>>
1.2 +544 -0 james-server/tools/lib/xdoclet-20020825.jar
<<Binary file>>
1.2 +752 -0 james-server/tools/lib/xjavadoc-20020825.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
