[jboss-cvs] JBossAS SVN: r57936 - trunk/ejb3/src/main/org/jboss/ejb3/metamodel

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

Author: scott.stark at jboss.org
Date: 2006-10-30 21:50:56 -0500 (Mon, 30 Oct 2006)
New Revision: 57936

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
Log:
Merge changed from the JEE5_TCK branch

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2006-10-31 02:50:08 UTC (rev 57935)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2006-10-31 02:50:56 UTC (rev 57936)
@@ -22,19 +22,12 @@
 package org.jboss.ejb3.metamodel;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 
-import javax.security.auth.callback.CallbackHandler;
-
 import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.EnvEntry;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
 
 /**
  * This represents a application client deployment descriptor.
@@ -46,6 +39,7 @@
  */
 public class ApplicationClientDD extends EnvironmentRefGroup
 {
+   @SuppressWarnings("unused")
    private static final Logger log = Logger.getLogger(ApplicationClientDD.class);
    
    private String displayName;
@@ -62,9 +56,25 @@
    private List<LifecycleCallback> preDestroys = new ArrayList<LifecycleCallback>();
    private String callbackHandlerClass = null;
    
-   private int version = 5;
+   private String version = null;
    private boolean metadataComplete = false;
    
+   // from jboss-client.xml 
+   
+   private String jndiName;
+   
+   private Collection<String> dependencies = new HashSet<String>();
+   
+   public void addDependency(String depends)
+   {
+      dependencies.add(depends);
+   }
+   
+   public Collection<String> getDependencies()
+   {
+      return dependencies;
+   }
+   
    public String getDisplayName()
    {
       return displayName;
@@ -75,6 +85,18 @@
       this.displayName = displayName;
    }
    
+   public String getJndiName()
+   {
+      if(jndiName == null)
+         return getDisplayName();
+      return jndiName;
+   }
+   
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+   
    public boolean isMetaDataComplete()
    {
       return metadataComplete;
@@ -95,12 +117,12 @@
       return preDestroys;
    }
    
-   public int getVersion()
+   public String getVersion()
    {
       return version;
    }
    
-   public void setVersion(int version)
+   public void setVersion(String version)
    {
       this.version = version;
    }