[jboss-cvs] JBossAS SVN: r62273 - in trunk/ejb3/src: resources/schema and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Apr 11 12:47:37 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-04-11 12:47:37 -0400 (Wed, 11 Apr 2007)
New Revision: 62273

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java
   trunk/ejb3/src/resources/schema/jboss_5_0.xsd
Log:
Add support for <port-component> on generic ejb3

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-04-11 16:47:29 UTC (rev 62272)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java	2007-04-11 16:47:37 UTC (rev 62273)
@@ -22,18 +22,19 @@
 package org.jboss.ejb3.metamodel;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
+
 import javax.ejb.TransactionManagementType;
+
 import org.jboss.logging.Logger;
-
 import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.MessageDestinationRef; 
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
 import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef; 
+import org.jboss.metamodel.descriptor.ResourceRef;
 
 /**
  * Represents an EJB element of the ejb-jar.xml deployment descriptor for the
@@ -93,6 +94,8 @@
 
    private PoolConfig poolConfig = null;
    
+   private List<Ejb3PortComponent> portComponents = new ArrayList<Ejb3PortComponent>();
+   
    /** The security-role-ref element(s) info */
    private ArrayList<SecurityRoleRefMetaData> securityRoleReferences = new ArrayList<SecurityRoleRefMetaData>();
    
@@ -384,6 +387,11 @@
       this.securityRoleReferences = securityRoleReferences;
    }
 
+   public List<Ejb3PortComponent> getPortComponents()
+   {
+      return portComponents;
+   }
+
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-04-11 16:47:29 UTC (rev 62272)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java	2007-04-11 16:47:37 UTC (rev 62273)
@@ -53,72 +53,72 @@
    private HashMap<String, EnterpriseBean> enterpriseBeans = new HashMap();
 
    private EnterpriseBean currentEjb;
-   
+
    public void setPoolConfig(PoolConfig config)
    {
       currentEjb.setPoolConfig(config);
    }
-   
+
    public void setDefaultActivationConfig(ActivationConfig config)
    {
       ((MessageDrivenBean)currentEjb).setDefaultActivationConfig(config);
    }
-   
+
    public void setCacheConfig(CacheConfig config)
    {
       ((SessionEnterpriseBean)currentEjb).setCacheConfig(config);
    }
-   
+
    public void setClustered(String clustered)
    {
       ((SessionEnterpriseBean)currentEjb).setClustered(clustered);
    }
-   
+
    public void setConcurrent(String concurrent)
    {
       ((SessionEnterpriseBean)currentEjb).setConcurrent(concurrent);
    }
-   
+
    public void addJndiRef(JndiRef ref)
    {
       currentEjb.addJndiRef(ref);
    }
-   
+
    public void addXmlAnnotation(XmlAnnotation xmlAnnotation)
    {
       currentEjb.addXmlAnnotation(xmlAnnotation);
    }
-   
+
    public void addRemoteBinding(RemoteBinding binding)
    {
       currentEjb.addRemoteBinding(binding);
    }
-   
+
    public void addIgnoreDependency(InjectionTarget ignore)
    {
       currentEjb.addIgnoreDependency(ignore);
    }
-   
+
    public void addResourceRef(ResourceRef ref)
    {
       currentEjb.mergeResourceRef(ref);
    }
-   
+
    public void addResourceEnvRef(ResourceEnvRef ref)
    {
       currentEjb.mergeResourceEnvRef(ref);
    }
-   
+
    public void addMessageDestinationRef(MessageDestinationRef ref)
    {
       currentEjb.mergeMessageDestinationRef(ref);
    }
-   
+
    public void addServiceRef(ServiceRefMetaData ref)
    {
       currentEjb.addServiceRef(ref);
    }
-   
+
    public ServiceRefMetaData getServiceRef(String name)
    {
       return currentEjb.getServiceRef(name);
@@ -126,10 +126,8 @@
 
    public void addPortComponent(Ejb3PortComponent portComp)
    {
-      if(! (currentEjb instanceof SessionEnterpriseBean) )
-         throw new IllegalArgumentException("Cannot add portComponent to " + currentEjb);
-      ((SessionEnterpriseBean)currentEjb).getPortComponents().add(portComp);   
-   }  
+      currentEjb.getPortComponents().add(portComp);
+   }
 
    public void setMethodAttributes(MethodAttributes attributes)
    {
@@ -155,22 +153,22 @@
    {
       currentEjb.updateEjbLocalRef(ref);
    }
-   
+
    public void updateResourceRef(ResourceRef ref)
    {
       currentEjb.updateResourceRef(ref);
    }
-   
+
    public void updateResourceEnvRef(ResourceEnvRef ref)
    {
       currentEjb.updateResourceEnvRef(ref);
    }
-   
+
    public void updateMessageDestinationRef(MessageDestinationRef ref)
    {
       currentEjb.updateMessageDestinationRef(ref);
    }
-   
+
    public void setResourceAdapterName(String name)
    {
       ((MessageDrivenBean)currentEjb).setResourceAdaptorName(name);
@@ -190,7 +188,7 @@
    {
       ((MessageDrivenBean)currentEjb).setMdbPassword(name);
    }
-   
+
    public void setMdbSubscriptionId(String id)
    {
       ((MessageDrivenBean)currentEjb).setMdbSubscriptionId(id);
@@ -220,7 +218,7 @@
    {
       currentEjb.setJndiName(jndiName);
    }
-   
+
    public void setHomeJndiName(String homeJndiName)
    {
       currentEjb.setHomeJndiName(homeJndiName);
@@ -235,7 +233,7 @@
    {
       currentEjb.setLocalJndiName(jndiName);
    }
-   
+
    public void setLocalHomeJndiName(String homeJndiName)
    {
       currentEjb.setLocalHomeJndiName(homeJndiName);
@@ -243,21 +241,23 @@
 
    public EnterpriseBean createEjbByEjbName(String ejbName, Class ejbClass)
    {
-      EnterpriseBean ejb = (EnterpriseBean) enterpriseBeans.get(ejbName);
+      EnterpriseBean ejb = (EnterpriseBean)enterpriseBeans.get(ejbName);
       if (ejb != null)
          return ejb;
-      
-      try 
+
+      try
       {
          ejb = (EnterpriseBean)ejbClass.newInstance();
          ejb.setEjbName(ejbName);
          enterpriseBeans.put(ejbName, ejb);
       }
-      catch (Exception e){}
-      
+      catch (Exception e)
+      {
+      }
+
       return ejb;
    }
-   
+
    public EnterpriseBean findEjbByEjbName(String ejbName)
    {
       return enterpriseBeans.get(ejbName);
@@ -270,7 +270,7 @@
       Iterator ejbs = enterpriseBeans.values().iterator();
       while (ejbs.hasNext())
       {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
+         EnterpriseBean ejb = (EnterpriseBean)ejbs.next();
          String ejbClassName = ejb.getEjbClass();
          if (ejbClassName != null && ejbClassName.equals(className))
             result.add(ejb);
@@ -283,7 +283,7 @@
       Iterator ejbs = enterpriseBeans.values().iterator();
       while (ejbs.hasNext())
       {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
+         EnterpriseBean ejb = (EnterpriseBean)ejbs.next();
          if (ejb.getRemote() != null && ejb.getRemote().equals(remote))
             return ejb;
       }
@@ -295,7 +295,7 @@
       Iterator ejbs = enterpriseBeans.values().iterator();
       while (ejbs.hasNext())
       {
-         EnterpriseBean ejb = (EnterpriseBean) ejbs.next();
+         EnterpriseBean ejb = (EnterpriseBean)ejbs.next();
          if (ejb.getLocal() != null && ejb.getLocal().equals(local))
             return ejb;
       }
@@ -307,10 +307,10 @@
       return enterpriseBeans.values();
    }
 
-/*   public void setEnterpriseBeans(List enterpriseBeans)
-   {
-      this.enterpriseBeans = enterpriseBeans;
-   }*/
+   /*   public void setEnterpriseBeans(List enterpriseBeans)
+    {
+    this.enterpriseBeans = enterpriseBeans;
+    }*/
 
    public void addEnterpriseBean(EnterpriseBean ejb)
    {
@@ -333,10 +333,9 @@
       if (!(o instanceof EnterpriseBeans))
          return false;
 
-      final EnterpriseBeans ejbs = (EnterpriseBeans) o;
+      final EnterpriseBeans ejbs = (EnterpriseBeans)o;
 
-      if (enterpriseBeans != null ? !enterpriseBeans
-              .equals(ejbs.enterpriseBeans) : ejbs.enterpriseBeans != null)
+      if (enterpriseBeans != null ? !enterpriseBeans.equals(ejbs.enterpriseBeans) : ejbs.enterpriseBeans != null)
          return false;
 
       return true;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-04-11 16:47:29 UTC (rev 62272)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java	2007-04-11 16:47:37 UTC (rev 62273)
@@ -316,6 +316,11 @@
          ejbClass = MessageDrivenBean.class;
          child = ejbs;
       }
+      else if (localName.equals("ejb"))
+      {
+         ejbClass = GenericBean.class;
+         child = ejbs;
+      }
       else if (localName.equals("service"))
       {
          child = new Service();
@@ -324,12 +329,6 @@
       {
          child = new Consumer();
       }
-      else if (localName.equals("ejb"))
-      {
-         log.trace("found ejb");
-         ejbClass = GenericBean.class;
-         child = ejbs;
-      }
       else if (localName.equals("method-attributes"))
       {
          child = new MethodAttributes();
@@ -362,11 +361,10 @@
       {
          child = new ActivationConfig();
       }
-      else if (localName.equals("port-component") && ejbClass == SessionEnterpriseBean.class)
+      else if (localName.equals("port-component"))
       {
          child = new Ejb3PortComponent();
       }
-      
       return child;
    }
 

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java	2007-04-11 16:47:29 UTC (rev 62272)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/SessionEnterpriseBean.java	2007-04-11 16:47:37 UTC (rev 62273)
@@ -18,15 +18,14 @@
  * License along with this software; if not, write to the Free
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
+ */
 package org.jboss.ejb3.metamodel;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+
 import org.jboss.logging.Logger;
 
-import org.jboss.metamodel.descriptor.PersistenceUnitRef;
-
 /**
  * Represents a Session EJB element of the ejb-jar.xml deployment descriptor for
  * the 1.4 schema
@@ -36,8 +35,7 @@
  */
 public class SessionEnterpriseBean extends EnterpriseBean
 {
-   private static final Logger log = Logger
-           .getLogger(SessionEnterpriseBean.class);
+   private static final Logger log = Logger.getLogger(SessionEnterpriseBean.class);
 
    public static final String STATELESS = "Stateless";
 
@@ -52,50 +50,48 @@
    private Method prePassivate;
    private List<RemoveMethod> removeMethods = new ArrayList<RemoveMethod>();
    private List<InitMethod> initMethods = new ArrayList<InitMethod>();
-   
+
    private String clustered = null;
    private ClusterConfig clusterConfig = null;
    private CacheConfig cacheConfig = null;
-   
+
    private String concurrent = null;
 
-   private List<Ejb3PortComponent> portComponents = new ArrayList<Ejb3PortComponent>();
-   
    public CacheConfig getCacheConfig()
    {
       return cacheConfig;
    }
-   
+
    public void setCacheConfig(CacheConfig cacheConfig)
    {
       this.cacheConfig = cacheConfig;
    }
-   
+
    public String getConcurrent()
    {
       return concurrent;
    }
-   
+
    public void setConcurrent(String concurrent)
    {
       this.concurrent = concurrent;
    }
-   
+
    public String getClustered()
    {
       return clustered;
    }
-   
+
    public void setClustered(String clustered)
    {
       this.clustered = clustered;
    }
-   
+
    public ClusterConfig getClusterConfig()
    {
       return clusterConfig;
    }
-   
+
    public void setClusterConfig(ClusterConfig clusterConfig)
    {
       this.clusterConfig = clusterConfig;
@@ -105,17 +101,17 @@
    {
       return removeMethods;
    }
-   
+
    public void addRemoveMethod(RemoveMethod method)
    {
       removeMethods.add(method);
    }
-   
+
    public List<InitMethod> getInitMethods()
    {
       return initMethods;
    }
-   
+
    public void addInitMethod(InitMethod method)
    {
       initMethods.add(method);
@@ -153,7 +149,8 @@
 
    public Method getPostActivate()
    {
-      if (sessionType.equals(STATELESS)) return null;
+      if (sessionType.equals(STATELESS))
+         return null;
       return postActivate;
    }
 
@@ -184,7 +181,8 @@
 
    public Method getPrePassivate()
    {
-      if (sessionType.equals(STATELESS)) return null;
+      if (sessionType.equals(STATELESS))
+         return null;
       return prePassivate;
    }
 
@@ -193,12 +191,6 @@
       this.prePassivate = prePassivate;
    }
 
-
-   public List<Ejb3PortComponent> getPortComponents()
-   {
-      return portComponents;
-   }
-
    public String toString()
    {
       StringBuffer sb = new StringBuffer(100);

Modified: trunk/ejb3/src/resources/schema/jboss_5_0.xsd
===================================================================
(Binary files differ)




More information about the jboss-cvs-commits mailing list