[jboss-cvs] JBossAS SVN: r66350 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: scott.stark at jboss.org
Date: 2007-10-23 02:35:44 -0400 (Tue, 23 Oct 2007)
New Revision: 66350

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
Log:
Support all spec entity metadata and implement merge

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2007-10-23 06:24:29 UTC (rev 66349)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2007-10-23 06:35:44 UTC (rev 66350)
@@ -21,9 +21,13 @@
 */
 package org.jboss.metadata.ejb.jboss;
 
-import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.CMPFieldsMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
+import org.jboss.metadata.ejb.spec.PersistenceType;
+import org.jboss.metadata.ejb.spec.QueriesMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
@@ -31,14 +35,54 @@
  * EntityBeanMetaData.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
  */
 @XmlType(name="jboss-entity-beanType")
 public class JBossEntityBeanMetaData extends JBossEnterpriseBeanMetaData
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -6869794514744015588L;
+
+   /** The home interface */
+   private String home;
+
+   /** The remote interface */
+   private String remote;
+
+   /** The local home */
+   private String localHome;
+
+   /** The local */
+   private String local;
    
+   /** The persistence type */
+   private PersistenceType persistenceType;
+   
+   /** The primary key class */
+   private String primKeyClass;
+   
+   /** The reentrant */
+   private boolean reentrant;
+
+   /** The cmp version */
+   private String cmpVersion;
+
+   /** The abstract schema name */
+   private String abstractSchemaName;
+   
+   /** The cmp fields */
+   private CMPFieldsMetaData cmpFields;
+   
+   /** The primary key field */
+   private String primKeyField;
+   
+   /** The security role refs */
+   private SecurityRoleRefsMetaData securityRoleRefs;
+   
+   /** The queries */
+   private QueriesMetaData queries;
+
    /** The jndi name */
    private String jndiName;
    
@@ -91,6 +135,71 @@
       return true;
    }
 
+   public String getAbstractSchemaName()
+   {
+      return abstractSchemaName;
+   }
+
+   public CMPFieldsMetaData getCmpFields()
+   {
+      return cmpFields;
+   }
+
+   public String getCmpVersion()
+   {
+      return cmpVersion;
+   }
+
+   public String getHome()
+   {
+      return home;
+   }
+
+   public String getLocal()
+   {
+      return local;
+   }
+
+   public String getLocalHome()
+   {
+      return localHome;
+   }
+
+   public PersistenceType getPersistenceType()
+   {
+      return persistenceType;
+   }
+
+   public String getPrimKeyClass()
+   {
+      return primKeyClass;
+   }
+
+   public String getPrimKeyField()
+   {
+      return primKeyField;
+   }
+
+   public QueriesMetaData getQueries()
+   {
+      return queries;
+   }
+
+   public boolean isReentrant()
+   {
+      return reentrant;
+   }
+
+   public String getRemote()
+   {
+      return remote;
+   }
+
+   public SecurityRoleRefsMetaData getSecurityRoleRefs()
+   {
+      return securityRoleRefs;
+   }
+
    @Override
    public String getDefaultConfigurationName()
    {
@@ -374,5 +483,95 @@
       cacheInvalidationConfig.setEntityBean(this);
       this.cacheInvalidationConfig = cacheInvalidationConfig;
    }
+
+   @Override
+   public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
+   {
+      super.merge(override, original);
+      JBossEntityBeanMetaData joverride = (JBossEntityBeanMetaData) override;
+      EntityBeanMetaData soriginal = (EntityBeanMetaData) original;
+
+      // home
+      if(joverride != null && joverride.home != null)
+         home = joverride.home;
+      else if(soriginal != null && soriginal.getHome() != null)
+         home = soriginal.getHome();
+      // remote
+      if(joverride != null && joverride.remote != null)
+         remote = joverride.remote;
+      else if(soriginal != null && soriginal.getRemote() != null)
+         remote = soriginal.getRemote();
+      // localHome
+      if(joverride != null && joverride.localHome != null)
+         localHome = joverride.localHome;
+      else if(soriginal != null && soriginal.getLocalHome() != null)
+         localHome = soriginal.getLocalHome();
+      // local
+      if(joverride != null && joverride.local != null)
+         local = joverride.local;
+      else if(soriginal != null && soriginal.getLocal() != null)
+         local = soriginal.getLocal();
+      // persistenceType
+      if(joverride != null && joverride.persistenceType != null)
+         persistenceType = joverride.persistenceType;
+      else if(soriginal != null && soriginal.getPersistenceType() != null)
+         persistenceType = soriginal.getPersistenceType();
+      // primKeyClass
+      if(joverride != null && joverride.primKeyClass != null)
+         primKeyClass = joverride.primKeyClass;
+      else if(soriginal != null && soriginal.getPrimKeyClass() != null)
+         primKeyClass = soriginal.getPrimKeyClass();
+      // reentrant
+      if(soriginal != null)
+         reentrant = soriginal.isReentrant();
+      // cmpVersion
+      if(joverride != null && joverride.cmpVersion != null)
+         cmpVersion = joverride.cmpVersion;
+      else if(soriginal != null && soriginal.getCmpVersion() != null)
+         cmpVersion = soriginal.getCmpVersion();
+      // abstractSchemaName
+      if(joverride != null && joverride.abstractSchemaName != null)
+         abstractSchemaName = joverride.abstractSchemaName;
+      else if(soriginal != null && soriginal.getAbstractSchemaName() != null)
+         abstractSchemaName = soriginal.getAbstractSchemaName();
+      // cmpFields
+      if(joverride != null && joverride.cmpFields != null)
+         cmpFields = joverride.cmpFields;
+      else if(soriginal != null && soriginal.getCmpFields() != null)
+         cmpFields = soriginal.getCmpFields();
+      // primKeyField
+      if(joverride != null && joverride.primKeyField != null)
+         primKeyField = joverride.primKeyField;
+      else if(soriginal != null && soriginal.getPrimKeyField() != null)
+         primKeyField = soriginal.getPrimKeyField();
+      // securityRoleRefs
+      if(joverride != null && joverride.securityRoleRefs != null)
+         securityRoleRefs = joverride.securityRoleRefs;
+      else if(soriginal != null && soriginal.getSecurityRoleRefs() != null)
+         securityRoleRefs = soriginal.getSecurityRoleRefs();
+      // queries
+      if(joverride != null && joverride.queries != null)
+         queries = joverride.queries;
+      else if(soriginal != null && soriginal.getQueries() != null)
+         queries = soriginal.getQueries();
+
+      // jndiName
+      if(joverride != null && joverride.jndiName != null)
+         jndiName = joverride.jndiName;
+      else if(soriginal != null && soriginal.getMappedName() != null)
+         jndiName = soriginal.getMappedName();
+      // callByValue
+      if(joverride != null)
+         callByValue = joverride.callByValue;
+      // clustered
+      if(joverride != null)
+         clustered = joverride.clustered;
+      // readOnly
+      if(joverride != null)
+         readOnly = joverride.readOnly;
+      // clusterConfig
+      if(joverride != null && joverride.clusterConfig != null)
+         clusterConfig = joverride.clusterConfig;      
+   }
    
 }


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision