[jboss-cvs] JBossAS SVN: r71683 - in projects/jboss-deployers/trunk: deployers-impl/src/main/org/jboss/deployers/plugins/deployers and 1 other directory.

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

Author: alesj
Date: 2008-04-03 04:56:42 -0400 (Thu, 03 Apr 2008)
New Revision: 71683

Modified:
   projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/IncompleteDeployments.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java
Log:
[JBDEPLOY-30] grouping unknown depends under item name.

Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/IncompleteDeployments.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/IncompleteDeployments.java	2008-04-03 08:49:02 UTC (rev 71682)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/IncompleteDeployments.java	2008-04-03 08:56:42 UTC (rev 71683)
@@ -24,11 +24,12 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.HashMap;
 
 /**
  * IncompleteDeployments.
@@ -200,12 +201,35 @@
    }
 
    /**
+    * Merge root causes for the same key.
+    *
+    * @param rootCauses the root causes map
+    * @param key the possible root cause key
+    * @param value the possible root cause value
+    */
+   private static void mergeRootCauses(Map<String, Set<String>> rootCauses, String key, String value)
+   {
+      Set<String> values = rootCauses.get(key);
+      if (values == null)
+      {
+         values = Collections.singleton(value);
+         rootCauses.put(key, values);
+      }
+      else
+      {
+         values = new HashSet<String>(values);
+         values.add(value);
+         rootCauses.put(key, values);
+      }
+   }
+
+   /**
     * Calculate upfront context errors.
     */
    protected void calculateContextsError()
    {
       // Popluate the potential root causes
-      Map<String, String> rootCauses = new HashMap<String, String>();
+      Map<String, Set<String>> rootCauses = new HashMap<String, Set<String>>();
 
       // Missing dependencies are root causes
       Map<String, Set<MissingDependency>> contextsMissingDependencies = getContextsMissingDependencies();
@@ -214,7 +238,7 @@
          for (Map.Entry<String, Set<MissingDependency>> entry : contextsMissingDependencies.entrySet())
          {
             for (MissingDependency dependency : entry.getValue())
-               rootCauses.put(dependency.getDependency(), dependency.getActualState());
+               mergeRootCauses(rootCauses, dependency.getDependency(), dependency.getActualState());
          }
       }
 
@@ -226,9 +250,9 @@
          {
             Throwable t = entry.getValue();
             if (t == null)
-               rootCauses.put(entry.getKey(), "** UNKNOWN ERROR **");
+               mergeRootCauses(rootCauses, entry.getKey(), "** UNKNOWN ERROR **");
             else
-               rootCauses.put(entry.getKey(), t.toString());
+               mergeRootCauses(rootCauses, entry.getKey(), t.toString());
          }
       }
 
@@ -263,8 +287,22 @@
       if (rootCauses.isEmpty() == false)
       {
          buffer.append("\n*** CONTEXTS IN ERROR: Name -> Error\n\n");
-         for (Map.Entry<String, String> entry : rootCauses.entrySet())
-            buffer.append(entry.getKey()).append(" -> ").append(entry.getValue()).append("\n\n");
+         for (String key : rootCauses.keySet())
+         {
+            buffer.append(key).append(" -> ");
+            Set<String> values = rootCauses.get(key);
+            boolean first = true;
+            for (String value : values)
+            {
+               if (first == false)
+                  buffer.append(" | ");
+               else
+                  first = false;
+
+               buffer.append(value);
+            }
+            buffer.append("\n\n");
+         }
       }
       contextsInErrorInfo = buffer.toString();
    }

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2008-04-03 08:49:02 UTC (rev 71682)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2008-04-03 08:56:42 UTC (rev 71683)
@@ -59,7 +59,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
-import org.jboss.util.id.GUID;
 
 /**
  * DeployersImpl.
@@ -700,7 +699,7 @@
 
                   if (iDependOn == null)
                   {
-                     dependency = "<UNKNOWN " + GUID.asString() + ">";
+                     dependency = "<UNKNOWN " + item.getName() + ">";
                      actualStateString = "** UNRESOLVED " + item.toHumanReadableString() + " **";
                   }
                   else