[jboss-cvs] JBossAS SVN: r72763 - trunk/server/src/main/org/jboss/deployment/dependency.

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

Author: scott.stark at jboss.org
Date: 2008-04-27 14:12:17 -0400 (Sun, 27 Apr 2008)
New Revision: 72763

Modified:
   trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java
   trunk/server/src/main/org/jboss/deployment/dependency/JndiDependencyMetaData.java
Log:
Add the container name as a jndi name and correct the jndi dependency toString

Modified: trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java	2008-04-27 18:11:18 UTC (rev 72762)
+++ trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java	2008-04-27 18:12:17 UTC (rev 72763)
@@ -61,18 +61,18 @@
    /** The jndi names for other container this container depends on */
    private Set<String> jndiAliasDepends = new HashSet<String>();
 
-
    /**
-    * Create a demand for a container name
     * 
-    * @param componentID -
-    *           the id of the component in the deployment
+    * @param containerName - the jndi name of the container
+    * @param componentName - the unique vfs/component-name id
+    * @param deploymentPath - the vfs relative path of the component deployment
     */
    public ContainerDependencyMetaData(String containerName, String componentName, String deploymentPath)
    {
       this.containerName = containerName;
       this.componentName = componentName;
       this.deploymentPath = deploymentPath;
+      this.addJndiName(containerName);
    }
 
    public String getComponentName()

Modified: trunk/server/src/main/org/jboss/deployment/dependency/JndiDependencyMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/dependency/JndiDependencyMetaData.java	2008-04-27 18:11:18 UTC (rev 72762)
+++ trunk/server/src/main/org/jboss/deployment/dependency/JndiDependencyMetaData.java	2008-04-27 18:12:17 UTC (rev 72763)
@@ -98,13 +98,19 @@
       visitor.initialVisit(this);
    }
 
+   @Override
+   protected void toString(JBossStringBuilder buffer)
+   {
+      buffer.append(jndiName);
+   }
+   @Override
    public String toShortString()
    {
       JBossStringBuilder buffer = new JBossStringBuilder();
       toShortString(buffer);
       return buffer.toString();
    }
-
+   @Override
    public void toShortString(JBossStringBuilder buffer)
    {
       buffer.append(jndiName);