CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/manager AbstractJMXManager.java,1.11,1.12 MX4JLoggerAdapter.java,1.4,1.5 MX4JSystemManager.java,1.10,1.11 SubContext.java,1.7,1.8
Peter Donald <pdonald-yCVjj/[email protected]> Wed, 3 Dec 2003 04:45:17 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/manager
In directory hogshead.codehaus.org:/tmp/cvs-serv21491/engine/src/java/org/jcontainer/loom/components/manager
Modified Files:
AbstractJMXManager.java MX4JLoggerAdapter.java
MX4JSystemManager.java SubContext.java
Log Message:
Styled codebase
Index: AbstractJMXManager.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/manager/AbstractJMXManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- AbstractJMXManager.java 3 Dec 2003 02:54:42 -0000 1.11
+++ AbstractJMXManager.java 3 Dec 2003 10:44:42 -0000 1.12
@@ -89,11 +89,11 @@
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.codehaus.spice.salt.i18n.ResourceManager;
+import org.codehaus.spice.salt.i18n.Resources;
import org.jcontainer.loom.interfaces.ContainerConstants;
import org.jcontainer.loom.interfaces.LoomException;
import org.realityforge.metaclass.jmx.MBeanBinder;
-import org.codehaus.spice.salt.i18n.ResourceManager;
-import org.codehaus.spice.salt.i18n.Resources;
/**
* An abstract class via which JMX Managers can extend.
Index: MX4JLoggerAdapter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/manager/MX4JLoggerAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MX4JLoggerAdapter.java 5 Oct 2003 10:07:04 -0000 1.4
+++ MX4JLoggerAdapter.java 3 Dec 2003 10:44:42 -0000 1.5
@@ -91,12 +91,14 @@
/**
* A class to pipe MX4J's own logger to the one the container wants to use.
*/
-public class MX4JLoggerAdapter extends Logger
+public class MX4JLoggerAdapter
+ extends Logger
{
private static org.jcontainer.dna.Logger m_dnaLogger;
/**
* This is really bad. A static way of introducing a logger to a tool.
+ *
* @param logger the Avalon logger.
*/
public static void setLogger( final org.jcontainer.dna.Logger logger )
@@ -112,7 +114,9 @@
* @param message the message to log.
* @param throwable a message that may be sent.
*/
- protected void log( final int level, final Object message, final Throwable throwable )
+ protected void log( final int level,
+ final Object message,
+ final Throwable throwable )
{
switch( level )
{
Index: MX4JSystemManager.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/manager/MX4JSystemManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MX4JSystemManager.java 3 Dec 2003 02:54:42 -0000 1.10
+++ MX4JSystemManager.java 3 Dec 2003 10:44:42 -0000 1.11
@@ -99,12 +99,12 @@
import mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
import mx4j.log.Log;
import mx4j.util.StandardMBeanProxy;
+import org.codehaus.spice.salt.i18n.ResourceManager;
+import org.codehaus.spice.salt.i18n.Resources;
import org.jcontainer.dna.Configurable;
import org.jcontainer.dna.Configuration;
import org.jcontainer.dna.ConfigurationException;
import org.jcontainer.loom.interfaces.ContainerConstants;
-import org.codehaus.spice.salt.i18n.ResourceManager;
-import org.codehaus.spice.salt.i18n.Resources;
/**
* This component is responsible for managing loom instance.
Index: SubContext.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/manager/SubContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SubContext.java 3 Dec 2003 02:54:42 -0000 1.7
+++ SubContext.java 3 Dec 2003 10:44:42 -0000 1.8
@@ -87,15 +87,15 @@
package org.jcontainer.loom.components.manager;
import java.util.HashMap;
-import org.jcontainer.loom.interfaces.LoomException;
-import org.jcontainer.loom.interfaces.SystemManager;
import org.codehaus.spice.salt.i18n.ResourceManager;
import org.codehaus.spice.salt.i18n.Resources;
+import org.jcontainer.loom.interfaces.LoomException;
+import org.jcontainer.loom.interfaces.SystemManager;
/**
- * Implements a management context local to a particular process with which
- * it can register its managed object. The naming scheme that results is
- * meant to be compatible with jmx.
+ * Implements a management context local to a particular process with which it
+ * can register its managed object. The naming scheme that results is meant to
+ * be compatible with jmx.
*
* @author <a href="mailto:[email protected]">Huw Roberts</a>
*/
@@ -134,14 +134,15 @@
}
/**
- * Register an object for management.
- * The object is exported through some management scheme
- * (typically JMX). Note that the particular management scheme
- * will most likely use reflection to extract manageable information.
+ * Register an object for management. The object is exported through some
+ * management scheme (typically JMX). Note that the particular management
+ * scheme will most likely use reflection to extract manageable
+ * information.
*
* @param name the name to register object under
* @param object the object
- * @throws LoomException if an error occurs such as name already registered.
+ * @throws LoomException if an error occurs such as name already
+ * registered.
* @throws IllegalArgumentException if object is null
*/
public void register( final String name, final Object object )
@@ -154,7 +155,8 @@
* Unregister named object.
*
* @param name the name of object to unregister
- * @throws LoomException if an error occurs such as when no such object registered.
+ * @throws LoomException if an error occurs such as when no such object
+ * registered.
*/
public void unregister( final String name )
throws LoomException
@@ -163,8 +165,8 @@
}
/**
- * Returns the subcontext of the specified name. If it does not exist it
- * is created.
+ * Returns the subcontext of the specified name. If it does not exist it is
+ * created.
*
* @return the subcontext with the specified name
* @throws LoomException if context cannot be created or retrieved
@@ -202,8 +204,8 @@
}
/**
- * Helper method used to generate the jmx name by appending the current name
- * and passing up the chain to the root context
+ * Helper method used to generate the jmx name by appending the current name
+ * and passing up the chain to the root context
*/
private String jmxName( final String name )
{
@@ -224,8 +226,7 @@
}
/**
- * Helper method to get key used to store subcontexts
- * in m_subcontexts
+ * Helper method to get key used to store subcontexts in m_subcontexts
*/
private String contextKey( final String parent,
final String type )