Author: norman
Date: Fri Dec 31 14:26:28 2010
New Revision: 1054117

URL: http://svn.apache.org/viewvc?rev=1054117&view=rev
Log:
Group mailetcontainer components in jmx. See JAMES-1168

Modified:
    
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
    
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateCompositeProcessorListener.java
    
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateMailetProcessorListener.java

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=1054117&r1=1054116&r2=1054117&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
 Fri Dec 31 14:26:28 2010
@@ -391,7 +391,7 @@
           <entry key="org.apache.james:type=component,name=usersrepository" 
value-ref="usersrepositorymanagement"/>
           <entry key="org.apache.james:type=component,name=fetchmail" 
value-ref="fetchmail"/>
           <entry key="org.apache.james:type=component,name=mailboxmanagement" 
value-ref="mailboxmanagermanagement"/>
-          <entry key="org.apache.james:type=component,name=mailspooler" 
value-ref="mailspooler"/>
+          <entry 
key="org.apache.james:type=component,component=mailetcontainer,name=mailspooler"
 value-ref="mailspooler"/>
           <entry key="org.apache.james:type=mailbox,name=mailboxcopier" 
value-ref="mailboxcopiermanagement"/>
         </map>
       </property>

Modified: 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateCompositeProcessorListener.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateCompositeProcessorListener.java?rev=1054117&r1=1054116&r2=1054117&view=diff
==============================================================================
--- 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateCompositeProcessorListener.java
 (original)
+++ 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateCompositeProcessorListener.java
 Fri Dec 31 14:26:28 2010
@@ -80,7 +80,7 @@ public class JMXStateCompositeProcessorL
      */
     private void registerMBeans() throws MalformedObjectNameException, 
JMException {
        
-        String baseObjectName = 
"org.apache.james:type=component,name=processor,";
+        String baseObjectName = 
"org.apache.james:type=component,component=mailetcontainer,name=processor,";
 
         String[] processorNames = mList.getProcessorStates();
         for (int i = 0; i < processorNames.length; i++) {

Modified: 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateMailetProcessorListener.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateMailetProcessorListener.java?rev=1054117&r1=1054116&r2=1054117&view=diff
==============================================================================
--- 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateMailetProcessorListener.java
 (original)
+++ 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/jmx/JMXStateMailetProcessorListener.java
 Fri Dec 31 14:26:28 2010
@@ -100,7 +100,7 @@ public class JMXStateMailetProcessorList
      * @throws MalformedObjectNameException 
      */
     private void registerMBeans() throws MalformedObjectNameException, 
JMException {
-        String baseObjectName = 
"org.apache.james:type=component,name=processor,processor=" + name;
+        String baseObjectName = 
"org.apache.james:type=component,component=mailetcontainer,name=processor,processor="
 + name;
         
         registerMailets(baseObjectName, processor.getMailets().iterator());
         registerMatchers(baseObjectName, processor.getMatchers().iterator(), 
0);



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to