[jboss-cvs] JBossAS SVN: r91379 - in projects/mc-tools/grapher/trunk: src/main/java/org/jboss/mctools/grapher/graph and 1 other directories.

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

Author: alesj
Date: 2009-07-17 12:27:35 -0400 (Fri, 17 Jul 2009)
New Revision: 91379

Modified:
   projects/mc-tools/grapher/trunk/pom.xml
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java
Log:
Simplify deployment lookup.

Modified: projects/mc-tools/grapher/trunk/pom.xml
===================================================================
--- projects/mc-tools/grapher/trunk/pom.xml	2009-07-17 15:49:19 UTC (rev 91378)
+++ projects/mc-tools/grapher/trunk/pom.xml	2009-07-17 16:27:35 UTC (rev 91379)
@@ -183,6 +183,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-vfs</artifactId>
+      <version>2.1.2.GA</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
       <version>2.0.7.GA</version>

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java	2009-07-17 15:49:19 UTC (rev 91378)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/AbstractGraphCreator.java	2009-07-17 16:27:35 UTC (rev 91379)
@@ -133,9 +133,12 @@
          return;
       }
 
+      DependencyInfo info = context.getDependencyInfo();
+      if (info == null)
+         return;
+
       GraphCell owner = getCell(cells, objects, context);
 
-      DependencyInfo info = context.getDependencyInfo();
       Set<DependencyItem> items = info.getIDependOn(null);
       if (items != null && items.isEmpty() == false)
       {

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java	2009-07-17 15:49:19 UTC (rev 91378)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java	2009-07-17 16:27:35 UTC (rev 91379)
@@ -21,6 +21,7 @@
  */
 package org.jboss.mctools.grapher.graph;
 
+import java.net.URI;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -30,24 +31,32 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
 import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.util.StringPropertyReplacer;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
 import org.jgraph.graph.ConnectionSet;
 import org.jgraph.graph.GraphCell;
 
 /**
- * Render single bean.
+ * Render deployment's beans.
+ * TODO - test this
  *
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
 public class DeploymentGraphCreator extends AbstractGraphCreator
 {
+   private String folder;
    private String deploymentName;
    private Set<Object> visited;
 
-   public DeploymentGraphCreator(String deploymentName)
+   public DeploymentGraphCreator(String folder, String deploymentName)
    {
+      if (folder == null)
+         throw new IllegalArgumentException("Null folder");
       if (deploymentName == null)
          throw new IllegalArgumentException("Null deployment name");
 
+      this.folder = folder;
       this.deploymentName = deploymentName;
       visited = new HashSet<Object>();
    }
@@ -58,9 +67,21 @@
       if (structureCC == null)
          throw new IllegalArgumentException("No MainDeployerStructure found.");
 
-      MainDeployerStructure structure = MainDeployerStructure.class.cast(structureCC.getTarget());
-      DeploymentUnit unit = structure.getDeploymentUnit(deploymentName);
-      handleDeploymentUnit(unit, controller, cells, objects, attributes, cs, excludedTypes);
+      try
+      {
+         String uriString = "${jboss.server.home.url}" + folder + "/" + deploymentName;
+         uriString = StringPropertyReplacer.replaceProperties(uriString);
+         URI uri = new URI(uriString);
+         VirtualFile root = VFS.getRoot(uri);
+
+         MainDeployerStructure structure = MainDeployerStructure.class.cast(structureCC.getTarget());
+         DeploymentUnit unit = structure.getDeploymentUnit(root.toURI().toString());
+         handleDeploymentUnit(unit, controller, cells, objects, attributes, cs, excludedTypes);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
    }
 
    /**

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java	2009-07-17 15:49:19 UTC (rev 91378)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/map/DefaultGraphCreatorMapper.java	2009-07-17 16:27:35 UTC (rev 91379)
@@ -47,7 +47,13 @@
 
       String deployment = request.getParameter("deployment");
       if (deployment != null)
-         return new DeploymentGraphCreator(deployment);
+      {
+         String type = request.getParameter("deploymentFolder");
+         if (type == null)
+            type = "deploy";
+         
+         return new DeploymentGraphCreator(type, deployment);
+      }
 
       return ALL;
    }