[jboss-cvs] JBossAS SVN: r57840 - in branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3: clientmodule metamodel

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

Author: wolfc
Date: 2006-10-26 07:40:53 -0400 (Thu, 26 Oct 2006)
New Revision: 57840

Modified:
   branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
   branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
Log:
JBCTS-329: client-app dependencies in xml

Modified: branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2006-10-26 07:58:01 UTC (rev 57839)
+++ branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2006-10-26 11:40:53 UTC (rev 57840)
@@ -266,6 +266,11 @@
    
    private void processMetaData()
    {
+      for(String dependency : xml.getDependencies())
+      {
+         getDependencyPolicy().addDependency(dependency);
+      }
+      
       // TODO: check which handlers an application client should support
       Collection<InjectionHandler> handlers = new ArrayList<InjectionHandler>();
       handlers.add(new EJBHandler());

Modified: branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java
===================================================================
--- branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2006-10-26 07:58:01 UTC (rev 57839)
+++ branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDD.java	2006-10-26 11:40:53 UTC (rev 57840)
@@ -22,6 +22,8 @@
 package org.jboss.ejb3.metamodel;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 
 import org.jboss.logging.Logger;
@@ -61,6 +63,18 @@
    
    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;

Modified: branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2006-10-26 07:58:01 UTC (rev 57839)
+++ branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2006-10-26 11:40:53 UTC (rev 57840)
@@ -127,5 +127,7 @@
    {
       if(localName.equals("jndi-name"))
          dd.setJndiName(value);
+      else if(localName.equals("depends"))
+         dd.addDependency(value);
    }
 }