[jboss-cvs] JBossAS SVN: r73978 - projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi.

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

Author: scott.stark at jboss.org
Date: 2008-06-03 00:19:58 -0400 (Tue, 03 Jun 2008)
New Revision: 73978

Modified:
   projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/DeploymentEndpointResolver.java
   projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/EndpointInfo.java
Log:
Update for the changes in jbossas

Modified: projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/DeploymentEndpointResolver.java
===================================================================
--- projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/DeploymentEndpointResolver.java	2008-06-03 03:21:27 UTC (rev 73977)
+++ projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/DeploymentEndpointResolver.java	2008-06-03 04:19:58 UTC (rev 73978)
@@ -36,9 +36,12 @@
     * 
     * @param businessIntf - the interface the endpoint should implement
     * @param endpointType - the type of endpoint
+    * @param vfsContext - the vfs relative path for the deployment initiating
+    *    the resolution request.  This is used to properly resolve
+    *    interface scopes from the inside out.
     * @return the matching endpoint info if found, null otherwise
     */
-   EndpointInfo getEndpointInfo(Class businessIntf, String endpointType);
+   EndpointInfo getEndpointInfo(Class businessIntf, String endpointType, String vfsContext);
 
    /**
     * Find the deployment endpoint for the given reference name. This may be
@@ -46,9 +49,13 @@
     * 
     * @param ref - relative or exact endpoint name
     * @param endpointType the type of endpoint
+    * @param vfsContext - the vfs relative path for the deployment initiating
+    *    the resolution request.  This is used to properly resolve
+    *    relative references.
     * @return the matching endpoint info if found, null otherwise
     * @see EndpointType
     */
-   EndpointInfo getEndpointInfo(String ref, String endpointType);
+   EndpointInfo getEndpointInfo(String ref, String endpointType, String vfsContext);
    
 }
+

Modified: projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/EndpointInfo.java
===================================================================
--- projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/EndpointInfo.java	2008-06-03 03:21:27 UTC (rev 73977)
+++ projects/integration/trunk/jboss-deployment-spi/src/main/java/org/jboss/deployment/spi/EndpointInfo.java	2008-06-03 04:19:58 UTC (rev 73978)
@@ -38,10 +38,12 @@
    private String name;
    /** The endpoint type */
    private String type;
+
    /**
-    * @param pathName
-    * @param name
-    * @param type
+    * @param pathName - the vfs relative path of the deployment containing the endpoint
+    * @param name - the deployment local unique name of the endpoing
+    * @param type - the endpoint type(ejb, message-destination, ...)
+    * @see EndpointType
     */
    public EndpointInfo(String pathName, String name, String type)
    {
@@ -51,19 +53,40 @@
       this.type = type;
    }
 
+   /**
+    * @return the vfs relative path for the endpoint's deployment
+    */
    public String getPathName()
    {
       return pathName;
    }
+   /**
+    * 
+    * @return the deployment local unique name of the endpoing
+    */
    public String getName()
    {
       return name;
    }
+   /**
+    * @return the endpoint type(ejb, message-destination, ...)
+    * @see EndpointType
+    */
    public String getType()
    {
       return type;
    }
 
+   /**
+    * Get the deployment unique key for the endpoint
+    * @return the unique key formed from the tuple (type, vfs relative path, name):
+    * type + "/" + pathName + "#" + name 
+    */
+   public String getComponentKey()
+   {
+      return type + "/" + pathName + "#" + name;
+   }
+
    @Override
    public String toString()
    {