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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Oct 24 02:33:08 EDT 2007


Author: scott.stark at jboss.org
Date: 2007-10-24 02:33:07 -0400 (Wed, 24 Oct 2007)
New Revision: 66372

Removed:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptionGroupWithOverride.java
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ApplicationMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
Log:
Remove the override notion from the jboss metadata

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ApplicationMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ApplicationMetaData.java	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ApplicationMetaData.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -60,7 +60,7 @@
  * @version $Revision: 44877 $
  */
 @Deprecated
-public class ApplicationMetaData extends OldMetaDataWithOverride<JBossMetaData, EjbJarMetaData>
+public class ApplicationMetaData extends OldMetaData<JBossMetaData>
 {
    /** EJB1.x */
    @Deprecated 
@@ -80,7 +80,7 @@
    private static JBossMetaData wrap(EjbJarMetaData delegate)
    {
       JBossMetaData jbossMetaData = new JBossMetaData();
-      jbossMetaData.setOverridenMetaData(delegate);
+      //jbossMetaData.setOverridenMetaData(delegate);
       jbossMetaData.merge(null, delegate);
       return jbossMetaData;
    }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -26,10 +26,12 @@
 import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
 import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
+import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.spec.RelationsMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroupWithOverride;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
 import org.jboss.xb.annotations.JBossXmlCollection;
 import org.jboss.logging.Logger;
 
@@ -44,7 +46,7 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision: 1.1 $
  */
-public class JBossMetaData extends IdMetaDataImplWithDescriptionGroupWithOverride<org.jboss.metadata.ejb.spec.EjbJarMetaData>
+public class JBossMetaData extends IdMetaDataImplWithDescriptionGroup
    implements IEjbJarMetaData<JBossEnterpriseBeanMetaData>
 {
    /** The serialVersionUID */
@@ -58,7 +60,15 @@
    private String dtdSystemId;
    /** The version */
    private String version;
+   /** The ejb jar version */
+   private String ejbVersion;
 
+   /** The ejb client jar */
+   private String ejbClientJar;
+
+   /** The relations */
+   private RelationsMetaData relationships;
+
    /** The loader repository */
    private LoaderRepositoryMetaData loaderRepository;
 
@@ -187,39 +197,40 @@
 
    public String getEjbClientJar()
    {
-      return null;
+      return this.ejbClientJar;
    }
    public void setEjbClientJar(String ejbClientJar)
    {
+      this.ejbClientJar = ejbClientJar;
    }
 
    public RelationsMetaData getRelationships()
    {
-      return this.getOverridenMetaData().getRelationships();
+      return this.relationships;
    }
-   @XmlTransient
    public void setRelationships(RelationsMetaData relationships)
-   {      
+   {
+      this.relationships = relationships;
    }
 
    public boolean isEJB1x()
    {
-      return this.getOverridenMetaData().isEJB1x();
+      return ejbVersion != null && ejbVersion.contains("1.");
    }
 
    public boolean isEJB21()
    {
-      return this.getOverridenMetaData().isEJB21();
+      return ejbVersion != null && ejbVersion.contains("2.1");
    }
 
    public boolean isEJB2x()
    {
-      return this.getOverridenMetaData().isEJB2x();
+      return ejbVersion != null && ejbVersion.contains("2.");
    }
 
    public boolean isEJB3x()
    {
-      return this.getOverridenMetaData().isEJB3x();
+      return ejbVersion != null && ejbVersion.contains("3.");
    }
 
    /**
@@ -588,6 +599,8 @@
       if(this.webservices == null)
          webservices = new WebservicesMetaData();
 
+      if(original != null)
+         this.ejbVersion = original.getVersion();
       if(override != null && override.assemblyDescriptor != null)
       {
          assemblyDescriptor.merge(override.assemblyDescriptor, original.getAssemblyDescriptor());

Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptionGroupWithOverride.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptionGroupWithOverride.java	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptionGroupWithOverride.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.javaee.support;
-
-import javax.xml.bind.annotation.XmlTransient;
-
-
-/**
- * IdMetaDataImplWithDescriptionGroup.
- *
- * @param <T> the overriden type
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public abstract class IdMetaDataImplWithDescriptionGroupWithOverride<T> extends IdMetaDataImplWithDescriptionGroup implements OverrideMetaData<T>
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7273605180933967019L;
-   
-   /** The overriden metadata */
-   private T data;
-   
-   public T getOverridenMetaData()
-   {
-      return data;
-   }
-   
-   /**
-    * Get the override metadata
-    * 
-    * @return the data
-    * @throws IllegalStateException when not set
-    */
-   protected T getOverridenMetaDataWithCheck()
-   {
-      if (data == null)
-         throw new IllegalStateException("Override metadata has not been set " + this);
-      return data;
-   }
-
-   //@SchemaProperty(ignore=true)
-   @XmlTransient
-   public void setOverridenMetaData(T data)
-   {
-      if (data == null)
-         throw new IllegalArgumentException("Null data");
-      this.data = data;
-   }
-}

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -45,8 +45,6 @@
    {
       JBossMetaData merged = new JBossMetaData();
       merged.merge(jboss, spec);
-      if(spec != null)
-         merged.setOverridenMetaData(spec);
       return merged;
    }
    

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -103,7 +103,7 @@
    public void assertEverythingWithAppMetaData(EjbJar2xMetaData ejbJarMetaData)
    {
       JBossMetaData jbossMetaData = new JBossMetaData();
-      jbossMetaData.setOverridenMetaData(ejbJarMetaData);
+      //jbossMetaData.setOverridenMetaData(ejbJarMetaData);
       jbossMetaData = MergeUtil.merge(jbossMetaData, ejbJarMetaData);
       ApplicationMetaData applicationMetaData = new ApplicationMetaData(jbossMetaData); 
       assertVersion(ejbJarMetaData);

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	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -312,7 +312,8 @@
       JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
       long end3 = System.currentTimeMillis();
       getLog().info("JBoss5xEverything_testEverything.xml parse time = "+(end3 - end2));
-      jbossMetaData.setOverridenMetaData(specMetaData);
+      //jbossMetaData.setOverridenMetaData(specMetaData);
+      jbossMetaData.merge(null, specMetaData);
       JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
 
       // Test the unified metadata

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2007-10-24 05:55:27 UTC (rev 66371)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2007-10-24 06:33:07 UTC (rev 66372)
@@ -267,41 +267,9 @@
          assertInvokerProxyBindings(jbossMetaData.getInvokerProxyBindings());
       assertInvokerProxyBinding("invokerProxyBinding1", 1, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name"));
       assertInvokerProxyBinding("invokerProxyBinding2", 2, jbossMetaData.getInvokerProxyBinding("invokerProxyBinding2Name"));
-      int dummyConfigs = fixUpContainerConfigurations(jbossMetaData);
-      if (hasStandardJBoss)
-         assertEquals("There should be no dummy configs", 0, dummyConfigs);
       assertContainerConfigurations(jbossMetaData);
-
-      fixUpEjbJar(jbossMetaData);
-      //ApplicationMetaData application = new ApplicationMetaData(jbossMetaData);
-      //assertEquals("jboss-jmx-name", application.getJmxName());
-      //assertEquals("jboss-security-domain", application.getSecurityDomain());
-      //assertFalse(application.isExcludeMissingMethods());
-      //assertEquals("jboss-unauthenticated-principal", application.getUnauthenticatedPrincipal());
-      //assertTrue(application.getExceptionRollback());
-      //assertWebservices(application);
-      fixUpEnterpriseBeans(jbossMetaData);
-      //assertJBossEnterpriseBeans(application);
-      fixUpAssemblyDescriptor(jbossMetaData);
-      //assertAssemblyDescriptor(application);
-      //assertEquals("resourceManager1JndiName", application.getResourceByName("resourceManager1Name"));
-      //assertEquals("resourceManager2URL", application.getResourceByName("resourceManager2Name"));
-      //assertInvokerProxyBindings(application.getInvokerProxyBindings());
-      //assertInvokerProxyBinding("invokerProxyBinding1", application.getInvokerProxyBindingMetaDataByName("invokerProxyBinding1Name"));
-      //assertInvokerProxyBinding("invokerProxyBinding2", application.getInvokerProxyBindingMetaDataByName("invokerProxyBinding2Name"));
-      //assertContainerConfigurations(application);
    }
-   
-   private void fixUpEjbJar(JBossMetaData jbossMetaData)
-   {
-      EjbJarMetaData ejbJarMetaData = jbossMetaData.getOverridenMetaData();
-      if (ejbJarMetaData == null)
-      {
-         ejbJarMetaData = new EjbJar30MetaData();
-         jbossMetaData.setOverridenMetaData(ejbJarMetaData);
-      }
-   }
-   
+
    private void assertVersion(JBossMetaData jbossMetaData)
    {
       assertEquals("5.0", jbossMetaData.getVersion());
@@ -392,74 +360,6 @@
       assertFullMessageDrivenBean("mdb2", jbossMetaData, false);
    }
    
-   private void fixUpEnterpriseBeans(JBossMetaData jbossMetaData)
-   {
-      EjbJarMetaData ejbJarMetaData = jbossMetaData.getOverridenMetaData();
-      assertNotNull(ejbJarMetaData);
-
-      IEnterpriseBeansMetaData<EnterpriseBeanMetaData> enterpriseBeansMetaData = ejbJarMetaData.getEnterpriseBeans();
-      if (enterpriseBeansMetaData == null)
-      {
-         enterpriseBeansMetaData = new EnterpriseBeansMetaData();
-         ejbJarMetaData.setEnterpriseBeans(enterpriseBeansMetaData);
-      }
-
-      IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> jbossEnterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
-      for (JBossEnterpriseBeanMetaData jbossEnterpriseBeanMetaData : jbossEnterpriseBeansMetaData)
-      {
-         JBossEnterpriseBeanMetaData jbean = (JBossEnterpriseBeanMetaData) jbossEnterpriseBeanMetaData;
-         String name = jbossEnterpriseBeanMetaData.getEjbName();
-         if (enterpriseBeansMetaData.get(name) == null)
-         {
-            EnterpriseBeanMetaData enterpriseBeanMetaData = null;
-            if (jbossEnterpriseBeanMetaData instanceof JBossSessionBeanMetaData)
-               enterpriseBeanMetaData = new SessionBeanMetaData();
-            else if (jbossEnterpriseBeanMetaData instanceof JBossEntityBeanMetaData)
-               enterpriseBeanMetaData = new EntityBeanMetaData();
-            else if (jbossEnterpriseBeanMetaData instanceof JBossMessageDrivenBeanMetaData)
-               enterpriseBeanMetaData = new MessageDrivenBeanMetaData();
-            enterpriseBeanMetaData.setEjbName(name);
-            jbean.setOverridenMetaData(enterpriseBeanMetaData);
-            enterpriseBeansMetaData.add(enterpriseBeanMetaData);
-         }
-      }
-      
-      for (IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> enterpriseBean : jbossMetaData.getEnterpriseBeans())
-         fixUpEnterpriseBean(enterpriseBean);
-   }
-   
-/*   private void assertJBossEnterpriseBeans(ApplicationMetaData application)
-   {
-      Iterator<BeanMetaData> beans = application.getEnterpriseBeans();
-      assertNotNull(beans);
-      int count = 0;
-      while (beans.hasNext())
-      {
-         beans.next();
-         ++count;
-      }
-      assertEquals(9, count);
-      
-      assertNullSessionBean("session0", application);
-      assertFullSessionBean("session1", application, true);
-      assertFullSessionBean("session2", application, false);
-
-      assertNullEntityBean("entity0", application);
-      assertFullEntityBean("entity1", application, true);
-      assertFullEntityBean("entity2", application, false);
-
-      assertNullMessageDrivenBean("mdb0", application);
-      assertFullMessageDrivenBean("mdb1", application, true);
-      assertFullMessageDrivenBean("mdb2", application, false);
-   }
-*/   
-   private void fixUpEnterpriseBean(IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> jbossEjb)
-   {
-      JBossEnterpriseBeanMetaData jbean = (JBossEnterpriseBeanMetaData) jbossEjb;
-      EnterpriseBeanMetaData ejb = jbean.getOverridenMetaData();
-      fixUpEnvironment(ejb, jbean);
-   }
-   
    private <T extends JBossEnterpriseBeanMetaData> T assertJBossEnterpriseBean(String prefix, JBossMetaData jBossMetaData, Class<T> expected)
    {
       IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> ejb = jBossMetaData.getEnterpriseBean(prefix + "EjbName");
@@ -907,78 +807,6 @@
       assertNull(mdb.getJndiRefs());
    }
 
-   /**
-    * Add dummy configurations refenced by the testEverything.xml descriptor
-    * @param jbossMetaData
-    * @return the number of dummy configs added
-    */
-   private int fixUpContainerConfigurations(JBossMetaData jbossMetaData)
-   {
-      ContainerConfigurationsMetaData configurations = jbossMetaData.getContainerConfigurations();
-      assertNotNull(configurations);
-      int fixCount = 0;
-
-      if (fixUpContainerConfiguration(ContainerConfigurationMetaData.STATELESS, configurations) )
-      {
-         getLog().debug("Added dummy config: "+ContainerConfigurationMetaData.STATELESS);
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration(ContainerConfigurationMetaData.CMP_2x, configurations) )
-      {
-         getLog().debug("Added dummy config: "+ContainerConfigurationMetaData.CMP_2x);
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration(ContainerConfigurationMetaData.MESSAGE_INFLOW_DRIVEN, configurations) )
-      {
-         getLog().debug("Added dummy config: "+ContainerConfigurationMetaData.MESSAGE_INFLOW_DRIVEN);
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration("session1ConfigurationName", configurations) )
-      {
-         getLog().debug("Added dummy config: "+"session1ConfigurationName");
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration("session2ConfigurationName", configurations) )
-      {
-         getLog().debug("Added dummy config: "+"session2ConfigurationName");
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration("entity1ConfigurationName", configurations) )
-      {
-         getLog().debug("Added dummy config: "+"entity1ConfigurationName");
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration("entity2ConfigurationName", configurations) )
-      {
-         getLog().debug("Added dummy config: "+"entity2ConfigurationName");
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration("mdb1ConfigurationName", configurations) )
-      {
-         getLog().debug("Added dummy config: "+"mdb1ConfigurationName");
-         fixCount ++;
-      }
-      if (fixUpContainerConfiguration("mdb2ConfigurationName", configurations) )
-      {
-         getLog().debug("Added dummy config: "+"mdb2ConfigurationName");
-         fixCount ++;
-      }
-      return fixCount;
-   }
-
-   private boolean fixUpContainerConfiguration(String name, ContainerConfigurationsMetaData configurations)
-   {
-      boolean added = false;
-      if (configurations.get(name) == null)
-      {
-         ContainerConfigurationMetaData configuration = new ContainerConfigurationMetaData();
-         configuration.setName(name);
-         configurations.add(configuration);
-         added = true;
-      }
-      return added;
-   }
-   
    private void assertContainerConfigurations(JBossMetaData jbossMetaData)
    {
       ContainerConfigurationsMetaData configurations = jbossMetaData.getContainerConfigurations();
@@ -994,26 +822,6 @@
       assertEquals(CommitOption.C, configuration.getCommitOption());
    }
    
-/*   private void assertContainerConfigurations(ApplicationMetaData application)
-   {
-      Iterator<ConfigurationMetaData> configurations = application.getConfigurations();
-      assertNotNull(configurations);
-      int count = 0;
-      while (configurations.hasNext())
-      {
-         configurations.next();
-         ++count;
-      }
-      assertEquals(14, count);
-      assertNullContainerConfiguration("containerConfiguration0", application);
-      assertFullContainerConfiguration("containerConfiguration1", application, true);
-      assertFullContainerConfiguration("containerConfiguration2", application, false);
-      ConfigurationMetaData configuration = assertContainerConfiguration("containerConfiguration3", application);
-      assertEquals(ConfigurationMetaData.B_COMMIT_OPTION, configuration.getCommitOption());
-      configuration = assertContainerConfiguration("containerConfiguration4", application);
-      assertEquals(ConfigurationMetaData.C_COMMIT_OPTION, configuration.getCommitOption());
-   }
-*/   
    private ContainerConfigurationMetaData assertContainerConfiguration(String prefix, JBossMetaData jBossMetaData)
    {
       ContainerConfigurationMetaData configuration = jBossMetaData.getContainerConfiguration(prefix + "Name");
@@ -1325,28 +1133,6 @@
       assertMessageDestinations(2, assemblyDescriptorMetaData.getMessageDestinations());
    }
    
-   protected void fixUpAssemblyDescriptor(JBossMetaData jbossMetaData)
-   {
-      EjbJarMetaData ejbJarMetaData = jbossMetaData.getOverridenMetaData();
-      assertNotNull(ejbJarMetaData);
-      IAssemblyDescriptorMetaData assemblyDescriptorMetaData = ejbJarMetaData.getAssemblyDescriptor();
-      if (assemblyDescriptorMetaData == null)
-      {
-         assemblyDescriptorMetaData = new AssemblyDescriptorMetaData();
-         ejbJarMetaData.setAssemblyDescriptor(assemblyDescriptorMetaData);
-      }
-   }
-
-
-/*   protected void assertAssemblyDescriptor(ApplicationMetaData applicationMetaData)
-   {
-      org.jboss.metadata.AssemblyDescriptorMetaData assemblyDescriptorMetaData = applicationMetaData.getAssemblyDescriptor();
-      assertNotNull(assemblyDescriptorMetaData);
-      assertSecurityRoles(2, assemblyDescriptorMetaData.getSecurityRoles());
-      assertMessageDestination("messageDestination1", assemblyDescriptorMetaData.getMessageDestinationMetaData("messageDestination1Name"));
-      assertMessageDestination("messageDestination2", assemblyDescriptorMetaData.getMessageDestinationMetaData("messageDestination2Name"));
-   }
-*/
    @Override
    protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData)
    {
@@ -1367,21 +1153,6 @@
       assertEquals(prefix + "JndiName", messageDestinationMetaData.getMappedName());
    }
 
-   protected void fixUpEnvironment(EnterpriseBeanMetaData ejb, JBossEnterpriseBeanMetaData jbossEjb)
-   {
-      Environment jbossEjbEnvironment = jbossEjb.getJndiEnvironmentRefsGroup();
-      if (jbossEjbEnvironment == null)
-         return;
-
-      Environment ejbEnvironment = ejb.getJndiEnvironmentRefsGroup();
-      if (ejbEnvironment == null)
-      {
-         ejbEnvironment = new EnvironmentRefsGroupMetaData();
-         ejb.setJndiEnvironmentRefsGroup(ejbEnvironment);
-      }
-
-   }
-   
    @Override
    protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first)
    {




More information about the jboss-cvs-commits mailing list