[jboss-cvs] JBossAS SVN: r66407 - 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-24 20:59:17 -0400 (Wed, 24 Oct 2007)
New Revision: 66407

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
Remove the override metadata from JBossSessionBeanMetaData

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java	2007-10-25 00:57:01 UTC (rev 66406)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java	2007-10-25 00:59:17 UTC (rev 66407)
@@ -24,8 +24,6 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
 import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
 
 /**
@@ -99,12 +97,11 @@
    {
       if (beanLoadBalancingPolicy == null && enterpriseBeanMetaData != null)
       {
-         IEnterpriseBeanMetaData ejb = enterpriseBeanMetaData.getOverridenMetaData();
-         if (ejb != null)
+         if (enterpriseBeanMetaData != null)
          {
-            if (ejb.isSession())
+            if (enterpriseBeanMetaData.isSession())
             {
-               SessionBeanMetaData session = (SessionBeanMetaData) ejb;
+               JBossSessionBeanMetaData session = (JBossSessionBeanMetaData) enterpriseBeanMetaData;
                if (session.isStateless())
                   return ROUND_ROBIN;
             }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2007-10-25 00:57:01 UTC (rev 66406)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2007-10-25 00:59:17 UTC (rev 66407)
@@ -31,13 +31,11 @@
 import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.SessionType;
-import org.jboss.metadata.ejb.spec.TransactionType;
 import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
 import org.jboss.metadata.javaee.spec.PortComponent;
 import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
 
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -136,24 +134,11 @@
    }
 
    @Override
-   public SessionBeanMetaData getOverridenMetaData()
-   {
-      return (SessionBeanMetaData) super.getOverridenMetaData();
-   }
-   
-   @XmlTransient
-   public void setOverridenMetaData(SessionBeanMetaData data)
-   {
-      super.setOverridenMetaData(data);
-   }
-
-   @Override
    public boolean isSession()
    {
       return true;
    }
 
-
    /**
     * Get the home.
     * 
@@ -353,6 +338,16 @@
    }
 
    /**
+    * Is this stateless
+    * 
+    * @return true for stateless
+    */
+   public boolean isStateless()
+   {
+      return isStateful() == false;
+   }
+   
+   /**
     * Get the timeoutMethod.
     * 
     * @return the timeoutMethod.
@@ -523,11 +518,7 @@
    @Override
    public String getDefaultConfigurationName()
    {
-      boolean stateful = false;
-      SessionBeanMetaData overriden = getOverridenMetaData();
-      if (overriden != null)
-         stateful = overriden.isStateful();
-
+      boolean stateful = isStateful();
       if (stateful)
       {
          if (isClustered())
@@ -547,11 +538,7 @@
    @Override
    public String getDefaultInvokerName()
    {
-      boolean stateful = false;
-      SessionBeanMetaData overriden = getOverridenMetaData();
-      if (overriden != null)
-         stateful = overriden.isStateful();
-
+      boolean stateful = isStateful();
       if (stateful)
       {
          if (isClustered())
@@ -601,13 +588,9 @@
       if (jndiName != null)
          return jndiName;
       
-      SessionBeanMetaData overriden = getOverridenMetaData();
-      if (overriden != null)
-      {
-         String mapped = overriden.getMappedName();
-         if (mapped != null)
-            return mapped;
-      }
+      String mapped = getMappedName();
+      if (mapped != null)
+         return mapped;
       return getEjbName();
    }
 
@@ -615,8 +598,7 @@
    public String getContainerObjectNameJndiName()
    {
       boolean remote = false;
-      SessionBeanMetaData session = getOverridenMetaData();
-      if (session != null && session.getHome() != null)
+      if (getHome() != null)
          remote = true;
       return remote ? determineJndiName() : getLocalJndiName();
    }
@@ -836,11 +818,6 @@
          sessionType = joverride.sessionType;
       else if(soriginal != null && soriginal.getSessionType() != null)
          sessionType = soriginal.getSessionType();
-      // sessionType
-      if(joverride != null && joverride.sessionType != null)
-         sessionType = joverride.sessionType;
-      else if(soriginal != null && soriginal.getSessionType() != null)
-         sessionType = soriginal.getSessionType();
       // timeoutMethod
       if(joverride != null && joverride.timeoutMethod != null)
          timeoutMethod = joverride.timeoutMethod;