[jboss-cvs] JBossAS SVN: r58361 - in trunk/server/src/main/org/jboss: deployment metadata

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

Author: alex.loubyansky at jboss.com
Date: 2006-11-14 17:53:34 -0500 (Tue, 14 Nov 2006)
New Revision: 58361

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/EntityMetaData.java
Log:
set cmp1.x version on entity metadata when it's cmp and the dd is ejb1

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-14 22:52:58 UTC (rev 58360)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-14 22:53:34 UTC (rev 58361)
@@ -322,6 +322,10 @@
    public void addChild(ApplicationMetaData parent, EntityMetaData entity,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
+      if(parent.isEJB1x() && entity.isCMP())
+      {
+         entity.setCmpVersion(1);
+      }
       parent.addBeanMetaData(entity);
    }
 

Modified: trunk/server/src/main/org/jboss/metadata/EntityMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/EntityMetaData.java	2006-11-14 22:52:58 UTC (rev 58360)
+++ trunk/server/src/main/org/jboss/metadata/EntityMetaData.java	2006-11-14 22:53:34 UTC (rev 58361)
@@ -86,6 +86,11 @@
       return cmp;
    }
 
+   public void setCmp(boolean cmp)
+   {
+      this.cmp = cmp;
+   }
+
    public boolean isCMP1x()
    {
       return cmp && (cmpVersion==1);
@@ -123,16 +128,6 @@
       this.cacheInvalidConfig = cacheInvalidConfig;
    }
 
-   public boolean isCmp()
-   {
-      return cmp;
-   }
-
-   public void setCmp(boolean cmp)
-   {
-      this.cmp = cmp;
-   }
-
    public ArrayList<String> getCmpFields()
    {
       return cmpFields;