[jboss-cvs] JBossAS SVN: r74451 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-06-11 23:30:01 -0400 (Wed, 11 Jun 2008)
New Revision: 74451

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
JBMETA-55, add missing overrides that should be redirected to primary/defaults wrapped metadata


Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2008-06-12 03:27:39 UTC (rev 74450)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2008-06-12 03:30:01 UTC (rev 74451)
@@ -22,8 +22,10 @@
 package org.jboss.metadata.ejb.jboss;
 
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
 import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
 import org.jboss.metadata.ejb.spec.RelationsMetaData;
+import org.jboss.metadata.javaee.jboss.RunAsIdentityMetaData;
 import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
 
 /**
@@ -67,7 +69,7 @@
    public String getEjbClientJar()
    {
       String clientJar = primary.getEjbClientJar();
-      if(clientJar == null)
+      if(clientJar == null && defaults != null)
          clientJar = defaults.getEjbClientJar();
       return clientJar;
    }
@@ -76,7 +78,7 @@
    public InterceptorsMetaData getInterceptors()
    {
       InterceptorsMetaData interceptors = primary.getInterceptors();
-      if(interceptors == null)
+      if(interceptors == null && defaults != null)
          interceptors = defaults.getInterceptors();
       return interceptors;
    }
@@ -85,7 +87,7 @@
    public String getJaccContextID()
    {
       String jaccID = primary.getJaccContextID();
-      if(jaccID == null)
+      if(jaccID == null && defaults != null)
          jaccID = defaults.getJaccContextID();
       return jaccID;
    }
@@ -94,7 +96,7 @@
    public RelationsMetaData getRelationships()
    {
       RelationsMetaData relations = primary.getRelationships();
-      if(relations == null)
+      if(relations == null && defaults != null)
          relations = defaults.getRelationships();
       return relations;
    }
@@ -158,7 +160,7 @@
    public InvokerProxyBindingMetaData getInvokerProxyBinding(String name)
    {
       InvokerProxyBindingMetaData ipbmd = primary.getInvokerProxyBinding(name);
-      if(ipbmd == null)
+      if(ipbmd == null && defaults != null)
          ipbmd = defaults.getInvokerProxyBinding(name);
       return ipbmd;
    }
@@ -179,7 +181,7 @@
    public String getJmxName()
    {
       String jmxName = primary.getJmxName();
-      if(jmxName == null)
+      if(jmxName == null && defaults != null)
          jmxName = defaults.getJmxName();
       return jmxName;
    }
@@ -188,7 +190,7 @@
    public LoaderRepositoryMetaData getLoaderRepository()
    {
       LoaderRepositoryMetaData x = primary.getLoaderRepository();
-      if(x == null)
+      if(x == null && defaults != null)
          x = defaults.getLoaderRepository();
       return x;
    }
@@ -215,15 +217,59 @@
    public String getUnauthenticatedPrincipal()
    {
       String unauthenticatedPrincipal = primary.getUnauthenticatedPrincipal();
-      if (unauthenticatedPrincipal == null)
+      if (unauthenticatedPrincipal == null && defaults != null)
          unauthenticatedPrincipal = defaults.getUnauthenticatedPrincipal();
       return unauthenticatedPrincipal;
    }
 
+   
    @Override
+   public DeploymentSummary getDeploymentSummary()
+   {
+      DeploymentSummary summary = primary.getDeploymentSummary();
+      return summary;
+   }
+
+   @Override
+   public String getJndiBindingPolicy()
+   {
+      String policy = primary.getJndiBindingPolicy();
+      if(policy == null && defaults != null)
+         policy = defaults.getJndiBindingPolicy();
+      return policy;
+   }
+
+   @Override
+   public RunAsIdentityMetaData getRunAsIdentity(String ejbName)
+   {
+      RunAsIdentityMetaData runAs = primary.getRunAsIdentity(ejbName);
+      if(runAs == null && defaults != null)
+         runAs = defaults.getRunAsIdentity(ejbName);
+      return runAs;
+   }
+
+   @Override
+   public boolean isMetadataComplete()
+   {
+      return primary.isMetadataComplete();
+   }
+
+   @Override
+   public String getEjbVersion()
+   {
+      String ejbVersion = primary.getEjbVersion();
+      if(ejbVersion == null)
+         ejbVersion = defaults.getEjbVersion();
+      return ejbVersion;
+   }
+
+   @Override
    public String getVersion()
    {
-      return primary.getVersion();
+      String version = primary.getVersion();
+      if(version == null)
+         version = defaults.getVersion();
+      return version;
    }
 
    @Override

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2008-06-12 03:27:39 UTC (rev 74450)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2008-06-12 03:30:01 UTC (rev 74451)
@@ -540,6 +540,10 @@
       jbossMetaData.merge(null, specMetaData);
       JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
 
+      // Validate version info
+      assertEquals("2.1", specMetaData.getVersion());
+      assertEquals("2.1", wrapper.getEjbVersion());
+
       // Test the unified metadata
       InvokerProxyBindingsMetaData bindings = wrapper.getInvokerProxyBindings();
       JBossEnterpriseBeansMetaData beans = wrapper.getEnterpriseBeans();