[jboss-cvs] JBossAS SVN: r68911 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: javaee/support and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-01-12 03:30:52 -0500 (Sat, 12 Jan 2008)
New Revision: 68911

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptionGroup.java
Log:
JBMETA-1, use the getters to properly access the override data

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-01-12 07:14:06 UTC (rev 68910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-01-12 08:30:52 UTC (rev 68911)
@@ -1445,30 +1445,30 @@
          setMappedName(original.getMappedName());
 
       // transactionType
-      if(override != null && override.transactionType != null)
-         transactionType = override.transactionType;
+      if(override != null && override.getTransactionType() != null)
+         transactionType = override.getTransactionType();
       else if(original != null && original.getTransactionType() != null)
          transactionType = original.getTransactionType();
 
       if(override != null)
       {
-         if(override.aopDomainName != null)
-            setAopDomainName(override.aopDomainName);
-         if(override.configurationName != null)
-            setConfigurationName(override.configurationName);
-         if(override.annotations != null)
-            setAnnotations(override.annotations);
-         if(override.depends != null)
-            setDepends(override.depends);
-         setExceptionOnRollback(override.exceptionOnRollback);
-         if(override.ignoreDependency != null)
-            setIgnoreDependency(override.ignoreDependency);
-         if(override.invokers != null)
-            setInvokerBindings(override.invokers);
-         if(override.iorSecurityConfig != null)
-            setIorSecurityConfig(override.iorSecurityConfig);
-         if(override.securityProxy != null)
-            setSecurityProxy(override.securityProxy);
+         if(override.getAopDomainName() != null)
+            setAopDomainName(override.getAopDomainName());
+         if(override.getConfigurationName() != null)
+            setConfigurationName(override.getConfigurationName());
+         if(override.getAnnotations() != null)
+            setAnnotations(override.getAnnotations());
+         if(override.getDepends() != null)
+            setDepends(override.getDepends());
+         setExceptionOnRollback(override.isExceptionOnRollback());
+         if(override.getIgnoreDependency() != null)
+            setIgnoreDependency(override.getIgnoreDependency());
+         if(override.getInvokerBindings() != null)
+            setInvokerBindings(override.getInvokerBindings());
+         if(override.getIorSecurityConfig() != null)
+            setIorSecurityConfig(override.getIorSecurityConfig());
+         if(override.getSecurityProxy() != null)
+            setSecurityProxy(override.getSecurityProxy());
       }
 
       if(this.jndiEnvironmentRefsGroup == null)
@@ -1481,7 +1481,7 @@
          ResourceManagersMetaData resourceMgrsOverride = override.getJBossMetaData().getResourceManagers();
          if(resourceMgrsOverride != null)
             resourceMgrs = resourceMgrsOverride;
-         jenv = override.jndiEnvironmentRefsGroup;
+         jenv = (JBossEnvironmentRefsGroupMetaData) override.getJndiEnvironmentRefsGroup();
       }
       jndiEnvironmentRefsGroup.merge(jenv, env, resourceMgrs, overridenFile, overrideFile, mustOverride);
 

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptionGroup.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptionGroup.java	2008-01-12 07:14:06 UTC (rev 68910)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptionGroup.java	2008-01-12 08:30:52 UTC (rev 68911)
@@ -67,10 +67,10 @@
       super.merge(override, original);
       NamedMetaDataWithDescriptionGroup n0 = (NamedMetaDataWithDescriptionGroup) override;
       NamedMetaDataWithDescriptionGroup n1 = (NamedMetaDataWithDescriptionGroup) original;
-      if(n0 != null && n0.descriptionGroup != null)
-         setDescriptionGroup(n0.descriptionGroup);
-      else if(n1 != null && n1.descriptionGroup != null)
-         setDescriptionGroup(n1.descriptionGroup);
+      if(n0 != null && n0.getDescriptionGroup() != null)
+         setDescriptionGroup(n0.getDescriptionGroup());
+      else if(n1 != null && n1.getDescriptionGroup() != null)
+         setDescriptionGroup(n1.getDescriptionGroup());
    }
 
 }