[jboss-cvs] JBossAS SVN: r66916 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: ejb/jboss and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-11-09 10:42:17 -0500 (Fri, 09 Nov 2007)
New Revision: 66916

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java
Log:
Make the cmp version checking more strict

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java	2007-11-09 15:06:44 UTC (rev 66915)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java	2007-11-09 15:42:17 UTC (rev 66916)
@@ -139,13 +139,19 @@
    }
 
    /**
-    * Is this CMP1x
+    * Is this CMP2x
     * 
     * @return true for version 2.x
     */
    public boolean isCMP2x()
    {
-      return isCMP1x() == false;
+      JBossEntityBeanMetaData entity = getDelegate();
+      boolean isCMP2x = false;
+      if(entity.getCmpVersion() != null)
+         isCMP2x = entity.getCmpVersion().equals("2.x");
+      else
+         isCMP2x = entity.getEjbJarMetaData().isEJB2x();
+      return isCMP2x;
    }
 
    public boolean isBMP()

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-11-09 15:06:44 UTC (rev 66915)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2007-11-09 15:42:17 UTC (rev 66916)
@@ -312,7 +312,7 @@
    {
       if(cmpVersion == null)
       {
-         if(getEjbJarMetaData().isEJB2x())
+         if(getEjbJarMetaData().isEJB2x() || getEjbJarMetaData().isEJB3x())
             return false;
          else
             return true;

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java	2007-11-09 15:06:44 UTC (rev 66915)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java	2007-11-09 15:42:17 UTC (rev 66916)
@@ -28,7 +28,6 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
 import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
 import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
 import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
@@ -60,6 +59,7 @@
  * EnterpriseBean.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Scott.Stark at jboss.org
  * @version $Revision: 1.1 $
  */
 @JBossXmlModelGroup(

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java	2007-11-09 15:06:44 UTC (rev 66915)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EntityBeanMetaData.java	2007-11-09 15:42:17 UTC (rev 66916)
@@ -279,7 +279,7 @@
    {
       if(cmpVersion == null)
       {
-         if(getEjbJarMetaData().isEJB2x())
+         if(getEjbJarMetaData().isEJB2x() || getEjbJarMetaData().isEJB3x())
             return false;
          else
             return true;