[jboss-cvs] JBossAS SVN: r58095 - in trunk/cluster/src/main/org/jboss/ha/framework/server: . util

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-11-03 19:57:29 -0500 (Fri, 03 Nov 2006)
New Revision: 58095

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndi.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndiMBean.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java
Log:
Remove the log4j usage

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java	2006-11-03 21:46:16 UTC (rev 58094)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/DistributedStateImpl.java	2006-11-04 00:57:29 UTC (rev 58095)
@@ -162,7 +162,7 @@
          Iterator keysIter = this.getAllKeys(category).iterator ();
 
          result.append ("-----------------------------------------------\n");
-         result.append ("Category : ").append (category).append ("\n\n");
+         result.append ("Logger : ").append (category).append ("\n\n");
          result.append ("KEY\t:\tVALUE\n");
 
          while (keysIter.hasNext ())
@@ -192,8 +192,8 @@
          String category = (String)catsIter.next ();
          Iterator keysIter = this.getAllKeys(category).iterator ();
 
-         result.append ("\t<Category>\n");
-         result.append ("\t\t<CategoryName>").append (category).append ("</CategoryName>\n");
+         result.append ("\t<Logger>\n");
+         result.append ("\t\t<LoggerName>").append (category).append ("</LoggerName>\n");
 
          while (keysIter.hasNext ())
          {
@@ -204,7 +204,7 @@
             result.append ("\t\t\t<Value>").append (value).append ("</Value>\n");
             result.append ("\t\t</Entry>\n");
          }
-         result.append ("\t</Category>\n");
+         result.append ("\t</Logger>\n");
       }
       result.append ("</DistributedState>\n");
 
@@ -319,10 +319,10 @@
      */
    public Collection getAllKeys(String category) {
       try {
-         Node nodeCategory = getCategory(category);
-         if (nodeCategory==null || nodeCategory.getDataKeys() == null)
+         Node nodeLogger = getLogger(category);
+         if (nodeLogger==null || nodeLogger.getDataKeys() == null)
             return null;
-         return Collections.unmodifiableCollection(nodeCategory.getDataKeys());
+         return Collections.unmodifiableCollection(nodeLogger.getDataKeys());
       } catch (CacheException ce) {
          return null;
 		}
@@ -336,7 +336,7 @@
      */
    public Collection getAllValues(String category) {
       try {
-         Node categoryNode = getCategory(category);
+         Node categoryNode = getLogger(category);
          if (categoryNode == null) {
             return null;
          }
@@ -649,7 +649,7 @@
       return new Fqn(new Object[] { ROOT, category, key, value });
    }
 
-   protected Node getCategory(String category) throws CacheException {
+   protected Node getLogger(String category) throws CacheException {
       return cache.get(buildFqn(category));
    }
 

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndi.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndi.java	2006-11-03 21:46:16 UTC (rev 58094)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndi.java	2006-11-04 00:57:29 UTC (rev 58095)
@@ -103,15 +103,15 @@
     * @param removed ArrayList<AddressPort> of nodes that were removed
     * @param added ArrayList<AddressPort> of nodes that were added
     * @param members ArrayList<AddressPort> of nodes currently in the cluster
-    * @param logCategoryName the log4j category name used by the
+    * @param logLoggerName the log4j category name used by the
     * TopologyMonitorService. This is used for logging to integrate with
     * the TopologyMonitorService output.
     */
    public void membershipChanged(ArrayList removed, ArrayList added,
-      ArrayList members, String logCategoryName)
+      ArrayList members, String logLoggerName)
    {
       log.debug("membershipChanged");
-      Logger tmsLog = Logger.getLogger(logCategoryName);
+      Logger tmsLog = Logger.getLogger(logLoggerName);
       Hashtable localEnv = null;
       try
       {

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndiMBean.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndiMBean.java	2006-11-03 21:46:16 UTC (rev 58094)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/util/PingJndiMBean.java	2006-11-04 00:57:29 UTC (rev 58095)
@@ -60,10 +60,10 @@
     * @param deadMembers ArrayList<AddressPort> of nodes that were removed
     * @param newMembers ArrayList<AddressPort> of nodes that were added
     * @param allMembers ArrayList<AddressPort> of nodes currently in the cluster
-    * @param logCategoryName the log4j category name used by the
+    * @param logLoggerName the log4j category name used by the
     * TopologyMonitorService. This is used for logging to integrate with
     * the TopologyMonitorService output.
     */
    public void membershipChanged(ArrayList deadMembers, ArrayList newMembers,
-      ArrayList allMembers, String logCategoryName);
+      ArrayList allMembers, String logLoggerName);
 }

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java	2006-11-03 21:46:16 UTC (rev 58094)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/util/TopologyMonitorService.java	2006-11-04 00:57:29 UTC (rev 58095)
@@ -68,11 +68,11 @@
    param: removed ArrayList<AddressPort> of nodes that were removed
    param: added ArrayList<AddressPort> of nodes that were added
    param: members ArrayList<AddressPort> of nodes currently in the cluster
-   param: logCategoryName the log4j category name used by the
+   param: logLoggerName the log4j category name used by the
       TopologyMonitorService. This should be used for logging to integrate with
       the TopologyMonitorService output.
    public void membershipChanged(ArrayList deadMembers, ArrayList newMembers,
-      ArrayList allMembers, String logCategoryName)
+      ArrayList allMembers, String logLoggerName)
 </pre>
 
  @author Scott.Stark at jboss.org