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/05 16:17:53 UTC

svn commit: r1042371 - in /james/server/trunk: lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/ netty-socket/src/main/java/org/apache/james/socket/ pop3server/src/main/java/org/apache/james/pop3server/jmx/ smtpserver/src/main/java/org/apache/j...

Author: norman
Date: Sun Dec  5 15:17:42 2010
New Revision: 1042371

URL: http://svn.apache.org/viewvc?rev=1042371&view=rev
Log:
Replace jmxPath configuration parameter with jmxName to make it consistent with the server implementations

Modified:
    james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/CommandHandlerResultJMXMonitor.java
    james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/ConnectHandlerResultJMXMonitor.java
    james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/LineHandlerResultJMXMonitor.java
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractCommandHandlerStats.java
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractConnectHandlerResultJMXMonitor.java
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractLineHandlerResultJMXMonitor.java
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/ConnectHandlerStats.java
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/LineHandlerStats.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java

Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/CommandHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/CommandHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -22,8 +22,8 @@ package org.apache.james.lmtpserver.jmx;
 public class CommandHandlerResultJMXMonitor extends org.apache.james.smtpserver.jmx.CommandHandlerResultJMXMonitor{
 
     @Override
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=lmtpserver";
+    protected String getDefaultJMXName() {
+        return "lmtpserver";
     }
 
 }

Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/ConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/ConnectHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/ConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/ConnectHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -22,8 +22,8 @@ package org.apache.james.lmtpserver.jmx;
 public class ConnectHandlerResultJMXMonitor extends org.apache.james.smtpserver.jmx.ConnectHandlerResultJMXMonitor{
 
     @Override
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=lmtpserver";
+    protected String getDefaultJMXName() {
+        return "lmtpserver";
     }
 
 }

Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/LineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/LineHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/LineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/LineHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -22,8 +22,8 @@ package org.apache.james.lmtpserver.jmx;
 public class LineHandlerResultJMXMonitor extends org.apache.james.smtpserver.jmx.LineHandlerResultJMXMonitor{
 
     @Override
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=lmtpserver";
+    protected String getDefaultJMXName() {
+        return "lmtpserver";
     }
 
 }

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractCommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractCommandHandlerStats.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractCommandHandlerStats.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractCommandHandlerStats.java Sun Dec  5 15:17:42 2010
@@ -47,12 +47,12 @@ public abstract class AbstractCommandHan
     private MBeanServer mbeanserver;
     private String[] commands;
 
-    public AbstractCommandHandlerStats(Class<?> jmxClass, String jmxPath, String handlerName, String[] commands) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
+    public AbstractCommandHandlerStats(Class<?> jmxClass, String jmxName, String handlerName, String[] commands) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
         super(jmxClass);
         this.handlerName = handlerName;
         this.commands = commands;
         
-        name = jmxPath  + ",handler=commandhandler,commandhandler=" + handlerName;
+        name = "org.apache.james:type=server,name=" + jmxName  + ",handler=commandhandler,commandhandler=" + handlerName;
         mbeanserver = ManagementFactory.getPlatformMBeanServer();
         ObjectName baseObjectName = new ObjectName(name);
         mbeanserver.registerMBean(this, baseObjectName);

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractConnectHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractConnectHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -35,7 +35,7 @@ import org.apache.james.protocols.api.Wi
 public abstract class AbstractConnectHandlerResultJMXMonitor<S extends ProtocolSession> implements ConnectHandlerResultHandler<S>, ExtensibleHandler, Configurable{
 
     private Map<String, ConnectHandlerStats> cStats = new HashMap<String, ConnectHandlerStats>();
-    private String jmxPath;
+    private String jmxName;
 
     /*
      * (non-Javadoc)
@@ -70,7 +70,7 @@ public abstract class AbstractConnectHan
                 if (equals(c) == false) {
                     String cName = c.getClass().getName();
                     try {
-                        cStats.put(cName, new ConnectHandlerStats(jmxPath, cName));
+                        cStats.put(cName, new ConnectHandlerStats(jmxName, cName));
                     } catch (Exception e) {
                         throw new WiringException("Unable to wire Hooks",  e);
                     }
@@ -80,18 +80,18 @@ public abstract class AbstractConnectHan
     }
     
     /**
-     * Return the default JMXPath to use if none is configured
+     * Return the default JMXName to use if none is configured
      * 
-     * @return defaultJMXPath
+     * @return defaultJMXName
      */
-    protected abstract String getDefaultJMXPath();
+    protected abstract String getDefaultJMXName();
 
     /*
      * (non-Javadoc)
      * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
-        this.jmxPath = config.getString("jmxPath", getDefaultJMXPath());
+        this.jmxName = config.getString("jmxName", getDefaultJMXName());
     }
     
 

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractLineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractLineHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractLineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/AbstractLineHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -35,7 +35,7 @@ import org.apache.james.protocols.api.Wi
 public abstract class AbstractLineHandlerResultJMXMonitor<S extends ProtocolSession> implements LineHandlerResultHandler<S>, ExtensibleHandler, Configurable{
 
     private Map<String, LineHandlerStats> lStats = new HashMap<String, LineHandlerStats>();
-    private String jmxPath;
+    private String jmxName;
 
     /*
      * (non-Javadoc)
@@ -70,7 +70,7 @@ public abstract class AbstractLineHandle
                 if (equals(c) == false) {
                     String cName = c.getClass().getName();
                     try {
-                        lStats.put(cName, new LineHandlerStats(jmxPath, cName));
+                        lStats.put(cName, new LineHandlerStats(jmxName, cName));
                     } catch (Exception e) {
                         throw new WiringException("Unable to wire Hooks",  e);
                     }
@@ -85,14 +85,14 @@ public abstract class AbstractLineHandle
      * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
-        this.jmxPath = config.getString("jmxPath", getDefaultJMXPath());
+        this.jmxName = config.getString("jmxName", getDefaultJMXName());
         
     }
 
     /**
-     * Return default JMX Path if none is configured
+     * Return default JMX Name if none is configured
      * 
-     * @return defaultJMXPath
+     * @return defaultJMXName
      */
-    protected abstract String getDefaultJMXPath();
+    protected abstract String getDefaultJMXName();
 }

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/ConnectHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/ConnectHandlerStats.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/ConnectHandlerStats.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/ConnectHandlerStats.java Sun Dec  5 15:17:42 2010
@@ -39,11 +39,11 @@ public class ConnectHandlerStats extends
     private AtomicLong disconnect = new AtomicLong(0);
     private AtomicLong all = new AtomicLong(0);
 
-    public ConnectHandlerStats(String jmxPath, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
+    public ConnectHandlerStats(String jmxName, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
         super(HandlerStatsMBean.class);
         this.handlerName = handlerName;
         
-        this.name = jmxPath + ",handler=connecthandler,connecthandler=" + handlerName;
+        this.name = "org.apache.james:type=server,name=" + jmxName + ",handler=connecthandler,connecthandler=" + handlerName;
         mbeanserver = ManagementFactory.getPlatformMBeanServer();
         ObjectName baseObjectName = new ObjectName(name);
         mbeanserver.registerMBean(this, baseObjectName);

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/LineHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/LineHandlerStats.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/LineHandlerStats.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/LineHandlerStats.java Sun Dec  5 15:17:42 2010
@@ -39,11 +39,11 @@ public class LineHandlerStats extends St
     private AtomicLong disconnect = new AtomicLong(0);
     private AtomicLong all = new AtomicLong(0);
 
-    public LineHandlerStats(String jmxPath, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
+    public LineHandlerStats(String jmxName, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
         super(HandlerStatsMBean.class);
         this.handlerName = handlerName;
         
-        this.name = jmxPath + ",handler=linehandler,linehandler=" + handlerName;
+        this.name =  "org.apache.james:type=server,name=" + jmxName + ",handler=linehandler,linehandler=" + handlerName;
         mbeanserver = ManagementFactory.getPlatformMBeanServer();
         ObjectName baseObjectName = new ObjectName(name);
         mbeanserver.registerMBean(this, baseObjectName);

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -35,7 +35,7 @@ import org.apache.james.socket.AbstractC
  */
 public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Response, POP3Session> implements Configurable{
 
-    private String jmxPath;
+    private String jmxName;
 
 
     /*
@@ -46,7 +46,7 @@ public class CommandHandlerResultJMXMoni
         Collection<String> col = handler.getImplCommands();
         String cName = handler.getClass().getName();
 
-        return new POP3CommandHandlerStats(jmxPath, cName, col.toArray(new String[col.size()]));
+        return new POP3CommandHandlerStats(jmxName, cName, col.toArray(new String[col.size()]));
     }
 
 
@@ -55,6 +55,6 @@ public class CommandHandlerResultJMXMoni
      * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
-        this.jmxPath = config.getString("jmxPath", "org.apache.james:type=server,name=pop3server");
+        this.jmxName = config.getString("jmxName", "pop3server");
     }
 }

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -23,12 +23,15 @@ import org.apache.james.socket.AbstractC
 
 public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Session>{
 
+
+    
+
     /*
      * (non-Javadoc)
-     * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXPath()
+     * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXName()
      */
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=pop3server";
+    protected String getDefaultJMXName() {
+        return "pop3server";
     }
 
 }

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -23,9 +23,12 @@ import org.apache.james.socket.AbstractL
 
 public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Session>{
 
-    @Override
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=pop3server";
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName()
+     */
+    protected String getDefaultJMXName() {
+        return "pop3server";
     }
 
 }

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -56,11 +56,11 @@ public class CommandHandlerResultJMXMoni
      * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
-        this.jmxPath = config.getString("jmxPath", getDefaultJMXPath());
+        this.jmxPath = config.getString("jmxName", getDefaultJMXName());
     }
     
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=smtpserver";
+    protected String getDefaultJMXName() {
+        return "smtpserver";
     }
 
 }

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -23,13 +23,13 @@ import org.apache.james.socket.AbstractC
 
 public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<SMTPSession>{
 
-    
+
     /*
      * (non-Javadoc)
-     * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXPath()
+     * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXName()
      */
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=smtpserver";
+    protected String getDefaultJMXName() {
+        return "smtpserver";
     }
 
 }

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -112,10 +112,10 @@ public class HookResultJMXMonitor implem
      * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
-        this.jmxPath = config.getString("jmxPath", getDefaultJMXPath());
+        this.jmxPath = config.getString("jmxName", getDefaultJMXName());
     }
     
-    protected String getDefaultJMXPath() {
+    protected String getDefaultJMXName() {
         return "org.apache.james:type=server,name=smtpserver";
     }
 }

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java Sun Dec  5 15:17:42 2010
@@ -49,10 +49,10 @@ public class HookStats extends StandardM
     private MBeanServer mbeanserver;
     private String hookname;
 
-    public HookStats(String jmxPath, String hookname) throws InstanceAlreadyExistsException, MBeanRegistrationException, NotCompliantMBeanException, MalformedObjectNameException, NullPointerException {
+    public HookStats(String jmxName, String hookname) throws InstanceAlreadyExistsException, MBeanRegistrationException, NotCompliantMBeanException, MalformedObjectNameException, NullPointerException {
         super(HookStatsMBean.class);
         this.hookname = hookname;
-        name = jmxPath + ",handler=hook,hook=" + hookname;
+        name = "org.apache.james:type=server,name=" + jmxName + ",handler=hook,hook=" + hookname;
         mbeanserver = ManagementFactory.getPlatformMBeanServer();
         ObjectName baseObjectName = new ObjectName(name);
         mbeanserver.registerMBean(this, baseObjectName);

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java?rev=1042371&r1=1042370&r2=1042371&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java Sun Dec  5 15:17:42 2010
@@ -23,13 +23,13 @@ import org.apache.james.socket.AbstractL
 
 public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<SMTPSession>{
 
-    
+
     /*
      * (non-Javadoc)
-     * @see org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXPath()
+     * @see org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName()
      */
-    protected String getDefaultJMXPath() {
-        return "org.apache.james:type=server,name=smtpserver";
+    protected String getDefaultJMXName() {
+        return "smtpserver";
     }
 
 }



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