[jboss-cvs] JBossAS SVN: r80964 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/binding and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Nov 13 17:55:05 EST 2008


Author: alex.loubyansky at jboss.com
Date: 2008-11-13 17:55:05 -0500 (Thu, 13 Nov 2008)
New Revision: 80964

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.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/EjbJar3xEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.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
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbthreeCacheInvalidationConfig.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigBase.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigOverride.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml
Log:
JBMETA-139 keeping jboss_5_0.dtd free from ejb3.x stuff and jboss_5_0.xsd free from ejb2.x legacy

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50MetaData.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -21,6 +21,9 @@
 */
 package org.jboss.metadata.ejb.jboss;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -60,4 +63,24 @@
    {
       // For serialization
    }
+   
+   @Override
+   @XmlElementWrapper(name="enterprise-beans")
+   @XmlElements({
+      @XmlElement(name="session", type=JBossSessionBeanJBoss50MetaData.class),
+      @XmlElement(name="message-driven", type=JBossMessageDrivenBeanJBoss50MetaData.class),
+      @XmlElement(name="consumer", type=JBossConsumerBeanMetaData.class),
+      @XmlElement(name="ejb", type=JBossGenericBeanMetaData.class),
+      @XmlElement(name="service", type=JBossServiceBeanMetaData.class)
+      })
+   public JBossEnterpriseBeansMetaData getEnterpriseBeans()
+   {
+      return super.getEnterpriseBeans();
+   }
+   
+   @Override
+   public void setEnterpriseBeans(JBossEnterpriseBeansMetaData beans)
+   {
+      super.setEnterpriseBeans(beans);
+   }
 }

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-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -97,6 +97,7 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
+/*
 @JBossXmlModelGroup(
       kind=JBossXmlConstants.MODEL_GROUP_CHOICE,
       particles={
@@ -106,6 +107,7 @@
             @JBossXmlModelGroup.Particle(element=@XmlElement(name="consumer"), type=JBossConsumerBeanMetaData.class),
             @JBossXmlModelGroup.Particle(element=@XmlElement(name="ejb"), type=JBossGenericBeanMetaData.class),
             @JBossXmlModelGroup.Particle(element=@XmlElement(name="service"), type=JBossServiceBeanMetaData.class)})
+            */
 public abstract class JBossEnterpriseBeanMetaData extends NamedMetaDataWithDescriptionGroup
    implements Environment,
    IEnterpriseBeanMetaData<JBossAssemblyDescriptorMetaData, JBossEnterpriseBeansMetaData, JBossEnterpriseBeanMetaData, JBossMetaData>

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -40,7 +40,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at XmlType(name="enterprise-beansType")
+//@XmlType(name="enterprise-beansType")
 public class JBossEnterpriseBeansMetaData
    extends EnterpriseBeansMap<JBossAssemblyDescriptorMetaData, JBossEnterpriseBeansMetaData, JBossEnterpriseBeanMetaData, JBossMetaData>
 {

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -0,0 +1,34 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, 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.ejb.jboss;
+
+/**
+ * A JBossMessageDrivenBeanJBoss50MetaData.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class JBossMessageDrivenBeanJBoss50MetaData extends JBossMessageDrivenBeanMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 7103348979383633314L;
+}


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanJBoss50MetaData.java
___________________________________________________________________
Name: svn:executable
   + *

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	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -27,6 +27,8 @@
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.logging.Logger;
@@ -441,7 +443,14 @@
     * @param enterpriseBeans the enterpriseBeans.
     * @throws IllegalArgumentException for a null enterpriseBeans
     */
-   @XmlElement(name="enterprise-beans")
+   //@XmlElement(name="enterprise-beans")
+   @XmlElementWrapper(name="enterprise-beans")
+   @XmlElements({
+      @XmlElement(name="session", type=JBossSessionBeanMetaData.class),
+      @XmlElement(name="entity", type=JBossEntityBeanMetaData.class),
+      @XmlElement(name="message-driven", type=JBossMessageDrivenBeanMetaData.class),
+      @XmlElement(name="ejb", type=JBossGenericBeanMetaData.class)
+      })
    public void setEnterpriseBeans(JBossEnterpriseBeansMetaData enterpriseBeans)
    {
       if (enterpriseBeans == null)

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -0,0 +1,43 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, 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.ejb.jboss;
+
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A JBossSessionBeanJBoss50MetaData.
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "jndiEnvironmentRefsGroup",
+      "securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes", 
+      "jndiName", "homeJndiName", "callByValue",
+      "exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
+      "localHomeJndiName", "jndiBindingPolicy", "clustered",
+      "clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
+      "cacheConfig", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity", "iorSecurityConfig"})
+public class JBossSessionBeanJBoss50MetaData extends JBossSessionBeanMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 29928077451682118L;
+}


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanJBoss50MetaData.java
___________________________________________________________________
Name: svn:executable
   + *

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -90,6 +90,8 @@
       IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "message-driven-beanType"));
       IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "consumer-beanType"));
       // entity type is missing
+      // actually enterprise-beansType is missing because XmlElements binding specified on enterpriseBeans
+      // is bound as local type (specifying XmlType on JBossEnterpriseBeansMetaData breaks XmlElements' choice)
       IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "enterprise-beansType"));
    }
    
@@ -177,6 +179,9 @@
             continue;
 
          QName typeQName = new QName(xsType.getNamespace(), xsType.getName());
+         if(IGNORED_TYPES.contains(typeQName))
+            continue;
+            
          TypeBinding typeBinding = schemaBinding.getType(typeQName);
          if (typeBinding == null)
          {

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -68,7 +68,7 @@
       int count = 1;
       for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
       {
-         assertMessageDestination14(prefix + count, messageDestinationMetaData);
+         assertMessageDestination14(prefix + count, messageDestinationMetaData, Mode.SPEC);
          count++;
       }
    }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -61,7 +61,7 @@
       int count = 1;
       for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
       {
-         assertMessageDestination50(prefix + count, messageDestinationMetaData);
+         assertMessageDestination50(prefix + count, messageDestinationMetaData, Mode.SPEC);
          count++;
       }
    }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -56,7 +56,7 @@
       int count = 1;
       for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
       {
-         assertMessageDestination50(prefix + count, messageDestinationMetaData);
+         assertMessageDestination50(prefix + count, messageDestinationMetaData, Mode.SPEC);
          count++;
       }
    }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -713,10 +713,10 @@
       AssemblyDescriptorMetaData assemblyDescriptorMetaData = (AssemblyDescriptorMetaData) ejbJarMetaData.getAssemblyDescriptor();
       assertNotNull(assemblyDescriptorMetaData);
       assertId("assembly-descriptor", assemblyDescriptorMetaData);
-      assertSecurityRoles(2, assemblyDescriptorMetaData.getSecurityRoles());
+      assertSecurityRoles(2, assemblyDescriptorMetaData.getSecurityRoles(), Mode.SPEC);
       assertMethodPermissions(null, "methodPermission", 21, 3, assemblyDescriptorMetaData.getMethodPermissions());
       assertContainerTransactions(null, 42, 6, assemblyDescriptorMetaData.getContainerTransactions());
-      assertMessageDestinations(2, assemblyDescriptorMetaData.getMessageDestinations());
+      assertMessageDestinations(2, assemblyDescriptorMetaData.getMessageDestinations(), Mode.SPEC);
       assertExcludeList(null, 35, 5, assemblyDescriptorMetaData.getExcludeList());
       return assemblyDescriptorMetaData;
    }
@@ -1050,12 +1050,15 @@
       assertEmptyIterator(bean.getMessageDestinationReferences());
    }
    
-   protected void assertSecurityIdentity(String ejbName, String type, SecurityIdentityMetaData securityIdentity, boolean full)
+   protected void assertSecurityIdentity(String ejbName, String type, SecurityIdentityMetaData securityIdentity, boolean full, Mode mode)
    {
       assertNotNull(ejbName, securityIdentity);
       String prefix = ejbName + type;
-      assertId(prefix, securityIdentity);
-      assertDescriptions(prefix, securityIdentity.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, securityIdentity);
+         assertDescriptions(prefix, securityIdentity.getDescriptions());
+      }
       if (full)
       {
          assertRunAs(ejbName, type, securityIdentity.getRunAs());
@@ -1111,12 +1114,15 @@
       assertEquals(ejbName, size, count-1);
    }
 
-   protected void assertClusterConfig(String prefix, ClusterConfigMetaData clusterConfig, boolean isSession)
+   protected void assertClusterConfig(String prefix, ClusterConfigMetaData clusterConfig, boolean isSession, Mode mode)
    {
       assertNotNull(clusterConfig);
       prefix = prefix + "ClusterConfig";
-      assertId(prefix, clusterConfig);
-      assertDescriptions(prefix, clusterConfig.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, clusterConfig);
+         assertDescriptions(prefix, clusterConfig.getDescriptions());
+      }
       assertEquals(prefix + "PartitionName", clusterConfig.getPartitionName());
       assertEquals(prefix + "HomeLoadBalancePolicy", clusterConfig.getHomeLoadBalancePolicy());
       assertEquals(prefix + "BeanLoadBalancePolicy", clusterConfig.getBeanLoadBalancePolicy());
@@ -1135,12 +1141,15 @@
          assertEquals(prefix + "SessionStateManagerJndiName", clusterConfig.getHaSessionStateName());
    }
 
-   protected void assertCacheInvalidationConfig(String prefix, CacheInvalidationConfigMetaData invalidationConfig)
+   protected void assertCacheInvalidationConfig(String prefix, CacheInvalidationConfigMetaData invalidationConfig, Mode mode)
    {
       assertNotNull(invalidationConfig);
       prefix = prefix + "CacheInvalidationConfig";
-      assertId(prefix, invalidationConfig);
-      assertDescriptions(prefix, invalidationConfig.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, invalidationConfig);
+         assertDescriptions(prefix, invalidationConfig.getDescriptions());
+      }
       assertEquals(prefix + "InvalidationGroupName", invalidationConfig.getInvalidationGroupName());
       assertEquals(prefix + "InvalidationManagerName", invalidationConfig.getInvalidationManagerName());
    }
@@ -1153,25 +1162,31 @@
       assertEquals(prefix + "InvalidationManagerName", invalidationConfig.getInvalidationManagerName());
    }
 
-   protected void assertIORSecurityConfig(String ejbName, IORSecurityConfigMetaData iorSecurityConfig)
+   protected void assertIORSecurityConfig(String ejbName, IORSecurityConfigMetaData iorSecurityConfig, Mode mode)
    {
       assertNotNull(iorSecurityConfig);
       String prefix = ejbName + "IorSecurityConfig";
-      assertId(prefix, iorSecurityConfig);
-      assertDescriptions(prefix, iorSecurityConfig.getDescriptions());
-      assertIORTransportConfig(ejbName, iorSecurityConfig.getTransportConfig());
-      assertIORASContext(ejbName, iorSecurityConfig.getAsContext());
-      assertIORSASContext(ejbName, iorSecurityConfig.getSasContext());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, iorSecurityConfig);
+         assertDescriptions(prefix, iorSecurityConfig.getDescriptions());
+      }
+      assertIORTransportConfig(ejbName, iorSecurityConfig.getTransportConfig(), mode);
+      assertIORASContext(ejbName, iorSecurityConfig.getAsContext(), mode);
+      assertIORSASContext(ejbName, iorSecurityConfig.getSasContext(), mode);
    }
-   protected void assertPortComponent(String prefix, PortComponent portComponent)
+   protected void assertPortComponent(String prefix, PortComponent portComponent, Mode mode)
    {
       assertNotNull(portComponent);
-      assertId(prefix+"PortComponent", portComponent);
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix+"PortComponent", portComponent);
+         assertEquals(true, portComponent.getSecureWSDLAccess());
+      }
       assertEquals(prefix+"-PortComponent", portComponent.getPortComponentName());
       assertEquals("/"+prefix+"/PortComponentURI", portComponent.getPortComponentURI());
       assertEquals("BASIC", portComponent.getAuthMethod());
       assertEquals("NONE", portComponent.getTransportGuarantee());
-      assertEquals(true, portComponent.getSecureWSDLAccess());
    }
    protected void assertIORSecurityConfig(String ejbName, IorSecurityConfigMetaData iorSecurityConfig)
    {
@@ -1181,12 +1196,15 @@
       assertIORSASContext(ejbName, iorSecurityConfig.getSasContext());
    }
 
-   protected void assertIORTransportConfig(String ejbName, IORTransportConfigMetaData iorTransportConfig)
+   protected void assertIORTransportConfig(String ejbName, IORTransportConfigMetaData iorTransportConfig, Mode mode)
    {
       assertNotNull(iorTransportConfig);
       String prefix = ejbName + "TransportConfig";
-      assertId(prefix, iorTransportConfig);
-      assertDescriptions(prefix, iorTransportConfig.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, iorTransportConfig);
+         assertDescriptions(prefix, iorTransportConfig.getDescriptions());
+      }
       assertEquals(IORTransportConfigMetaData.INTEGRITY_NONE, iorTransportConfig.getIntegrity());
       assertEquals(IORTransportConfigMetaData.CONFIDENTIALITY_NONE, iorTransportConfig.getConfidentiality());
       assertEquals(IORTransportConfigMetaData.ESTABLISH_TRUST_IN_TARGET_NONE, iorTransportConfig.getEstablishTrustInTarget());
@@ -1206,12 +1224,15 @@
       assertEquals(IORTransportConfigMetaData.DETECT_REPLAY_NONE, iorTransportConfig.getDetectReplay());
    }
 
-   protected void assertIORASContext(String ejbName, IORASContextMetaData asContext)
+   protected void assertIORASContext(String ejbName, IORASContextMetaData asContext, Mode mode)
    {
       assertNotNull(asContext);
       String prefix = ejbName + "ASContext";
-      assertId(prefix, asContext);
-      assertDescriptions(prefix, asContext.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, asContext);
+         assertDescriptions(prefix, asContext.getDescriptions());
+      }
       assertEquals(IORASContextMetaData.AUTH_METHOD_USERNAME_PASSWORD, asContext.getAuthMethod());
       assertEquals(prefix + "Realm", asContext.getRealm());
       assertFalse(asContext.isRequired());
@@ -1226,12 +1247,15 @@
       assertFalse(asContext.isRequired());
    }
 
-   protected void assertIORSASContext(String ejbName, IORSASContextMetaData sasContext)
+   protected void assertIORSASContext(String ejbName, IORSASContextMetaData sasContext, Mode mode)
    {
       assertNotNull(sasContext);
       String prefix = ejbName + "SASContext";
-      assertId(prefix, sasContext);
-      assertDescriptions(prefix, sasContext.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix, sasContext);
+         assertDescriptions(prefix, sasContext.getDescriptions());
+      }
       assertEquals(IORSASContextMetaData.CALLER_PROPAGATION_NONE, sasContext.getCallerPropagation());
    }
 
@@ -1272,12 +1296,13 @@
       }
    }
    
-   protected void assertMethodAttributes(String ejbName, MethodAttributesMetaData methodAttributes)
+   protected void assertMethodAttributes(String ejbName, MethodAttributesMetaData methodAttributes, Mode mode)
    {
       assertNotNull(ejbName, methodAttributes);
       assertEquals(2, methodAttributes.size());
       String prefix = ejbName + "MethodAttributes";
-      assertId(prefix, methodAttributes);
+      if(mode == Mode.JBOSS)
+         assertId(prefix, methodAttributes);
       int count = 1;
       for (MethodAttributeMetaData methodAttribute : methodAttributes)
       {

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -70,7 +70,7 @@
       resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
       resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
-      resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+      resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
       return resolver;
    }

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	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -160,7 +160,7 @@
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, session.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true, mode);
    }
    public void assertFullSessionBean(String ejbName, JBossSessionBeanMetaData session, Mode mode)
    {
@@ -178,7 +178,7 @@
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, session.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true, mode);
    }
    
    protected EntityBeanMetaData assertFullEntity(String ejbName, IEnterpriseBeansMetaData enterpriseBeansMetaData, Mode mode)
@@ -209,7 +209,7 @@
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, entity.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, entity.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, entity.getSecurityRoleRefs());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentity(), true, mode);
       assertQueries(ejbName, 3, entity.getQueries());
    }
 
@@ -268,7 +268,7 @@
       assertContainerTransactions(ejbName, 6, 6, mdb.getContainerTransactions());
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, mdb.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, mdb.getExcludeList());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", mdb.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", mdb.getSecurityIdentity(), true, mode);
       
       return mdb;
    }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -188,7 +188,7 @@
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, session.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true, mode);
    }
    public void assertFullSessionBean(String ejbName, JBossSessionBeanMetaData session, Mode mode)
    {
@@ -215,7 +215,7 @@
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, session.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, session.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true, mode);
    }
 
    private void assertInitMethods(String ejbName, int size, InitMethodsMetaData initMethodsMetaData)
@@ -273,7 +273,7 @@
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, entity.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, entity.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, entity.getSecurityRoleRefs());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentity(), true, mode);
       assertQueries(ejbName, 3, entity.getQueries());
       
       return entity;
@@ -336,7 +336,7 @@
       assertContainerTransactions(ejbName, 6, 6, mdb.getContainerTransactions());
       assertMethodPermissions(ejbName, ejbName + "MethodPermission", 3, 3, mdb.getMethodPermissions());
       assertExcludeList(ejbName, 5, 5, mdb.getExcludeList());
-      assertSecurityIdentity(ejbName, "SecurityIdentity", mdb.getSecurityIdentity(), true);
+      assertSecurityIdentity(ejbName, "SecurityIdentity", mdb.getSecurityIdentity(), true, mode);
       
       return mdb;
    }
@@ -450,7 +450,7 @@
 
    protected void assertMessageDestination(String prefix, MessageDestinationMetaData messageDestinationMetaData)
    {
-      assertMessageDestination50(prefix, messageDestinationMetaData);
+      assertMessageDestination50(prefix, messageDestinationMetaData, Mode.SPEC);
    }
 
    protected void assertMessageDestination(String prefix, org.jboss.metadata.MessageDestinationMetaData messageDestinationMetaData)

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -78,6 +78,8 @@
       resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
       resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
       resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+      resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
+
       // 
       resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
       return resolver;
@@ -98,7 +100,7 @@
       ejbJar.assertEverything(ejbJarMetaData, Mode.SPEC);
 
       JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
-      JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
+      JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss", Mode.JBOSS);
       jboss.assertEverything(jbossMetaData, Mode.JBOSS);
       
       // Create the merged view
@@ -139,7 +141,7 @@
       specMetaData.merge(null, ejbJarMetaData);
       
       JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
-      JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
+      JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss", Mode.JBOSS);
       jboss.assertEverything(jbossMetaData, Mode.JBOSS);
       jboss.assertWebservices(jbossMetaData.getWebservices());
       
@@ -180,9 +182,9 @@
       JBossMetaData specMetaData = new JBossMetaData();
       specMetaData.merge(null, ejbJarMetaData);
       
-      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
       JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
-      jboss.assertEverything(jbossMetaData, Mode.JBOSS);
+      jboss.assertEverything(jbossMetaData, Mode.JBOSS_DTD);
       jboss.assertWebservices(jbossMetaData.getWebservices());
 
       //jbossMetaData.setOverridenMetaData(ejbJarMetaData);
@@ -195,7 +197,7 @@
       JBossEnterpriseBeanMetaData ejb = mergedMetaData.getEnterpriseBean("session1EjbName");      
       assertNotNull(ejb);
       JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
-      ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS);
+      ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS_DTD);
       jboss.assertWebservices(mergedMetaData.getWebservices());
       // Basic check if EjbReferences.invokerBindings are merged
       assertEjbReferenceInvokerBindings(ejb);
@@ -212,9 +214,9 @@
       EjbJar21EverythingUnitTestCase ejbJar = new EjbJar21EverythingUnitTestCase("ejb-jar");
       ejbJar.assertEverything(ejbJarMetaData, Mode.SPEC);
 
-      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
       JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
-      jboss.assertEverything(jbossMetaData, Mode.JBOSS);
+      jboss.assertEverything(jbossMetaData, Mode.JBOSS_DTD);
       jboss.assertWebservices(jbossMetaData.getWebservices());
       
       //jbossMetaData.setOverridenMetaData(ejbJarMetaData);
@@ -226,7 +228,7 @@
       JBossEnterpriseBeanMetaData ejb = jbossMetaData.getEnterpriseBean("session1EjbName");      
       assertNotNull(ejb);
       JBossSessionBeanMetaData jejb = (JBossSessionBeanMetaData) ejb;
-      ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS);
+      ejbJar.assertFullSessionBean("session1", jejb, Mode.JBOSS_DTD);
       // Basic check if EjbReferences.invokerBindings are merged
       assertEjbReferenceInvokerBindings(ejb);
       assertInvokerBindings(jbossMetaData.getInvokerProxyBindings());

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-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -557,12 +557,12 @@
       EjbJarMetaData specMetaData = unmarshal("EjbJar21Everything_testEverything.xml", EjbJar21MetaData.class, null);
       long end = System.currentTimeMillis();
       getLog().info("EjbJar21Everything_testEverything.xml parse time = "+(end - start));
-      JBoss50MetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBoss50DTDMetaData.class, null);
       long end2 = System.currentTimeMillis();
       getLog().info("JBoss5xEverything_testStandard.xml parse time = "+(end2 - end));
-      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
       long end3 = System.currentTimeMillis();
-      getLog().info("JBoss5xEverything_testEverything.xml parse time = "+(end3 - end2));
+      getLog().info("JBoss5xEverything_testEverythingDTD.xml parse time = "+(end3 - end2));
       //jbossMetaData.setOverridenMetaData(specMetaData);
       jbossMetaData.merge(null, specMetaData);
       JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
@@ -631,13 +631,13 @@
       long start = System.currentTimeMillis();
       EjbJarMetaData specMetaData = unmarshal("JBoss50_testCtsEjb20Jar.xml", EjbJarMetaData.class, null);
       long end = System.currentTimeMillis();
-      getLog().info("EjbJar21Everything_testEverything.xml parse time = "+(end - start));
+      getLog().info("JBoss50_testCtsEjb20Jar.xml parse time = "+(end - start));
       JBossMetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBossMetaData.class, null);
       long end2 = System.currentTimeMillis();
       getLog().info("JBoss5xEverything_testStandard.xml parse time = "+(end2 - end));
       JBossMetaData jbossXmlMetaData = unmarshal("JBoss50_testCtsJBoss32.xml", JBossMetaData.class, null);
       long end3 = System.currentTimeMillis();
-      getLog().info("JBoss5xEverything_testEverything.xml parse time = "+(end3 - end2));
+      getLog().info("JBoss50_testCtsJBoss32.xml parse time = "+(end3 - end2));
       //jbossMetaData.setOverridenMetaData(specMetaData);
       // Merge the jboss.xml, ejb-jar.xml
       JBossMetaData jbossMetaData = new JBossMetaData();
@@ -813,7 +813,7 @@
       xbdelegate.setValidateSchema(false);
 
       JBossMetaData result = unmarshal();
-      JBoss50MetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData stdMetaData = unmarshal("JBoss5xEverything_testStandard.xml", JBoss50DTDMetaData.class, null);
 
       JBossEnterpriseBeanMetaData bean = result.getEnterpriseBean("SessionEjbName");
       assertNotNull(bean);

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	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -42,6 +42,7 @@
 import org.jboss.metadata.ejb.jboss.InvokerBindingsMetaData;
 import org.jboss.metadata.ejb.jboss.InvokerProxyBindingMetaData;
 import org.jboss.metadata.ejb.jboss.InvokerProxyBindingsMetaData;
+import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
 import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
 import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -60,6 +61,7 @@
 import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
 import org.jboss.metadata.javaee.spec.ResourceInjectionMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -76,6 +78,7 @@
 {
    /** Is there a standardjboss.xml default available */
    private boolean hasStandardJBoss = false;
+   private Mode mode = Mode.JBOSS_DTD;
 
    public static Test suite()
    {
@@ -84,15 +87,21 @@
    
    public static SchemaBindingResolver initResolver()
    {
-      return schemaResolverForClass(JBoss50MetaData.class);
-      //return AbstractJavaEEMetaDataTest.initResolverJavaEE(JBoss50MetaData.class);
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
+      resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+      // Workaround wildard resolution slowness
+      resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
+      return resolver;
    }
+   
    static Element getElement(String name, Element parent)
    {
       NodeList elements = parent.getElementsByTagName(name);
       Element element = (Element) elements.item(0);
       return element;
    }
+   
    static String getElementText(String name, Element parent)
    {
       Element element = getElement(name, parent);
@@ -120,30 +129,45 @@
    {
       super(name);
    }
-   
-   protected JBoss50MetaData unmarshal() throws Exception
+
+   public JBoss5xEverythingUnitTestCase(String name, Mode mode)
    {
-      return unmarshal(JBoss50MetaData.class);
+      super(name);
+      this.mode = mode;
    }
-   
+
+   protected JBoss50DTDMetaData unmarshal() throws Exception
+   {
+      return unmarshal(JBoss50DTDMetaData.class);
+   }
+
    public void testEverything() throws Exception
    {
+      JBoss50MetaData jbossMetaData = unmarshal(JBoss50MetaData.class);
+      hasStandardJBoss = false;
+      mode = Mode.JBOSS;
+      assertEverything(jbossMetaData, Mode.JBOSS);
+   }
+
+   public void testEverythingDTD() throws Exception
+   {
       //enableTrace("org.jboss.xb");
       //enableTrace("org.jboss.xb.builder");
-      JBoss50MetaData jbossMetaData = unmarshal();
+      JBoss50DTDMetaData jbossMetaData = unmarshal();
       hasStandardJBoss = false;
-      assertEverything(jbossMetaData, Mode.JBOSS);
+      assertEverything(jbossMetaData, Mode.JBOSS_DTD);
    }
+   
    public void testStandard() throws Exception
    {
       //enableTrace("org.jboss.xb");
       //enableTrace("org.jboss.xb.builder");
-      JBoss50MetaData stdMetaData = unmarshal();
-      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData stdMetaData = unmarshal();
+      JBoss50DTDMetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverythingDTD.xml", JBoss50DTDMetaData.class, null);
       JBossMetaDataWrapper wrapper = new JBossMetaDataWrapper(jbossMetaData, stdMetaData);
       hasStandardJBoss = true;
-      assertEverything(wrapper, Mode.JBOSS);
-      
+      mode = Mode.JBOSS_DTD;
+      assertEverything(wrapper, Mode.JBOSS_DTD);
    }
 
    /**
@@ -152,8 +176,8 @@
     */
    public void testOverride() throws Exception
    {
-      JBoss50MetaData overrideData = unmarshal();
-      JBoss50MetaData baseData = unmarshal("JBoss5xEverything_testBaseData.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData overrideData = unmarshal();
+      JBoss50DTDMetaData baseData = unmarshal("JBoss5xEverything_testBaseData.xml", JBoss50DTDMetaData.class, null);
       // Override JBoss5xEverything_testBaseData.xml with JBoss5xEverything_testOverride.xml
       JBossMetaDataWrapper jbossMetaData = new JBossMetaDataWrapper(overrideData, baseData);
 
@@ -169,13 +193,13 @@
       assertFalse(jbossMetaData.isExceptionOnRollback());
       // loader-repository
       LoaderRepositoryMetaData lrmd = jbossMetaData.getLoaderRepository();
-      assertEquals("loaderRepository-id-override", lrmd.getId());
+      //assertEquals("loaderRepository-id-override", lrmd.getId());
       assertEquals("loaderRepositoryClass-override", lrmd.getLoaderRepositoryClass());
       assertEquals("loaderRepositoryName-override", lrmd.getName());
       Set<LoaderRepositoryConfigMetaData> lrmdConfigs = lrmd.getLoaderRepositoryConfig();
       assertEquals(1, lrmdConfigs.size());
       LoaderRepositoryConfigMetaData lrmdConfig = lrmdConfigs.iterator().next();
-      assertEquals("loaderRepositoryConfig1-id", lrmdConfig.getId());
+      //assertEquals("loaderRepositoryConfig1-id", lrmdConfig.getId());
       assertEquals("loaderRepositoryConfig1-override", lrmdConfig.getConfig());
       assertEquals("loaderRepositoryConfigParserClass1-override", lrmdConfig.getConfigParserClass());
       // webservices
@@ -185,13 +209,13 @@
       // invoker-proxy-bindings
       InvokerProxyBindingMetaData ipbmd1 = jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name");
       assertNotNull(ipbmd1);
-      assertEquals("invokerProxyBinding1-id", ipbmd1.getId());
+      //assertEquals("invokerProxyBinding1-id", ipbmd1.getId());
       assertEquals("invokerProxyBinding1InvokerMBean", ipbmd1.getInvokerMBean());
       assertEquals("invokerProxyBinding1Name", ipbmd1.getInvokerProxyBindingName());
       assertEquals("invokerProxyBinding1ProxyFactory", ipbmd1.getProxyFactory());
       InvokerProxyBindingMetaData ipbmd1Override = jbossMetaData.getInvokerProxyBinding("invokerProxyBinding1Name-override");
       assertNotNull(ipbmd1Override);
-      assertEquals("invokerProxyBinding1-id-override", ipbmd1Override.getId());
+      //assertEquals("invokerProxyBinding1-id-override", ipbmd1Override.getId());
       assertEquals("invokerProxyBinding1InvokerMBean-override", ipbmd1Override.getInvokerMBean());
       assertEquals("invokerProxyBinding1Name-override", ipbmd1Override.getInvokerProxyBindingName());
       assertEquals("invokerProxyBinding1ProxyFactory-override", ipbmd1Override.getProxyFactory());
@@ -202,7 +226,7 @@
       Set<String> invokerNames = sssb.getInvokerProxyBindingNames();
       HashSet<String> expectedInvokerNames = new HashSet<String>();
       expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName1-override");
-      expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
+      //expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
       assertEquals(expectedInvokerNames, invokerNames);
       ContainerConfigurationMetaData session2Configuration = jbossMetaData.getContainerConfiguration("session2ConfigurationName");
       assertNotNull(session2Configuration);
@@ -210,7 +234,7 @@
       invokerNames = session2Configuration.getInvokerProxyBindingNames();
       expectedInvokerNames.clear();
       expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName1-override1");
-      expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override1");
+      //expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override1");
       assertEquals(expectedInvokerNames, invokerNames);
 
       ContainerConfigurationMetaData containerConfiguration1 = jbossMetaData.getContainerConfiguration("containerConfiguration1Name-override");
@@ -227,14 +251,14 @@
       invokerNames = containerConfiguration1.getInvokerProxyBindingNames();
       expectedInvokerNames.clear();
       expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName1-override");
-      expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
+      //expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
       assertEquals(expectedInvokerNames, invokerNames);
    }
    
    public void testClusterConfigOverride() throws Exception
    {
-      JBoss50MetaData overrideData = unmarshal();
-      JBoss50MetaData baseData = unmarshal("JBoss5xEverything_testClusterConfigBase.xml", JBoss50MetaData.class, null);
+      JBoss50DTDMetaData overrideData = unmarshal();
+      JBoss50DTDMetaData baseData = unmarshal("JBoss5xEverything_testClusterConfigBase.xml", JBoss50DTDMetaData.class, null);
       // Override JBoss5xEverything_testBaseData.xml with JBoss5xEverything_testOverride.xml
       JBossMetaDataWrapper jbossMetaData = new JBossMetaDataWrapper(overrideData, baseData);
       
@@ -276,10 +300,9 @@
       assertSessionStateManagerJndiName(config, "standard");
    }
    
-   
    public void testCreateDestination() throws Exception
    {
-      JBossMetaData metaData = unmarshal();
+      JBossMetaData metaData = unmarshal(JBoss50MetaData.class);
       JBossMessageDrivenBeanMetaData mdb = (JBossMessageDrivenBeanMetaData) metaData.getEnterpriseBean("MessageDriven");
       assertTrue(mdb.isCreateDestination());
    }
@@ -298,9 +321,12 @@
    public void assertEverything(JBossMetaData jbossMetaData, Mode mode)
    {
       assertVersion(jbossMetaData);
-      assertId("jboss", jbossMetaData);
-      assertDescriptionGroup("jboss", jbossMetaData.getDescriptionGroup());
-      assertLoaderRepository(jbossMetaData.getLoaderRepository());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId("jboss", jbossMetaData);
+         assertDescriptionGroup("jboss", jbossMetaData.getDescriptionGroup());
+      }
+      assertLoaderRepository(jbossMetaData.getLoaderRepository(), mode);
       assertEquals("jboss-jmx-name", jbossMetaData.getJmxName());
       assertEquals("jboss-security-domain", jbossMetaData.getSecurityDomain());
       assertFalse(jbossMetaData.isExcludeMissingMethods());
@@ -324,16 +350,17 @@
       assertEquals("5.0", jbossMetaData.getVersion());
    }
    
-   private void assertLoaderRepository(LoaderRepositoryMetaData loaderRepositoryMetaData)
+   private void assertLoaderRepository(LoaderRepositoryMetaData loaderRepositoryMetaData, Mode mode)
    {
       assertNotNull(loaderRepositoryMetaData);
-      assertId("loaderRepository", loaderRepositoryMetaData);
+      if(mode == Mode.JBOSS)
+         assertId("loaderRepository", loaderRepositoryMetaData);
       assertEquals("loaderRepositoryClass", loaderRepositoryMetaData.getLoaderRepositoryClass());
       assertEquals("loaderRepositoryName", trim(loaderRepositoryMetaData.getName()));
-      assertLoaderRepositoryConfig(2, loaderRepositoryMetaData);
+      assertLoaderRepositoryConfig(2, loaderRepositoryMetaData, mode);
    }
    
-   private void assertLoaderRepositoryConfig(int size, LoaderRepositoryMetaData loaderRepositoryMetaData)
+   private void assertLoaderRepositoryConfig(int size, LoaderRepositoryMetaData loaderRepositoryMetaData, Mode mode)
    {
       Set<LoaderRepositoryConfigMetaData> configs = loaderRepositoryMetaData.getLoaderRepositoryConfig();
       assertNotNull(configs);
@@ -341,7 +368,8 @@
       for (int count = 1; count < configs.size(); ++count)
       {
          LoaderRepositoryConfigMetaData config = new LoaderRepositoryConfigMetaData();
-         config.setId("loaderRepositoryConfig" + count + "-id");
+         if(mode == Mode.JBOSS)
+            config.setId("loaderRepositoryConfig" + count + "-id");
          config.setConfig("loaderRepositoryConfig" + count);
          config.setConfigParserClass("loaderRepositoryConfigParserClass" + count);
          assertTrue(configs + " contains " + config, configs.contains(config));
@@ -354,7 +382,8 @@
    public void assertWebservices(WebservicesMetaData webservices)
    {
       assertNotNull(webservices);
-      assertId("webservices", webservices);
+      if(mode == Mode.JBOSS)
+         assertId("webservices", webservices);
       assertEquals("webservicesContextRoot", webservices.getContextRoot());
       WebserviceDescriptionsMetaData webserviceDescriptionsMetaData = webservices.getWebserviceDescriptions();
       assertNotNull(webserviceDescriptionsMetaData);
@@ -362,7 +391,8 @@
       int count = 1;
       for (WebserviceDescriptionMetaData description : webserviceDescriptionsMetaData)
       {
-         assertId("webserviceDescription" + count, description);
+         if(mode == Mode.JBOSS)
+            assertId("webserviceDescription" + count, description);
          assertEquals("webserviceDescription" + count + "ConfigName", description.getConfigName());
          assertEquals("webserviceDescription" + count + "ConfigFile", description.getConfigFile());
          assertEquals("webserviceDescription" + count + "WsdlPublishLocation", description.getWsdlPublishLocation());
@@ -394,16 +424,21 @@
    {
       JBossEnterpriseBeansMetaData enterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
       assertNotNull(enterpriseBeansMetaData);
-      assertEquals(9, enterpriseBeansMetaData.size());
+      // no entities in jboss_5_0.xsd
+      int beansTotal = mode == Mode.JBOSS ? 6 : 9;
+      assertEquals(beansTotal, enterpriseBeansMetaData.size());
 
       assertNullSessionBean("session0", jbossMetaData);
       assertFullSessionBean("session1", jbossMetaData, true, mode, 1);
       assertFullSessionBean("session2", jbossMetaData, false, mode, 2);
 
-      assertNullEntityBean("entity0", jbossMetaData);
-      assertFullEntityBean("entity1", jbossMetaData, true, mode);
-      assertFullEntityBean("entity2", jbossMetaData, false, mode);
-
+      if(mode != Mode.JBOSS)
+      {
+         assertNullEntityBean("entity0", jbossMetaData);
+         assertFullEntityBean("entity1", jbossMetaData, true, mode);
+         assertFullEntityBean("entity2", jbossMetaData, false, mode);
+      }
+      
       assertNullMessageDrivenBean("mdb0", jbossMetaData);
       assertFullMessageDrivenBean("mdb1", jbossMetaData, true, mode);
       assertFullMessageDrivenBean("mdb2", jbossMetaData, false, mode);
@@ -449,17 +484,31 @@
    {
       JBossSessionBeanMetaData session = assertJBossSessionBean(prefix, jbossMetaData);
       assertId(prefix, session);
-      assertDescriptionGroup(prefix, session.getDescriptionGroup());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertDescriptionGroup(prefix, session.getDescriptionGroup());
+         assertRemoteBindings(prefix, session.getRemoteBindings());
+         assertEquals(prefix + "LocalHomeJndiName", session.getLocalHomeJndiName());
+         assertEquals(prefix + "SecurityDomain", session.getSecurityDomain()); // TODO!!! this should be in the DTD as well
 
-      assertRemoteBindings(prefix, session.getRemoteBindings());
+         assertAnnotations(prefix, 2, session.getAnnotations());
+         assertIgnoreDependency(prefix, session.getIgnoreDependency());
+         assertEquals(prefix + "AOPDomain", session.getAopDomainName());
+         assertCacheConfig(prefix, num, session.getCacheConfig());
+         assertPoolConfig(prefix, session.getPoolConfig());
+         assertJndiRefs(prefix, 2, session.getJndiRefs(), mode);
+         
+         if (first)
+            assertTrue(session.isConcurrent());
+         else
+            assertFalse(session.isConcurrent());
+      }
       
       assertEquals(prefix + "JndiName", session.getJndiName());
       assertEquals(prefix + "HomeJndiName", session.getHomeJndiName());
       assertEquals(prefix + "LocalJndiName", session.getLocalJndiName());
-      assertEquals(prefix + "LocalHomeJndiName", session.getLocalHomeJndiName());
       assertEquals(prefix + "ConfigurationName", session.getConfigurationName());
       assertEquals(prefix + "SecurityProxy", session.getSecurityProxy());
-      assertEquals(prefix + "SecurityDomain", session.getSecurityDomain());
 
       if (first)
       {
@@ -480,43 +529,26 @@
 
       assertEnvironment(prefix, session.getJndiEnvironmentRefsGroup(), false, mode);
 
-      assertSecurityIdentity(prefix, "SecurityIdentity", session.getSecurityIdentity(), false);
+      assertSecurityIdentity(prefix, "SecurityIdentity", session.getSecurityIdentity(), false, mode);
 
-      assertClusterConfig(prefix, session.determineClusterConfig(), true);
+      assertClusterConfig(prefix, session.determineClusterConfig(), true, mode);
       
-      assertMethodAttributes(prefix, session.getMethodAttributes());
+      assertMethodAttributes(prefix, session.getMethodAttributes(), mode);
 
       assertDepends(prefix, 2, session.getDepends());
       
-      assertIORSecurityConfig(prefix, session.getIorSecurityConfig());
+      assertIORSecurityConfig(prefix, session.getIorSecurityConfig(), mode);
       
-      assertPortComponent(prefix, session.getPortComponent());
+      assertPortComponent(prefix, session.getPortComponent(), mode);
 
-      assertSecurityIdentity(prefix, "EjbTimeoutIdentity", session.getEjbTimeoutIdentity(), false);
-      
-      assertAnnotations(prefix, 2, session.getAnnotations());
-
-      assertIgnoreDependency(prefix, session.getIgnoreDependency());
-
-      assertEquals(prefix + "AOPDomain", session.getAopDomainName());
-      
-      assertCacheConfig(prefix, num, session.getCacheConfig());
-      
-      assertPoolConfig(prefix, session.getPoolConfig());
-      
+      assertSecurityIdentity(prefix, "EjbTimeoutIdentity", session.getEjbTimeoutIdentity(), false, mode);
+            
       if (this.hasStandardJBoss)
       {
          ContainerConfigurationMetaData ccmd = session.determineContainerConfiguration();
          this.assertContainerPoolConf(prefix, ccmd.getContainerPoolConf());
       }
-
-      if (first)
-         assertTrue(session.isConcurrent());
-      else
-         assertFalse(session.isConcurrent());
       
-      assertJndiRefs(prefix, 2, session.getJndiRefs(), mode);
-      
       //Ensure that we can see the principal versus role map
       Map<String, Set<String>> principalVsRolesMap = session.getSecurityRolesPrincipalVersusRolesMap();
       assertTrue("Keys size > 0", principalVsRolesMap.keySet().size() > 0);
@@ -587,13 +619,12 @@
    {
       JBossEntityBeanMetaData entity = assertJBossEntityBean(prefix, jbossMetaData);
       assertId(prefix, entity);
-      assertDescriptionGroup(prefix, entity.getDescriptionGroup());
       
       assertEquals(prefix + "JndiName", entity.getJndiName());
       assertEquals(prefix + "LocalJndiName", entity.getLocalJndiName());
       assertEquals(prefix + "ConfigurationName", entity.getConfigurationName());
       assertEquals(prefix + "SecurityProxy", entity.getSecurityProxy());
-      assertEquals(prefix + "SecurityDomain", entity.getSecurityDomain());
+      // TODO assertEquals(prefix + "SecurityDomain", entity.getSecurityDomain());
 
       if (first)
       {
@@ -618,29 +649,21 @@
 
       assertEnvironment(prefix, entity.getJndiEnvironmentRefsGroup(), false, mode);
 
-      assertSecurityIdentity(prefix, "SecurityIdentity", entity.getSecurityIdentity(), false);
+      assertSecurityIdentity(prefix, "SecurityIdentity", entity.getSecurityIdentity(), false, mode);
 
-      assertClusterConfig(prefix, entity.getClusterConfig(), false);
+      assertClusterConfig(prefix, entity.getClusterConfig(), false, mode);
       
-      assertMethodAttributes(prefix, entity.getMethodAttributes());
+      assertMethodAttributes(prefix, entity.getMethodAttributes(), mode);
 
       assertDepends(prefix, 2, entity.getDepends());
       
-      assertIORSecurityConfig(prefix, entity.getIorSecurityConfig());
+      assertIORSecurityConfig(prefix, entity.getIorSecurityConfig(), mode);
       
-      assertAnnotations(prefix, 2, entity.getAnnotations());
+      assertCacheInvalidationConfig(prefix, entity.getCacheInvalidationConfig(), mode);
 
-      assertIgnoreDependency(prefix, entity.getIgnoreDependency());
-
-      assertEquals(prefix + "AOPDomain", entity.getAopDomainName());
-
-      assertCacheInvalidationConfig(prefix, entity.getCacheInvalidationConfig());
-
       // TODO DOM cache-config
       
       // TODO DOM pool-config
-      
-      assertJndiRefs(prefix, 2, entity.getJndiRefs(), mode);
    }
    
    private void assertNullEntityBean(String prefix, JBossMetaData jbossMetaData)
@@ -780,8 +803,18 @@
    {
       JBossMessageDrivenBeanMetaData mdb = assertJBossMessageDrivenBean(prefix, jbossMetaData);
       assertId(prefix, mdb);
-      assertDescriptionGroup(prefix, mdb.getDescriptionGroup());
       
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertDescriptionGroup(prefix, mdb.getDescriptionGroup());
+         assertAnnotations(prefix, 2, mdb.getAnnotations());
+         assertIgnoreDependency(prefix, mdb.getIgnoreDependency());
+         assertEquals(prefix + "AOPDomain", mdb.getAopDomainName());
+         assertJndiRefs(prefix, 2, mdb.getJndiRefs(), mode);
+         assertMethodAttributes(prefix, mdb.getMethodAttributes(), mode);
+         assertActivationConfig(prefix + "Default", mdb.getDefaultActivationConfig());
+      }
+      
       assertEquals(prefix + "DestinationJndiName", mdb.getDestinationJndiName());
       assertEquals(prefix + "LocalJndiName", mdb.getLocalJndiName());
       assertEquals(prefix + "User", mdb.getMdbUser());
@@ -807,27 +840,15 @@
 
       assertEnvironment(prefix, mdb.getJndiEnvironmentRefsGroup(), false, mode);
 
-      assertMethodAttributes(prefix, mdb.getMethodAttributes());
+      assertSecurityIdentity(prefix, "SecurityIdentity", mdb.getSecurityIdentity(), false, mode);
 
-      assertSecurityIdentity(prefix, "SecurityIdentity", mdb.getSecurityIdentity(), false);
-
       assertDepends(prefix, 2, mdb.getDepends());
       
-      assertIORSecurityConfig(prefix, mdb.getIorSecurityConfig());
+      assertIORSecurityConfig(prefix, mdb.getIorSecurityConfig(), mode);
       
-      assertSecurityIdentity(prefix, "EjbTimeoutIdentity", mdb.getEjbTimeoutIdentity(), false);
-      
-      assertAnnotations(prefix, 2, mdb.getAnnotations());
-
-      assertIgnoreDependency(prefix, mdb.getIgnoreDependency());
-
-      assertEquals(prefix + "AOPDomain", mdb.getAopDomainName());
-     
-      // TODO DOM pool-config
-      
-      assertJndiRefs(prefix, 2, mdb.getJndiRefs(), mode);
-
-      assertActivationConfig(prefix + "Default", mdb.getDefaultActivationConfig());
+      assertSecurityIdentity(prefix, "EjbTimeoutIdentity", mdb.getEjbTimeoutIdentity(), false, mode);
+           
+      // TODO DOM pool-config      
    }
    
    private void assertNullMessageDrivenBean(String prefix, JBossMetaData jbossMetaData)
@@ -899,8 +920,11 @@
    private void assertFullContainerConfiguration(String prefix, JBossMetaData jBossMetaData, boolean first)
    {
       ContainerConfigurationMetaData configuration = assertContainerConfiguration(prefix, jBossMetaData);
-      assertId(prefix, configuration);
-      assertDescriptions(prefix, configuration.getDescriptions());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId(prefix, configuration);
+         assertDescriptions(prefix, configuration.getDescriptions());
+      }
       assertEquals(prefix + "Extends", configuration.getExtendsName());
       assertEquals(prefix + "InstancePool", configuration.getInstancePool());
       assertEquals(prefix + "InstanceCache", configuration.getInstanceCache());
@@ -924,7 +948,12 @@
          assertFalse(configuration.isEjbStoreOnClean());
          assertFalse(configuration.isStoreNotFlushed());
       }
-      assertInvokerProxyBindingNames(prefix, 2, configuration.getInvokerProxyBindingNames());
+      
+      // TODO
+      if(mode == Mode.JBOSS_DTD)
+         assertInvokerProxyBindingNames(prefix, 1, configuration.getInvokerProxyBindingNames());
+      else
+         assertInvokerProxyBindingNames(prefix, 2, configuration.getInvokerProxyBindingNames());
       Element interceptors = configuration.getContainerInterceptors();
       assertContainerInterceptors(prefix, interceptors);
       Element cacheConf = configuration.getContainerCacheConf();
@@ -933,7 +962,7 @@
       assertContainerPoolConf(prefix, poolConf);
       assertEquals(CommitOption.D, configuration.getCommitOption());
       assertEquals(10000, configuration.getOptiondRefreshRateMillis());
-      assertClusterConfig(prefix, configuration.getClusterConfig(), true);
+      assertClusterConfig(prefix, configuration.getClusterConfig(), true, mode);
       assertDepends(prefix, 2, configuration.getDepends());
    }
    
@@ -992,13 +1021,13 @@
          String tx = interceptor.getAttribute("transaction");
          String text = interceptor.getTextContent();
          String expected;
-         if (tx.length() == 0)
+         if (tx.length() == 0 || tx.equals("Both"))
             expected = prefix+".Interceptor"+(n+1);
          else if (tx.equals("Container"))
             expected = prefix+".Interceptor"+(n+1)+"c";
          else
             expected = prefix+".Interceptor"+(n+1)+"b";
-         assertEquals(expected, text);
+         assertEquals(tx, expected, text);
       }
    }
    /**
@@ -1034,7 +1063,7 @@
       assertNotNull(prefix+" container-pool-conf", config);
       String id = config.getAttribute("id");
       // standardjboss.xml does not specify ids
-      if (hasStandardJBoss == false || id.length() > 0)
+      if ((mode != Mode.JBOSS_DTD && hasStandardJBoss == false) || id.length() > 0)
          assertEquals(prefix+"-pool-conf", id);
       assertEquals("100", getElementText("MaximumSize", config));
    }
@@ -1042,25 +1071,13 @@
    private void assertInvokerProxyBindingNames(String prefix, int size, Collection<String> names)
    {
       assertNotNull(names);
-      assertEquals(2, names.size());
+      assertEquals(size, names.size());
       for(int count = 1; count <= names.size(); ++count)
       {
          assertTrue(names.contains(prefix + "InvokerProxyBindingName" + count));
       }
    }
-   
-   private void assertInvokerProxyBindingNames(String prefix, int size, String[] names)
-   {
-      assertNotNull(names);
-      assertEquals(size, names.length);
-      int count = 1;
-      for (String name : names)
-      {
-         assertEquals(prefix + "InvokerProxyBindingName" + count, name);
-         ++count;
-      }
-   }
-   
+      
    private void assertDepends(String prefix, int size, Collection<String> depends)
    {
       assertNotNull(depends);
@@ -1074,8 +1091,11 @@
    private void assertInvokerProxyBindings(InvokerProxyBindingsMetaData bindings)
    {
       assertNotNull(bindings);
-      assertId("invoker-proxy-bindings", bindings);
-      assertDescriptions("invoker-proxy-bindings", bindings.getDescriptions());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId("invoker-proxy-bindings", bindings);
+         assertDescriptions("invoker-proxy-bindings", bindings.getDescriptions());
+      }
       assertEquals(2, bindings.size());
       int count = 1;
       for (InvokerProxyBindingMetaData binding : bindings)
@@ -1088,8 +1108,11 @@
    private void assertInvokerProxyBinding(String prefix, int count, InvokerProxyBindingMetaData binding)
    {
       assertNotNull(binding);
-      assertId(prefix, binding);
-      assertDescriptions(prefix, binding.getDescriptions());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId(prefix, binding);
+         assertDescriptions(prefix, binding.getDescriptions());
+      }
       assertEquals(prefix + "Name", binding.getInvokerProxyBindingName());
       assertEquals(prefix + "InvokerMBean", binding.getInvokerMBean());
       assertEquals(prefix + "ProxyFactory", binding.getProxyFactory());
@@ -1141,8 +1164,11 @@
 
    private void assertInvokerBindings(String prefix, InvokerBindingsMetaData bindings)
    {
-      assertId(prefix + "InvokerBindings", bindings);
-      assertDescriptions(prefix + "InvokerBindings", bindings.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix + "InvokerBindings", bindings);
+         assertDescriptions(prefix + "InvokerBindings", bindings.getDescriptions());
+      }
       assertNotNull(bindings);
       assertEquals(2, bindings.size());
       int count = 1;
@@ -1157,8 +1183,11 @@
    {
       String invokerPrefix = ejbPrefix + "Invoker" + count;
       assertNotNull(binding);
-      assertId(invokerPrefix, binding);
-      assertDescriptions(invokerPrefix, binding.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(invokerPrefix, binding);
+         assertDescriptions(invokerPrefix, binding.getDescriptions());
+      }
       assertEquals("invokerProxyBinding"+count+"Name", binding.getInvokerProxyBindingName());
       assertEquals(invokerPrefix + "JndiName", binding.getJndiName());
       // TODO LAST ejb-ref - needs a seperate test
@@ -1178,8 +1207,11 @@
    private void assertResourceManagers(ResourceManagersMetaData resources)
    {
       assertNotNull(resources);
-      assertId("resource-managers", resources);
-      assertDescriptions("resource-managers", resources.getDescriptions());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId("resource-managers", resources);
+         assertDescriptions("resource-managers", resources.getDescriptions());
+      }
       assertEquals(2, resources.size());
       int count = 1;
       for (ResourceManagerMetaData resource : resources)
@@ -1192,8 +1224,11 @@
    private void assertResourceManager(String prefix, boolean jndi, ResourceManagerMetaData resource)
    {
       assertNotNull(resource);
-      assertId(prefix, resource);
-      assertDescriptions(prefix, resource.getDescriptions());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId(prefix, resource);
+         assertDescriptions(prefix, resource.getDescriptions());
+      }
       assertEquals(prefix + "Name", resource.getResName());
       if (jndi)
       {
@@ -1213,9 +1248,10 @@
    {
       JBossAssemblyDescriptorMetaData assemblyDescriptorMetaData = (JBossAssemblyDescriptorMetaData) jbossMetaData.getAssemblyDescriptor();
       assertNotNull(assemblyDescriptorMetaData);
-      assertId("assembly-descriptor", assemblyDescriptorMetaData);
-      assertSecurityRoles(2, assemblyDescriptorMetaData.getSecurityRoles());
-      assertMessageDestinations(2, assemblyDescriptorMetaData.getMessageDestinations());
+      if(mode == Mode.JBOSS)
+         assertId("assembly-descriptor", assemblyDescriptorMetaData);
+      assertSecurityRoles(2, assemblyDescriptorMetaData.getSecurityRoles(), mode);
+      assertMessageDestinations(2, assemblyDescriptorMetaData.getMessageDestinations(), mode);
       Map<String,Set<String>> prmap = assemblyDescriptorMetaData.getPrincipalVersusRolesMap();
       assertNotNull(prmap);
       //Check the keys
@@ -1238,9 +1274,9 @@
    }
    
    @Override
-   protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData)
+   protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData, Mode mode)
    {
-      super.assertSecurityRole(prefix, count, securityRoleMetaData);
+      super.assertSecurityRole(prefix, count, securityRoleMetaData, mode);
       assertPrincipals(prefix, count, 2, securityRoleMetaData.getPrincipals());
    }
 
@@ -1253,7 +1289,7 @@
 */
    protected void assertMessageDestination(String prefix, MessageDestinationMetaData messageDestinationMetaData)
    {
-      assertMessageDestination14(prefix, messageDestinationMetaData);
+      assertMessageDestination14(prefix, messageDestinationMetaData, mode);
       assertEquals(prefix + "JndiName", messageDestinationMetaData.getMappedName());
    }
 
@@ -1300,18 +1336,21 @@
    @Override
    protected void assertResourceGroup(String prefix, ResourceInjectionMetaData resourceInjectionMetaData, boolean full, boolean first, Mode mode)
    {
-      super.assertResourceGroupNoJndiName(prefix, resourceInjectionMetaData, true, first);
+      if(mode == Mode.JBOSS)
+      {
+         super.assertResourceGroupNoJndiName(prefix, resourceInjectionMetaData, true, first);
+         if (first)
+            assertTrue(resourceInjectionMetaData.isDependencyIgnored());
+         else
+            assertFalse(resourceInjectionMetaData.isDependencyIgnored());
+      }
       assertEquals(prefix + "JndiName", resourceInjectionMetaData.getMappedName());
-      if (first)
-         assertTrue(resourceInjectionMetaData.isDependencyIgnored());
-      else
-         assertFalse(resourceInjectionMetaData.isDependencyIgnored());
    }
       
    @Override
-   protected void assertSecurityIdentity(String ejbName, String type, SecurityIdentityMetaData securityIdentity, boolean full)
+   protected void assertSecurityIdentity(String ejbName, String type, SecurityIdentityMetaData securityIdentity, boolean full, Mode mode)
    {
-      super.assertSecurityIdentity(ejbName, type, securityIdentity, full);
+      super.assertSecurityIdentity(ejbName, type, securityIdentity, full, mode);
       assertEquals(ejbName + type + "RunAsPrincipal", securityIdentity.getRunAsPrincipal());
    }
    

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -97,12 +97,14 @@
 {
    /**
     * Define two testing modes for assertions:
-    * - JBOSS: we're testing a JBoss view
+    * - JBOSS: we're testing a JBoss view (jboss_5_0.xsd)
+    * - JBOSS_DTD: we're testing jboss_5_0.dtd view
     * - SPEC: we're testing a spec view
     */
    public enum Mode 
    {
       JBOSS,
+      JBOSS_DTD,
       SPEC
    }
    
@@ -194,23 +196,26 @@
       assertId(prefix + type, emptyMetaData);
    }
 
-   protected void assertSecurityRoles(int size, SecurityRolesMetaData securityRolesMetaData)
+   protected void assertSecurityRoles(int size, SecurityRolesMetaData securityRolesMetaData, Mode mode)
    {
       assertNotNull("security roles is null", securityRolesMetaData);
       assertEquals(securityRolesMetaData.getId(), size, securityRolesMetaData.size());
       int count = 1;
       for (SecurityRoleMetaData securityRoleMetaData : securityRolesMetaData)
       {
-         assertSecurityRole("securityRole", count, securityRoleMetaData);
+         assertSecurityRole("securityRole", count, securityRoleMetaData, mode);
          ++count;
       }
    }
 
-   protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData)
+   protected void assertSecurityRole(String prefix, int count, SecurityRoleMetaData securityRoleMetaData, Mode mode)
    {
       assertNotNull(securityRoleMetaData);
-      assertId(prefix+count, securityRoleMetaData);
-      assertDescriptions(prefix+count, securityRoleMetaData.getDescriptions());
+      if(mode == Mode.JBOSS)
+      {
+         assertId(prefix+count, securityRoleMetaData);
+         assertDescriptions(prefix+count, securityRoleMetaData.getDescriptions());
+      }
       assertEquals("securityRoleRef"+count+"RoleLink", securityRoleMetaData.getRoleName());
    }
 
@@ -249,34 +254,37 @@
       assertEquals(prefix + "RoleLink", securityRole.getRoleName());
    }
 
-   protected void assertMessageDestinations(int size, MessageDestinationsMetaData messageDestinationsMetaData)
+   protected void assertMessageDestinations(int size, MessageDestinationsMetaData messageDestinationsMetaData, Mode mode)
    {
       assertNotNull("message destinations is null", messageDestinationsMetaData);
       assertEquals(size, messageDestinationsMetaData.size());
       int count = 1;
       for (MessageDestinationMetaData messageDestinationMetaData : messageDestinationsMetaData)
       {
-         assertMessageDestination("messageDestination" + count, messageDestinationMetaData);
+         assertMessageDestination("messageDestination" + count, messageDestinationMetaData, mode);
          ++count;
       }
    }
 
-   protected void assertMessageDestination(String prefix, MessageDestinationMetaData messageDestinationMetaData)
+   protected void assertMessageDestination(String prefix, MessageDestinationMetaData messageDestinationMetaData, Mode mode)
    {
-      assertMessageDestination14(prefix, messageDestinationMetaData);
+      assertMessageDestination14(prefix, messageDestinationMetaData, mode);
    }
 
-   protected void assertMessageDestination14(String prefix, MessageDestinationMetaData messageDestinationMetaData)
+   protected void assertMessageDestination14(String prefix, MessageDestinationMetaData messageDestinationMetaData, Mode mode)
    {
       assertNotNull(messageDestinationMetaData);
-      assertId(prefix, messageDestinationMetaData);
-      assertDescriptionGroup(prefix, messageDestinationMetaData.getDescriptionGroup());
+      if(mode != Mode.JBOSS_DTD)
+      {
+         assertId(prefix, messageDestinationMetaData);
+         assertDescriptionGroup(prefix, messageDestinationMetaData.getDescriptionGroup());
+      }
       assertEquals(prefix + "Name", messageDestinationMetaData.getMessageDestinationName());
    }
 
-   protected void assertMessageDestination50(String prefix, MessageDestinationMetaData messageDestinationMetaData)
+   protected void assertMessageDestination50(String prefix, MessageDestinationMetaData messageDestinationMetaData, Mode mode)
    {
-      assertMessageDestination14(prefix, messageDestinationMetaData);
+      assertMessageDestination14(prefix, messageDestinationMetaData, mode);
       assertEquals(prefix + "MappedName", messageDestinationMetaData.getMappedName());
    }
 
@@ -397,8 +405,11 @@
       int count = 1;
       for (EJBReferenceMetaData ejbReferenceMetaData : ejbReferencesMetaData)
       {
-         assertId(prefix + "EjbRef" + count, ejbReferenceMetaData);
-         assertDescriptions(prefix + "EjbRef" + count, ejbReferenceMetaData.getDescriptions());
+         if(mode == Mode.JBOSS)
+         {
+            assertId(prefix + "EjbRef" + count, ejbReferenceMetaData);
+            assertDescriptions(prefix + "EjbRef" + count, ejbReferenceMetaData.getDescriptions());
+         }
          assertEquals(prefix + "EjbRef" + count + "Name", ejbReferenceMetaData.getEjbRefName());
          if (full)
          {
@@ -447,8 +458,11 @@
       int count = 1;
       for (EJBLocalReferenceMetaData ejbReferenceMetaData : ejbReferencesMetaData)
       {
-         assertId(prefix + "EjbLocalRef" + count, ejbReferenceMetaData);
-         assertDescriptions(prefix + "EjbLocalRef" + count, ejbReferenceMetaData.getDescriptions());
+         if(mode == Mode.JBOSS)
+         {
+            assertId(prefix + "EjbLocalRef" + count, ejbReferenceMetaData);
+            assertDescriptions(prefix + "EjbLocalRef" + count, ejbReferenceMetaData.getDescriptions());
+         }
          assertEquals(prefix + "EjbLocalRef" + count + "Name", ejbReferenceMetaData.getEjbRefName());
          if (full)
          {
@@ -515,8 +529,11 @@
       int count = 1;
       for (ResourceReferenceMetaData resourceReferenceMetaData : resourceReferencesMetaData)
       {
-         assertId(prefix + "ResourceRef" + count, resourceReferenceMetaData);
-         assertDescriptions(prefix + "ResourceRef" + count, resourceReferenceMetaData.getDescriptions());
+         if(mode == Mode.JBOSS)
+         {
+            assertId(prefix + "ResourceRef" + count, resourceReferenceMetaData);
+            assertDescriptions(prefix + "ResourceRef" + count, resourceReferenceMetaData.getDescriptions());
+         }
          assertEquals(prefix + "ResourceRef" + count + "Name", resourceReferenceMetaData.getResourceRefName());
          if (full)
          {
@@ -573,8 +590,11 @@
       int count = 1;
       for (ResourceEnvironmentReferenceMetaData resourceEnvReferenceMetaData : resourceEnvReferencesMetaData)
       {
-         assertId(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData);
-         assertDescriptions(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData.getDescriptions());
+         if(mode == Mode.JBOSS)
+         {
+            assertId(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData);
+            assertDescriptions(prefix + "ResourceEnvRef" + count, resourceEnvReferenceMetaData.getDescriptions());
+         }
          assertEquals(prefix + "ResourceEnvRef" + count + "Name", resourceEnvReferenceMetaData.getResourceEnvRefName());
          if (full)
             assertEquals(prefix + "ResourceEnvRef" + count + "Type", resourceEnvReferenceMetaData.getType());
@@ -609,8 +629,11 @@
       int count = 1;
       for (MessageDestinationReferenceMetaData messageDestinationReferenceMetaData : messageDestinationReferencesMetaData)
       {
-         assertId(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData);
-         assertDescriptions(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData.getDescriptions());
+         if(mode == Mode.JBOSS)
+         {
+            assertId(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData);
+            assertDescriptions(prefix + "MessageDestinationRef" + count, messageDestinationReferenceMetaData.getDescriptions());
+         }
          assertEquals(prefix + "MessageDestinationRef" + count + "Name", messageDestinationReferenceMetaData.getMessageDestinationRefName());
          if (full)
          {

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java	2008-11-13 22:55:05 UTC (rev 80964)
@@ -103,7 +103,7 @@
       int count = 1;
       for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
       {
-         assertMessageDestination50(prefix + count, messageDestinationMetaData);
+         assertMessageDestination50(prefix + count, messageDestinationMetaData, Mode.SPEC);
          count++;
       }
    }

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbthreeCacheInvalidationConfig.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbthreeCacheInvalidationConfig.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testEjbthreeCacheInvalidationConfig.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+<!--
 <jboss xmlns="http://www.jboss.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
     version="3.0">
+-->
+<jboss>
        
     <enterprise-beans>
         

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -1,37 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id$ -->
-<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
-       xmlns:jee="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-       version="5.0"
-       id="jboss-id">
-         
-   <description>en-jboss-desc</description>
-   <description xml:lang="fr">fr-jboss-desc</description>
-   <description xml:lang="de">de-jboss-desc</description>
-   <display-name>en-jboss-disp</display-name>
-   <display-name xml:lang="fr">fr-jboss-disp</display-name>
-   <display-name xml:lang="de">de-jboss-disp</display-name>
-   <icon id="en-jboss-icon-id">
-      <small-icon>en-jboss-small-icon</small-icon>
-      <large-icon>en-jboss-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="fr" id="fr-jboss-icon-id">
-      <small-icon>fr-jboss-small-icon</small-icon>
-      <large-icon>fr-jboss-large-icon</large-icon>
-   </icon>
-   <icon xml:lang="de" id="de-jboss-icon-id">
-      <small-icon>de-jboss-small-icon</small-icon>
-      <large-icon>de-jboss-large-icon</large-icon>
-   </icon>
+
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<jboss>         
    
-   <loader-repository id="loaderRepository-id" loaderRepositoryClass="loaderRepositoryClass">
+   <loader-repository loaderRepositoryClass="loaderRepositoryClass">
       loaderRepositoryName
-      <loader-repository-config id="loaderRepositoryConfig1-id" configParserClass="loaderRepositoryConfigParserClass1">
+      <loader-repository-config configParserClass="loaderRepositoryConfigParserClass1">
          loaderRepositoryConfig1
       </loader-repository-config>
-      <loader-repository-config id="loaderRepositoryConfig2-id" configParserClass="loaderRepositoryConfigParserClass2">
+      <loader-repository-config configParserClass="loaderRepositoryConfigParserClass2">
          loaderRepositoryConfig2
       </loader-repository-config>
    </loader-repository>
@@ -43,15 +24,15 @@
    <unauthenticated-principal>jboss-unauthenticated-principal</unauthenticated-principal>
    <exception-on-rollback>true</exception-on-rollback>
    
-   <webservices id="webservices-id">
+   <webservices>
       <context-root>webservicesContextRoot</context-root>
-      <webservice-description id="webserviceDescription1-id">
+      <webservice-description>
          <webservice-description-name>webserviceDescription1Name</webservice-description-name>
          <config-name>webserviceDescription1ConfigName</config-name>
          <config-file>webserviceDescription1ConfigFile</config-file>
          <wsdl-publish-location>webserviceDescription1WsdlPublishLocation</wsdl-publish-location>
       </webservice-description>
-      <webservice-description id="webserviceDescription2-id">
+      <webservice-description>
          <webservice-description-name>webserviceDescription2Name</webservice-description-name>
          <config-name>webserviceDescription2ConfigName</config-name>
          <config-file>webserviceDescription2ConfigFile</config-file>
@@ -59,72 +40,30 @@
       </webservice-description>
    </webservices>
    
-   <enterprise-beans id="enterprise-beans-id">
+   <enterprise-beans>
 
       <session>
          <ejb-name>session0EjbName</ejb-name>
       </session>
 
       <session id="session1-id">
-         <description>en-session1-desc</description>
-         <description xml:lang="fr">fr-session1-desc</description>
-         <description xml:lang="de">de-session1-desc</description>
-         <display-name>en-session1-disp</display-name>
-         <display-name xml:lang="fr">fr-session1-disp</display-name>
-         <display-name xml:lang="de">de-session1-disp</display-name>
-         <icon id="en-session1-icon-id">
-            <small-icon>en-session1-small-icon</small-icon>
-            <large-icon>en-session1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-session1-icon-id">
-            <small-icon>fr-session1-small-icon</small-icon>
-            <large-icon>fr-session1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-session1-icon-id">
-            <small-icon>de-session1-small-icon</small-icon>
-            <large-icon>de-session1-large-icon</large-icon>
-         </icon>
-
          <ejb-name>session1EjbName</ejb-name>
          
-         <remote-binding id="session1RemoteBinding-id">
-            <description>en-session1RemoteBinding-desc</description>
-            <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
-            <description xml:lang="de">de-session1RemoteBinding-desc</description>
-            <jndi-name>session1RemoteBindingJndiName</jndi-name>
-            <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
-            <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
-            <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
-         </remote-binding>
-
          <jndi-name>session1JndiName</jndi-name>
          <home-jndi-name>session1HomeJndiName</home-jndi-name>
          <local-jndi-name>session1LocalJndiName</local-jndi-name>
-         <local-home-jndi-name>session1LocalHomeJndiName</local-home-jndi-name>
          <call-by-value>true</call-by-value>
          <exception-on-rollback>true</exception-on-rollback>
          <timer-persistence>true</timer-persistence>
          <configuration-name>session1ConfigurationName</configuration-name>
          
-         <invoker-bindings id="session1InvokerBindings-id">
-            <description>en-session1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
-            <description xml:lang="de">de-session1InvokerBindings-desc</description>
-
-            <invoker id="session1Invoker1-id">
-               <description>en-session1Invoker1-desc</description>
-               <description xml:lang="fr">fr-session1Invoker1-desc</description>
-               <description xml:lang="de">de-session1Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="session1Invoker2-id">
-               <description>en-session1Invoker2-desc</description>
-               <description xml:lang="fr">fr-session1Invoker2-desc</description>
-               <description xml:lang="de">de-session1Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -133,214 +72,78 @@
          
          <security-proxy>session1SecurityProxy</security-proxy>
          
-         <ejb-ref id="session1EjbRef1-id">
-            <description>en-session1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-session1EjbRef1-desc</description>
-            <description xml:lang="de">de-session1EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="session1EjbRef2-id">
-            <description>en-session1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-session1EjbRef2-desc</description>
-            <description xml:lang="de">de-session1EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="session1EjbLocalRef1-id">
-            <description>en-session1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-session1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-session1EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>session1EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="session1EjbLocalRef2-id">
-            <description>en-session1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-session1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-session1EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session1EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>session1EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="session1ResourceRef1-id">
-            <description>en-session1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-session1ResourceRef1-desc</description>
-            <description xml:lang="de">de-session1ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>session1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="session1ResourceRef2-id">
-            <description>en-session1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-session1ResourceRef2-desc</description>
-            <description xml:lang="de">de-session1ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>session1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="session1ResourceEnvRef1-id">
-            <description>en-session1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-session1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-session1ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="session1ResourceEnvRef2-id">
-            <description>en-session1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-session1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-session1ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="session1MessageDestinationRef1-id">
-            <description>en-session1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-session1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-session1MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="session1MessageDestinationRef2-id">
-            <description>en-session1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-session1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-session1MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="session1MessageDestinationRef3-id">
-            <description>en-session1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-session1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-session1MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
-         
-         <security-identity id="session1SecurityIdentity-id">
-            <description>en-session1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-session1SecurityIdentity-desc</description>
-            <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
 
          <clustered>true</clustered>
          
-         <cluster-config id="session1ClusterConfig-id">
-            <description>en-session1ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-session1ClusterConfig-desc</description>
-            <description xml:lang="de">de-session1ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>session1ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>session1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>session1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
             <session-state-manager-jndi-name>session1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
          </cluster-config>
 
-         <security-domain>session1SecurityDomain</security-domain>
+<!--         <security-domain>session1SecurityDomain</security-domain> -->
          
-         <method-attributes id="session1MethodAttributes-id">
-            <method id="session1MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="session1MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
@@ -348,14 +151,8 @@
          <depends>session1Depends1</depends>
          <depends>session1Depends2</depends>
          
-         <ior-security-config id="session1IorSecurityConfig-id">
-            <description>en-session1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
-            <transport-config id="session1TransportConfig-id">
-               <description>en-session1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-session1TransportConfig-desc</description>
-               <description xml:lang="de">de-session1TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -363,217 +160,47 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="session1ASContext-id">
-               <description>en-session1ASContext-desc</description>
-               <description xml:lang="fr">fr-session1ASContext-desc</description>
-               <description xml:lang="de">de-session1ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>session1ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="session1SASContext-id">
-               <description>en-session1SASContext-desc</description>
-               <description xml:lang="fr">fr-session1SASContext-desc</description>
-               <description xml:lang="de">de-session1SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <port-component id="session1PortComponent-id">
+         <port-component>
             <port-component-name>session1-PortComponent</port-component-name>
             <port-component-uri>/session1/PortComponentURI</port-component-uri>
             <auth-method>BASIC</auth-method>
             <transport-guarantee>NONE</transport-guarantee>
-            <secure-wsdl-access>true</secure-wsdl-access>
+<!--            <secure-wsdl-access>true</secure-wsdl-access> -->
          </port-component>
          
-         <ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
-            <description>en-session1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
-         </ejb-timeout-identity>
-         
-         <annotation id="session1Annotation1-id">
-            <description>en-session1Annotation1-desc</description>
-            <description xml:lang="fr">fr-session1Annotation1-desc</description>
-            <description xml:lang="de">de-session1Annotation1-desc</description>
-            
-            <annotation-class>session1Annotation1Class</annotation-class>
-            <annotation-implementation-class>session1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>session1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session1Annotation1Property1-id">
-               <description>en-session1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-session1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-session1Annotation1Property1-desc</description>
-               <property-name>session1Annotation1Property1Name</property-name>
-               <property-value>session1Annotation1Property1Value</property-value>
-            </property>
-            <property id="session1Annotation1Property2-id">
-               <description>en-session1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-session1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-session1Annotation1Property2-desc</description>
-               <property-name>session1Annotation1Property2Name</property-name>
-               <property-value>session1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="session1Annotation2-id">
-            <description>en-session1Annotation2-desc</description>
-            <description xml:lang="fr">fr-session1Annotation2-desc</description>
-            <description xml:lang="de">de-session1Annotation2-desc</description>
-            
-            <annotation-class>session1Annotation2Class</annotation-class>
-            <annotation-implementation-class>session1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>session1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session1Annotation2Property1-id">
-               <description>en-session1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-session1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-session1Annotation2Property1-desc</description>
-               <property-name>session1Annotation2Property1Name</property-name>
-               <property-value>session1Annotation2Property1Value</property-value>
-            </property>
-            <property id="session1Annotation2Property2-id">
-               <description>en-session1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-session1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-session1Annotation2Property2-desc</description>
-               <property-name>session1Annotation2Property2Name</property-name>
-               <property-value>session1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="session1IgnoreDependency-id">
-            <description>en-session1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-session1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-session1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>session1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>session1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>session1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>session1AOPDomain</aop-domain-name>         
-         
-         <cache-config>
-            <cache-value>session1CacheClass</cache-value>
-            <cache-max-size>10</cache-max-size>
-            <idle-timeout-seconds>11</idle-timeout-seconds>
-            <remove-timeout-seconds>12</remove-timeout-seconds>
-            <cache-name>session1CacheName</cache-name>
-            <persistence-manager>session1PersistenceManager</persistence-manager>
-         </cache-config>
-         
-         <pool-config>
-            <pool-value>session1PoolClass</pool-value>
-            <pool-max-size>10</pool-max-size>
-            <pool-timeout>11</pool-timeout>
-         </pool-config>
-
-         <concurrent>true</concurrent>         
-         
-         <!-- TODO jndi ref -->
-         <jndi-ref id="session1JndiRef1-id">
-            <description>en-session1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-session1JndiRef1-desc</description>
-            <description xml:lang="de">de-session1JndiRef1-desc</description>
-            <jndi-ref-name>session1JndiRef1Name</jndi-ref-name>
-            <mapped-name>session1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="session1JndiRef2-id">
-            <description>en-session1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-session1JndiRef2-desc</description>
-            <description xml:lang="de">de-session1JndiRef2-desc</description>
-            <jndi-ref-name>session1JndiRef2Name</jndi-ref-name>
-            <mapped-name>session1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
+         </ejb-timeout-identity>         
       </session>
 
       <session id="session2-id">
-         <description>en-session2-desc</description>
-         <description xml:lang="fr">fr-session2-desc</description>
-         <description xml:lang="de">de-session2-desc</description>
-         <display-name>en-session2-disp</display-name>
-         <display-name xml:lang="fr">fr-session2-disp</display-name>
-         <display-name xml:lang="de">de-session2-disp</display-name>
-         <icon id="en-session2-icon-id">
-            <small-icon>en-session2-small-icon</small-icon>
-            <large-icon>en-session2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-session2-icon-id">
-            <small-icon>fr-session2-small-icon</small-icon>
-            <large-icon>fr-session2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-session2-icon-id">
-            <small-icon>de-session2-small-icon</small-icon>
-            <large-icon>de-session2-large-icon</large-icon>
-         </icon>
-
          <ejb-name>session2EjbName</ejb-name>
-         
-         <remote-binding id="session2RemoteBinding-id">
-            <description>en-session2RemoteBinding-desc</description>
-            <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
-            <description xml:lang="de">de-session2RemoteBinding-desc</description>
-            <jndi-name>session2RemoteBindingJndiName</jndi-name>
-            <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
-            <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
-            <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
-         </remote-binding>
 
          <jndi-name>session2JndiName</jndi-name>
          <home-jndi-name>session2HomeJndiName</home-jndi-name>
          <local-jndi-name>session2LocalJndiName</local-jndi-name>
-         <local-home-jndi-name>session2LocalHomeJndiName</local-home-jndi-name>
          <call-by-value>false</call-by-value>
          <exception-on-rollback>false</exception-on-rollback>
          <timer-persistence>false</timer-persistence>
          <configuration-name>session2ConfigurationName</configuration-name>
          
-         <invoker-bindings id="session2InvokerBindings-id">
-            <description>en-session2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
-            <description xml:lang="de">de-session2InvokerBindings-desc</description>
-
-            <invoker id="session2Invoker1-id">
-               <description>en-session2Invoker1-desc</description>
-               <description xml:lang="fr">fr-session2Invoker1-desc</description>
-               <description xml:lang="de">de-session2Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="session2Invoker2-id">
-               <description>en-session2Invoker2-desc</description>
-               <description xml:lang="fr">fr-session2Invoker2-desc</description>
-               <description xml:lang="de">de-session2Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -582,214 +209,78 @@
          
          <security-proxy>session2SecurityProxy</security-proxy>
          
-         <ejb-ref id="session2EjbRef1-id">
-            <description>en-session2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-session2EjbRef1-desc</description>
-            <description xml:lang="de">de-session2EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="session2EjbRef2-id">
-            <description>en-session2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-session2EjbRef2-desc</description>
-            <description xml:lang="de">de-session2EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="session2EjbLocalRef1-id">
-            <description>en-session2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-session2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-session2EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>session2EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="session2EjbLocalRef2-id">
-            <description>en-session2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-session2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-session2EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session2EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>session2EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="session2ResourceRef1-id">
-            <description>en-session2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-session2ResourceRef1-desc</description>
-            <description xml:lang="de">de-session2ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>session2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="session2ResourceRef2-id">
-            <description>en-session2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-session2ResourceRef2-desc</description>
-            <description xml:lang="de">de-session2ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>session2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="session2ResourceEnvRef1-id">
-            <description>en-session2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-session2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-session2ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="session2ResourceEnvRef2-id">
-            <description>en-session2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-session2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-session2ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="session2MessageDestinationRef1-id">
-            <description>en-session2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-session2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-session2MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="session2MessageDestinationRef2-id">
-            <description>en-session2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-session2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-session2MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="session2MessageDestinationRef3-id">
-            <description>en-session2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-session2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-session2MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <security-identity id="session2SecurityIdentity-id">
-            <description>en-session2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-session2SecurityIdentity-desc</description>
-            <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <clustered>false</clustered>
          
-         <cluster-config id="session2ClusterConfig-id">
-            <description>en-session2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-session2ClusterConfig-desc</description>
-            <description xml:lang="de">de-session2ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>session2ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>session2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>session2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
             <session-state-manager-jndi-name>session2ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
          </cluster-config>
 
-         <security-domain>session2SecurityDomain</security-domain>
+<!--         <security-domain>session2SecurityDomain</security-domain> -->
          
-         <method-attributes id="session2MethodAttributes-id">
-            <method id="session2MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="session2MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
@@ -797,14 +288,8 @@
          <depends>session2Depends1</depends>
          <depends>session2Depends2</depends>
          
-         <ior-security-config id="session2IorSecurityConfig-id">
-            <description>en-session2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
-            <transport-config id="session2TransportConfig-id">
-               <description>en-session2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-session2TransportConfig-desc</description>
-               <description xml:lang="de">de-session2TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -812,154 +297,27 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="session2ASContext-id">
-               <description>en-session2ASContext-desc</description>
-               <description xml:lang="fr">fr-session2ASContext-desc</description>
-               <description xml:lang="de">de-session2ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>session2ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="session2SASContext-id">
-               <description>en-session2SASContext-desc</description>
-               <description xml:lang="fr">fr-session2SASContext-desc</description>
-               <description xml:lang="de">de-session2SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <port-component id="session2PortComponent-id">
+         <port-component>
             <port-component-name>session2-PortComponent</port-component-name>
             <port-component-uri>/session2/PortComponentURI</port-component-uri>
             <auth-method>BASIC</auth-method>
             <transport-guarantee>NONE</transport-guarantee>
-            <secure-wsdl-access>true</secure-wsdl-access>
+<!--            <secure-wsdl-access>true</secure-wsdl-access> -->
          </port-component>         
          
-         <ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
-            <description>en-session2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
-         
-         <annotation id="session2Annotation1-id">
-            <description>en-session2Annotation1-desc</description>
-            <description xml:lang="fr">fr-session2Annotation1-desc</description>
-            <description xml:lang="de">de-session2Annotation1-desc</description>
-            
-            <annotation-class>session2Annotation1Class</annotation-class>
-            <annotation-implementation-class>session2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>session2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session2Annotation1Property1-id">
-               <description>en-session2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-session2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-session2Annotation1Property1-desc</description>
-               <property-name>session2Annotation1Property1Name</property-name>
-               <property-value>session2Annotation1Property1Value</property-value>
-            </property>
-            <property id="session2Annotation1Property2-id">
-               <description>en-session2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-session2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-session2Annotation1Property2-desc</description>
-               <property-name>session2Annotation1Property2Name</property-name>
-               <property-value>session2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="session2Annotation2-id">
-            <description>en-session2Annotation2-desc</description>
-            <description xml:lang="fr">fr-session2Annotation2-desc</description>
-            <description xml:lang="de">de-session2Annotation2-desc</description>
-            
-            <annotation-class>session2Annotation2Class</annotation-class>
-            <annotation-implementation-class>session2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>session2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session2Annotation2Property1-id">
-               <description>en-session2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-session2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-session2Annotation2Property1-desc</description>
-               <property-name>session2Annotation2Property1Name</property-name>
-               <property-value>session2Annotation2Property1Value</property-value>
-            </property>
-            <property id="session2Annotation2Property2-id">
-               <description>en-session2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-session2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-session2Annotation2Property2-desc</description>
-               <property-name>session2Annotation2Property2Name</property-name>
-               <property-value>session2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="session2IgnoreDependency-id">
-            <description>en-session2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-session2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-session2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>session2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>session2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>session2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>session2AOPDomain</aop-domain-name>         
-         
-         <cache-config>
-            <cache-value>session2CacheClass</cache-value>
-            <cache-max-size>20</cache-max-size>
-            <idle-timeout-seconds>22</idle-timeout-seconds>
-            <remove-timeout-seconds>24</remove-timeout-seconds>
-            <cache-name>session2CacheName</cache-name>
-            <persistence-manager>session2PersistenceManager</persistence-manager>
-         </cache-config>
-         
-         <pool-config>
-            <pool-value>session2PoolClass</pool-value>
-            <pool-max-size>10</pool-max-size>
-            <pool-timeout>11</pool-timeout>
-         </pool-config>
-
-         <concurrent>false</concurrent>         
-         
-         <jndi-ref id="session2JndiRef1-id">
-            <description>en-session2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-session2JndiRef1-desc</description>
-            <description xml:lang="de">de-session2JndiRef1-desc</description>
-            <jndi-ref-name>session2JndiRef1Name</jndi-ref-name>
-            <mapped-name>session2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="session2JndiRef2-id">
-            <description>en-session2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-session2JndiRef2-desc</description>
-            <description xml:lang="de">de-session2JndiRef2-desc</description>
-            <jndi-ref-name>session2JndiRef2Name</jndi-ref-name>
-            <mapped-name>session2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
       </session>
 
       <entity>
@@ -967,25 +325,6 @@
       </entity>
 
       <entity id="entity1-id">
-         <description>en-entity1-desc</description>
-         <description xml:lang="fr">fr-entity1-desc</description>
-         <description xml:lang="de">de-entity1-desc</description>
-         <display-name>en-entity1-disp</display-name>
-         <display-name xml:lang="fr">fr-entity1-disp</display-name>
-         <display-name xml:lang="de">de-entity1-disp</display-name>
-         <icon id="en-entity1-icon-id">
-            <small-icon>en-entity1-small-icon</small-icon>
-            <large-icon>en-entity1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-entity1-icon-id">
-            <small-icon>fr-entity1-small-icon</small-icon>
-            <large-icon>fr-entity1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-entity1-icon-id">
-            <small-icon>de-entity1-small-icon</small-icon>
-            <large-icon>de-entity1-large-icon</large-icon>
-         </icon>
-
          <ejb-name>entity1EjbName</ejb-name>
 
          <jndi-name>entity1JndiName</jndi-name>
@@ -996,25 +335,13 @@
          <timer-persistence>true</timer-persistence>
          <configuration-name>entity1ConfigurationName</configuration-name>
          
-         <invoker-bindings id="entity1InvokerBindings-id">
-            <description>en-entity1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-entity1InvokerBindings-desc</description>
-            <description xml:lang="de">de-entity1InvokerBindings-desc</description>
-
-            <invoker id="entity1Invoker1-id">
-               <description>en-entity1Invoker1-desc</description>
-               <description xml:lang="fr">fr-entity1Invoker1-desc</description>
-               <description xml:lang="de">de-entity1Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="entity1Invoker2-id">
-               <description>en-entity1Invoker2-desc</description>
-               <description xml:lang="fr">fr-entity1Invoker2-desc</description>
-               <description xml:lang="de">de-entity1Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -1023,222 +350,83 @@
          
          <security-proxy>entity1SecurityProxy</security-proxy>
          
-         <ejb-ref id="entity1EjbRef1-id">
-            <description>en-entity1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-entity1EjbRef1-desc</description>
-            <description xml:lang="de">de-entity1EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="entity1EjbRef2-id">
-            <description>en-entity1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-entity1EjbRef2-desc</description>
-            <description xml:lang="de">de-entity1EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="entity1EjbLocalRef1-id">
-            <description>en-entity1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-entity1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-entity1EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>entity1EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="entity1EjbLocalRef2-id">
-            <description>en-entity1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-entity1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-entity1EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>entity1EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="entity1ResourceRef1-id">
-            <description>en-entity1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
-            <description xml:lang="de">de-entity1ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>entity1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="entity1ResourceRef2-id">
-            <description>en-entity1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceRef2-desc</description>
-            <description xml:lang="de">de-entity1ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>entity1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="entity1ResourceEnvRef1-id">
-            <description>en-entity1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-entity1ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="entity1ResourceEnvRef2-id">
-            <description>en-entity1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-entity1ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="entity1MessageDestinationRef1-id">
-            <description>en-entity1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="entity1MessageDestinationRef2-id">
-            <description>en-entity1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="entity1MessageDestinationRef3-id">
-            <description>en-entity1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <method-attributes id="entity1MethodAttributes-id">
-            <method id="entity1MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="entity1MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
          
-         <security-identity id="entity1SecurityIdentity-id">
-            <description>en-entity1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
-            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <clustered>true</clustered>
          
-         <cluster-config id="entity1ClusterConfig-id">
-            <description>en-entity1ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-entity1ClusterConfig-desc</description>
-            <description xml:lang="de">de-entity1ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>entity1ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>entity1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>entity1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
          </cluster-config>
          
-         <security-domain>entity1SecurityDomain</security-domain>
+<!--         <security-domain>entity1SecurityDomain</security-domain> -->
          
          <cache-invalidation>true</cache-invalidation>
-         <cache-invalidation-config id="entity1CacheInvalidationConfig-id">
-            <description>en-entity1CacheInvalidationConfig-desc</description>
-            <description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</description>
-            <description xml:lang="de">de-entity1CacheInvalidationConfig-desc</description>
+         <cache-invalidation-config>
             <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1246,14 +434,8 @@
          <depends>entity1Depends1</depends>
          <depends>entity1Depends2</depends>
          
-         <ior-security-config id="entity1IorSecurityConfig-id">
-            <description>en-entity1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-entity1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-entity1IorSecurityConfig-desc</description>
-            <transport-config id="entity1TransportConfig-id">
-               <description>en-entity1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-entity1TransportConfig-desc</description>
-               <description xml:lang="de">de-entity1TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1261,148 +443,18 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="entity1ASContext-id">
-               <description>en-entity1ASContext-desc</description>
-               <description xml:lang="fr">fr-entity1ASContext-desc</description>
-               <description xml:lang="de">de-entity1ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>entity1ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="entity1SASContext-id">
-               <description>en-entity1SASContext-desc</description>
-               <description xml:lang="fr">fr-entity1SASContext-desc</description>
-               <description xml:lang="de">de-entity1SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
-         
-         <annotation id="entity1Annotation1-id">
-            <description>en-entity1Annotation1-desc</description>
-            <description xml:lang="fr">fr-entity1Annotation1-desc</description>
-            <description xml:lang="de">de-entity1Annotation1-desc</description>
-            
-            <annotation-class>entity1Annotation1Class</annotation-class>
-            <annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity1Annotation1Property1-id">
-               <description>en-entity1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-entity1Annotation1Property1-desc</description>
-               <property-name>entity1Annotation1Property1Name</property-name>
-               <property-value>entity1Annotation1Property1Value</property-value>
-            </property>
-            <property id="entity1Annotation1Property2-id">
-               <description>en-entity1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-entity1Annotation1Property2-desc</description>
-               <property-name>entity1Annotation1Property2Name</property-name>
-               <property-value>entity1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="entity1Annotation2-id">
-            <description>en-entity1Annotation2-desc</description>
-            <description xml:lang="fr">fr-entity1Annotation2-desc</description>
-            <description xml:lang="de">de-entity1Annotation2-desc</description>
-            
-            <annotation-class>entity1Annotation2Class</annotation-class>
-            <annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity1Annotation2Property1-id">
-               <description>en-entity1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-entity1Annotation2Property1-desc</description>
-               <property-name>entity1Annotation2Property1Name</property-name>
-               <property-value>entity1Annotation2Property1Value</property-value>
-            </property>
-            <property id="entity1Annotation2Property2-id">
-               <description>en-entity1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-entity1Annotation2Property2-desc</description>
-               <property-name>entity1Annotation2Property2Name</property-name>
-               <property-value>entity1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="entity1IgnoreDependency-id">
-            <description>en-entity1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-entity1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-entity1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>entity1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>entity1AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-         
-         <jndi-ref id="entity1JndiRef1-id">
-            <description>en-entity1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-entity1JndiRef1-desc</description>
-            <description xml:lang="de">de-entity1JndiRef1-desc</description>
-            <jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
-            <mapped-name>entity1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="entity1JndiRef2-id">
-            <description>en-entity1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-entity1JndiRef2-desc</description>
-            <description xml:lang="de">de-entity1JndiRef2-desc</description>
-            <jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
-            <mapped-name>entity1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
       </entity>
 
       <entity id="entity2-id">
-         <description>en-entity2-desc</description>
-         <description xml:lang="fr">fr-entity2-desc</description>
-         <description xml:lang="de">de-entity2-desc</description>
-         <display-name>en-entity2-disp</display-name>
-         <display-name xml:lang="fr">fr-entity2-disp</display-name>
-         <display-name xml:lang="de">de-entity2-disp</display-name>
-         <icon id="en-entity2-icon-id">
-            <small-icon>en-entity2-small-icon</small-icon>
-            <large-icon>en-entity2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-entity2-icon-id">
-            <small-icon>fr-entity2-small-icon</small-icon>
-            <large-icon>fr-entity2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-entity2-icon-id">
-            <small-icon>de-entity2-small-icon</small-icon>
-            <large-icon>de-entity2-large-icon</large-icon>
-         </icon>
-
          <ejb-name>entity2EjbName</ejb-name>
 
          <jndi-name>entity2JndiName</jndi-name>
@@ -1413,25 +465,13 @@
          <timer-persistence>false</timer-persistence>
          <configuration-name>entity2ConfigurationName</configuration-name>
          
-         <invoker-bindings id="entity2InvokerBindings-id">
-            <description>en-entity2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-entity2InvokerBindings-desc</description>
-            <description xml:lang="de">de-entity2InvokerBindings-desc</description>
-
-            <invoker id="entity2Invoker1-id">
-               <description>en-entity2Invoker1-desc</description>
-               <description xml:lang="fr">fr-entity2Invoker1-desc</description>
-               <description xml:lang="de">de-entity2Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="entity2Invoker2-id">
-               <description>en-entity2Invoker2-desc</description>
-               <description xml:lang="fr">fr-entity2Invoker2-desc</description>
-               <description xml:lang="de">de-entity2Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -1440,222 +480,83 @@
          
          <security-proxy>entity2SecurityProxy</security-proxy>
          
-         <ejb-ref id="entity2EjbRef1-id">
-            <description>en-entity2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-entity2EjbRef1-desc</description>
-            <description xml:lang="de">de-entity2EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="entity2EjbRef2-id">
-            <description>en-entity2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-entity2EjbRef2-desc</description>
-            <description xml:lang="de">de-entity2EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="entity2EjbLocalRef1-id">
-            <description>en-entity2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-entity2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-entity2EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>entity2EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="entity2EjbLocalRef2-id">
-            <description>en-entity2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-entity2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-entity2EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>entity2EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="entity2ResourceRef1-id">
-            <description>en-entity2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
-            <description xml:lang="de">de-entity2ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>entity2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="entity2ResourceRef2-id">
-            <description>en-entity2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceRef2-desc</description>
-            <description xml:lang="de">de-entity2ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>entity2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="entity2ResourceEnvRef1-id">
-            <description>en-entity2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-entity2ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="entity2ResourceEnvRef2-id">
-            <description>en-entity2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-entity2ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="entity2MessageDestinationRef1-id">
-            <description>en-entity2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="entity2MessageDestinationRef2-id">
-            <description>en-entity2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="entity2MessageDestinationRef3-id">
-            <description>en-entity2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <method-attributes id="entity2MethodAttributes-id">
-            <method id="entity2MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="entity2MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
-         
-         <security-identity id="entity2SecurityIdentity-id">
-            <description>en-entity2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
-            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
 
          <clustered>false</clustered>
          
-         <cluster-config id="entity2ClusterConfig-id">
-            <description>en-entity2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-entity2ClusterConfig-desc</description>
-            <description xml:lang="de">de-entity2ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>entity2ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>entity2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>entity2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
          </cluster-config>
          
-         <security-domain>entity2SecurityDomain</security-domain>
+<!--         <security-domain>entity2SecurityDomain</security-domain> -->
 
          <cache-invalidation>false</cache-invalidation>
-         <cache-invalidation-config id="entity2CacheInvalidationConfig-id">
-            <description>en-entity2CacheInvalidationConfig-desc</description>
-            <description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</description>
-            <description xml:lang="de">de-entity2CacheInvalidationConfig-desc</description>
+         <cache-invalidation-config>
             <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1663,14 +564,8 @@
          <depends>entity2Depends1</depends>
          <depends>entity2Depends2</depends>
          
-         <ior-security-config id="entity2IorSecurityConfig-id">
-            <description>en-entity2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-entity2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-entity2IorSecurityConfig-desc</description>
-            <transport-config id="entity2TransportConfig-id">
-               <description>en-entity2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-entity2TransportConfig-desc</description>
-               <description xml:lang="de">de-entity2TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1678,126 +573,15 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="entity2ASContext-id">
-               <description>en-entity2ASContext-desc</description>
-               <description xml:lang="fr">fr-entity2ASContext-desc</description>
-               <description xml:lang="de">de-entity2ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>entity2ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="entity2SASContext-id">
-               <description>en-entity2SASContext-desc</description>
-               <description xml:lang="fr">fr-entity2SASContext-desc</description>
-               <description xml:lang="de">de-entity2SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
-         </ior-security-config>
-         
-         <annotation id="entity2Annotation1-id">
-            <description>en-entity2Annotation1-desc</description>
-            <description xml:lang="fr">fr-entity2Annotation1-desc</description>
-            <description xml:lang="de">de-entity2Annotation1-desc</description>
-            
-            <annotation-class>entity2Annotation1Class</annotation-class>
-            <annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity2Annotation1Property1-id">
-               <description>en-entity2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-entity2Annotation1Property1-desc</description>
-               <property-name>entity2Annotation1Property1Name</property-name>
-               <property-value>entity2Annotation1Property1Value</property-value>
-            </property>
-            <property id="entity2Annotation1Property2-id">
-               <description>en-entity2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-entity2Annotation1Property2-desc</description>
-               <property-name>entity2Annotation1Property2Name</property-name>
-               <property-value>entity2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="entity2Annotation2-id">
-            <description>en-entity2Annotation2-desc</description>
-            <description xml:lang="fr">fr-entity2Annotation2-desc</description>
-            <description xml:lang="de">de-entity2Annotation2-desc</description>
-            
-            <annotation-class>entity2Annotation2Class</annotation-class>
-            <annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity2Annotation2Property1-id">
-               <description>en-entity2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-entity2Annotation2Property1-desc</description>
-               <property-name>entity2Annotation2Property1Name</property-name>
-               <property-value>entity2Annotation2Property1Value</property-value>
-            </property>
-            <property id="entity2Annotation2Property2-id">
-               <description>en-entity2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-entity2Annotation2Property2-desc</description>
-               <property-name>entity2Annotation2Property2Name</property-name>
-               <property-value>entity2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="entity2IgnoreDependency-id">
-            <description>en-entity2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-entity2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-entity2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>entity2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>entity2AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-         
-         <jndi-ref id="entity2JndiRef1-id">
-            <description>en-entity2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-entity2JndiRef1-desc</description>
-            <description xml:lang="de">de-entity2JndiRef1-desc</description>
-            <jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
-            <mapped-name>entity2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="entity2JndiRef2-id">
-            <description>en-entity2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-entity2JndiRef2-desc</description>
-            <description xml:lang="de">de-entity2JndiRef2-desc</description>
-            <jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
-            <mapped-name>entity2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
+         </ior-security-config>         
       </entity>
 
       <message-driven>
@@ -1805,25 +589,6 @@
       </message-driven>
 
       <message-driven id="mdb1-id">
-         <description>en-mdb1-desc</description>
-         <description xml:lang="fr">fr-mdb1-desc</description>
-         <description xml:lang="de">de-mdb1-desc</description>
-         <display-name>en-mdb1-disp</display-name>
-         <display-name xml:lang="fr">fr-mdb1-disp</display-name>
-         <display-name xml:lang="de">de-mdb1-disp</display-name>
-         <icon id="en-mdb1-icon-id">
-            <small-icon>en-mdb1-small-icon</small-icon>
-            <large-icon>en-mdb1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-mdb1-icon-id">
-            <small-icon>fr-mdb1-small-icon</small-icon>
-            <large-icon>fr-mdb1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-mdb1-icon-id">
-            <small-icon>de-mdb1-small-icon</small-icon>
-            <large-icon>de-mdb1-large-icon</large-icon>
-         </icon>
-
          <ejb-name>mdb1EjbName</ejb-name>
 
          <destination-jndi-name>mdb1DestinationJndiName</destination-jndi-name>
@@ -1837,25 +602,13 @@
          <timer-persistence>true</timer-persistence>
          <configuration-name>mdb1ConfigurationName</configuration-name>
          
-         <invoker-bindings id="mdb1InvokerBindings-id">
-            <description>en-mdb1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-mdb1InvokerBindings-desc</description>
-            <description xml:lang="de">de-mdb1InvokerBindings-desc</description>
-
-            <invoker id="mdb1Invoker1-id">
-               <description>en-mdb1Invoker1-desc</description>
-               <description xml:lang="fr">fr-mdb1Invoker1-desc</description>
-               <description xml:lang="de">de-mdb1Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="mdb1Invoker2-id">
-               <description>en-mdb1Invoker2-desc</description>
-               <description xml:lang="fr">fr-mdb1Invoker2-desc</description>
-               <description xml:lang="de">de-mdb1Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -1864,215 +617,64 @@
          
          <security-proxy>mdb1SecurityProxy</security-proxy>
          
-         <ejb-ref id="mdb1EjbRef1-id">
-            <description>en-mdb1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbRef1-desc</description>
-            <description xml:lang="de">de-mdb1EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="mdb1EjbRef2-id">
-            <description>en-mdb1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbRef2-desc</description>
-            <description xml:lang="de">de-mdb1EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="mdb1EjbLocalRef1-id">
-            <description>en-mdb1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-mdb1EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>mdb1EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="mdb1EjbLocalRef2-id">
-            <description>en-mdb1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-mdb1EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb1EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>mdb1EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="mdb1ResourceRef1-id">
-            <description>en-mdb1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
-            <description xml:lang="de">de-mdb1ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>mdb1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="mdb1ResourceRef2-id">
-            <description>en-mdb1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceRef2-desc</description>
-            <description xml:lang="de">de-mdb1ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>mdb1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="mdb1ResourceEnvRef1-id">
-            <description>en-mdb1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-mdb1ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="mdb1ResourceEnvRef2-id">
-            <description>en-mdb1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-mdb1ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="mdb1MessageDestinationRef1-id">
-            <description>en-mdb1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-mdb1MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="mdb1MessageDestinationRef2-id">
-            <description>en-mdb1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-mdb1MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="mdb1MessageDestinationRef3-id">
-            <description>en-mdb1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-mdb1MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
-         
-         <method-attributes id="mdb1MethodAttributes-id">
-            <method id="mdb1MethodAttributesMethod1-id">
-               <method-name>get*</method-name>
-               <read-only>true</read-only>
-               <idempotent>true</idempotent>
-               <transaction-timeout>5000</transaction-timeout>
-            </method>
-            <method id="mdb1MethodAttributesMethod2-id">
-               <method-name>*</method-name>
-            </method>
-         </method-attributes>
-         
-         <security-identity id="mdb1SecurityIdentity-id">
-            <description>en-mdb1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
-            <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
+                  
          <depends>mdb1Depends1</depends>
          <depends>mdb1Depends2</depends>
          
-         <ior-security-config id="mdb1IorSecurityConfig-id">
-            <description>en-mdb1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-mdb1IorSecurityConfig-desc</description>
-            <transport-config id="mdb1TransportConfig-id">
-               <description>en-mdb1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-mdb1TransportConfig-desc</description>
-               <description xml:lang="de">de-mdb1TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2080,163 +682,23 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="mdb1ASContext-id">
-               <description>en-mdb1ASContext-desc</description>
-               <description xml:lang="fr">fr-mdb1ASContext-desc</description>
-               <description xml:lang="de">de-mdb1ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>mdb1ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="mdb1SASContext-id">
-               <description>en-mdb1SASContext-desc</description>
-               <description xml:lang="fr">fr-mdb1SASContext-desc</description>
-               <description xml:lang="de">de-mdb1SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <ejb-timeout-identity id="mdb1EjbTimeoutIdentity-id">
-            <description>en-mdb1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>mdb1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
          
-         <annotation id="mdb1Annotation1-id">
-            <description>en-mdb1Annotation1-desc</description>
-            <description xml:lang="fr">fr-mdb1Annotation1-desc</description>
-            <description xml:lang="de">de-mdb1Annotation1-desc</description>
-            
-            <annotation-class>mdb1Annotation1Class</annotation-class>
-            <annotation-implementation-class>mdb1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb1Annotation1Property1-id">
-               <description>en-mdb1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-mdb1Annotation1Property1-desc</description>
-               <property-name>mdb1Annotation1Property1Name</property-name>
-               <property-value>mdb1Annotation1Property1Value</property-value>
-            </property>
-            <property id="mdb1Annotation1Property2-id">
-               <description>en-mdb1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-mdb1Annotation1Property2-desc</description>
-               <property-name>mdb1Annotation1Property2Name</property-name>
-               <property-value>mdb1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="mdb1Annotation2-id">
-            <description>en-mdb1Annotation2-desc</description>
-            <description xml:lang="fr">fr-mdb1Annotation2-desc</description>
-            <description xml:lang="de">de-mdb1Annotation2-desc</description>
-            
-            <annotation-class>mdb1Annotation2Class</annotation-class>
-            <annotation-implementation-class>mdb1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb1Annotation2Property1-id">
-               <description>en-mdb1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-mdb1Annotation2Property1-desc</description>
-               <property-name>mdb1Annotation2Property1Name</property-name>
-               <property-value>mdb1Annotation2Property1Value</property-value>
-            </property>
-            <property id="mdb1Annotation2Property2-id">
-               <description>en-mdb1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-mdb1Annotation2Property2-desc</description>
-               <property-name>mdb1Annotation2Property2Name</property-name>
-               <property-value>mdb1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="mdb1IgnoreDependency-id">
-            <description>en-mdb1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-mdb1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-mdb1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>mdb1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>mdb1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>mdb1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>mdb1AOPDomain</aop-domain-name>         
-         
-         <!-- TODO pool config -->
-
-         <jndi-ref id="mdb1JndiRef1-id">
-            <description>en-mdb1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1JndiRef1-desc</description>
-            <description xml:lang="de">de-mdb1JndiRef1-desc</description>
-            <jndi-ref-name>mdb1JndiRef1Name</jndi-ref-name>
-            <mapped-name>mdb1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="mdb1JndiRef2-id">
-            <description>en-mdb1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1JndiRef2-desc</description>
-            <description xml:lang="de">de-mdb1JndiRef2-desc</description>
-            <jndi-ref-name>mdb1JndiRef2Name</jndi-ref-name>
-            <mapped-name>mdb1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         
-         <default-activation-config id="mdb1DefaultActivationConfig-id">
-            <activation-config-property id="mdb1DefaultActivationConfigProperty1-id">
-               <activation-config-property-name>mdb1DefaultActivationConfigProperty1Name</activation-config-property-name>
-               <activation-config-property-value>mdb1DefaultActivationConfigProperty1Value</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property id="mdb1DefaultActivationConfigProperty2-id">
-               <activation-config-property-name>mdb1DefaultActivationConfigProperty2Name</activation-config-property-name>
-               <activation-config-property-value>mdb1DefaultActivationConfigProperty2Value</activation-config-property-value>
-            </activation-config-property>
-         </default-activation-config>
-
       </message-driven>
 
       <message-driven id="mdb2-id">
-         <description>en-mdb2-desc</description>
-         <description xml:lang="fr">fr-mdb2-desc</description>
-         <description xml:lang="de">de-mdb2-desc</description>
-         <display-name>en-mdb2-disp</display-name>
-         <display-name xml:lang="fr">fr-mdb2-disp</display-name>
-         <display-name xml:lang="de">de-mdb2-disp</display-name>
-         <icon id="en-mdb2-icon-id">
-            <small-icon>en-mdb2-small-icon</small-icon>
-            <large-icon>en-mdb2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-mdb2-icon-id">
-            <small-icon>fr-mdb2-small-icon</small-icon>
-            <large-icon>fr-mdb2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-mdb2-icon-id">
-            <small-icon>de-mdb2-small-icon</small-icon>
-            <large-icon>de-mdb2-large-icon</large-icon>
-         </icon>
 
          <ejb-name>mdb2EjbName</ejb-name>
 
@@ -2251,25 +713,13 @@
          <timer-persistence>false</timer-persistence>
          <configuration-name>mdb2ConfigurationName</configuration-name>
          
-         <invoker-bindings id="mdb2InvokerBindings-id">
-            <description>en-mdb2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-mdb2InvokerBindings-desc</description>
-            <description xml:lang="de">de-mdb2InvokerBindings-desc</description>
-
-            <invoker id="mdb2Invoker1-id">
-               <description>en-mdb2Invoker1-desc</description>
-               <description xml:lang="fr">fr-mdb2Invoker1-desc</description>
-               <description xml:lang="de">de-mdb2Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="mdb2Invoker2-id">
-               <description>en-mdb2Invoker2-desc</description>
-               <description xml:lang="fr">fr-mdb2Invoker2-desc</description>
-               <description xml:lang="de">de-mdb2Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -2278,215 +728,64 @@
          
          <security-proxy>mdb2SecurityProxy</security-proxy>
          
-         <ejb-ref id="mdb2EjbRef1-id">
-            <description>en-mdb2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbRef1-desc</description>
-            <description xml:lang="de">de-mdb2EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="mdb2EjbRef2-id">
-            <description>en-mdb2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbRef2-desc</description>
-            <description xml:lang="de">de-mdb2EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="mdb2EjbLocalRef1-id">
-            <description>en-mdb2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-mdb2EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>mdb2EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="mdb2EjbLocalRef2-id">
-            <description>en-mdb2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-mdb2EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb2EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>mdb2EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="mdb2ResourceRef1-id">
-            <description>en-mdb2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
-            <description xml:lang="de">de-mdb2ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>mdb2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="mdb2ResourceRef2-id">
-            <description>en-mdb2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceRef2-desc</description>
-            <description xml:lang="de">de-mdb2ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>mdb2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="mdb2ResourceEnvRef1-id">
-            <description>en-mdb2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-mdb2ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="mdb2ResourceEnvRef2-id">
-            <description>en-mdb2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-mdb2ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="mdb2MessageDestinationRef1-id">
-            <description>en-mdb2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-mdb2MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="mdb2MessageDestinationRef2-id">
-            <description>en-mdb2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-mdb2MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="mdb2MessageDestinationRef3-id">
-            <description>en-mdb2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-mdb2MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
-
-         <method-attributes id="mdb2MethodAttributes-id">
-            <method id="mdb2MethodAttributesMethod1-id">
-               <method-name>get*</method-name>
-               <read-only>true</read-only>
-               <idempotent>true</idempotent>
-               <transaction-timeout>5000</transaction-timeout>
-            </method>
-            <method id="mdb2MethodAttributesMethod2-id">
-               <method-name>*</method-name>
-            </method>
-         </method-attributes>
          
-         <security-identity id="mdb2SecurityIdentity-id">
-            <description>en-mdb2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
-            <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <depends>mdb2Depends1</depends>
          <depends>mdb2Depends2</depends>
          
-         <ior-security-config id="mdb2IorSecurityConfig-id">
-            <description>en-mdb2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-mdb2IorSecurityConfig-desc</description>
-            <transport-config id="mdb2TransportConfig-id">
-               <description>en-mdb2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-mdb2TransportConfig-desc</description>
-               <description xml:lang="de">de-mdb2TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2494,249 +793,88 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="mdb2ASContext-id">
-               <description>en-mdb2ASContext-desc</description>
-               <description xml:lang="fr">fr-mdb2ASContext-desc</description>
-               <description xml:lang="de">de-mdb2ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>mdb2ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="mdb2SASContext-id">
-               <description>en-mdb2SASContext-desc</description>
-               <description xml:lang="fr">fr-mdb2SASContext-desc</description>
-               <description xml:lang="de">de-mdb2SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <ejb-timeout-identity id="mdb2EjbTimeoutIdentity-id">
-            <description>en-mdb2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>mdb2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
-         
-         <annotation id="mdb2Annotation1-id">
-            <description>en-mdb2Annotation1-desc</description>
-            <description xml:lang="fr">fr-mdb2Annotation1-desc</description>
-            <description xml:lang="de">de-mdb2Annotation1-desc</description>
-            
-            <annotation-class>mdb2Annotation1Class</annotation-class>
-            <annotation-implementation-class>mdb2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb2Annotation1Property1-id">
-               <description>en-mdb2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-mdb2Annotation1Property1-desc</description>
-               <property-name>mdb2Annotation1Property1Name</property-name>
-               <property-value>mdb2Annotation1Property1Value</property-value>
-            </property>
-            <property id="mdb2Annotation1Property2-id">
-               <description>en-mdb2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-mdb2Annotation1Property2-desc</description>
-               <property-name>mdb2Annotation1Property2Name</property-name>
-               <property-value>mdb2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="mdb2Annotation2-id">
-            <description>en-mdb2Annotation2-desc</description>
-            <description xml:lang="fr">fr-mdb2Annotation2-desc</description>
-            <description xml:lang="de">de-mdb2Annotation2-desc</description>
-            
-            <annotation-class>mdb2Annotation2Class</annotation-class>
-            <annotation-implementation-class>mdb2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb2Annotation2Property1-id">
-               <description>en-mdb2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-mdb2Annotation2Property1-desc</description>
-               <property-name>mdb2Annotation2Property1Name</property-name>
-               <property-value>mdb2Annotation2Property1Value</property-value>
-            </property>
-            <property id="mdb2Annotation2Property2-id">
-               <description>en-mdb2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-mdb2Annotation2Property2-desc</description>
-               <property-name>mdb2Annotation2Property2Name</property-name>
-               <property-value>mdb2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="mdb2IgnoreDependency-id">
-            <description>en-mdb2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-mdb2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-mdb2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>mdb2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>mdb2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>mdb2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>mdb2AOPDomain</aop-domain-name>         
-         
-         <!-- TODO pool config -->
-
-         <jndi-ref id="mdb2JndiRef1-id">
-            <description>en-mdb2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2JndiRef1-desc</description>
-            <description xml:lang="de">de-mdb2JndiRef1-desc</description>
-            <jndi-ref-name>mdb2JndiRef1Name</jndi-ref-name>
-            <mapped-name>mdb2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="mdb2JndiRef2-id">
-            <description>en-mdb2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2JndiRef2-desc</description>
-            <description xml:lang="de">de-mdb2JndiRef2-desc</description>
-            <jndi-ref-name>mdb2JndiRef2Name</jndi-ref-name>
-            <mapped-name>mdb2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         
-         <default-activation-config id="mdb2DefaultActivationConfig-id">
-            <activation-config-property id="mdb2DefaultActivationConfigProperty1-id">
-               <activation-config-property-name>mdb2DefaultActivationConfigProperty1Name</activation-config-property-name>
-               <activation-config-property-value>mdb2DefaultActivationConfigProperty1Value</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property id="mdb2DefaultActivationConfigProperty2-id">
-               <activation-config-property-name>mdb2DefaultActivationConfigProperty2Name</activation-config-property-name>
-               <activation-config-property-value>mdb2DefaultActivationConfigProperty2Value</activation-config-property-value>
-            </activation-config-property>
-         </default-activation-config>
-
       </message-driven>
 
    </enterprise-beans>
 
-   <assembly-descriptor id="assembly-descriptor-id">
+   <assembly-descriptor>
 
-      <security-role id="securityRole1-id">
-         <description>en-securityRole1-desc</description>
-         <description xml:lang="fr">fr-securityRole1-desc</description>
-         <description xml:lang="de">de-securityRole1-desc</description>
+      <security-role>
          <role-name>securityRoleRef1RoleLink</role-name>
          <principal-name>securityRole1Principal1</principal-name>
          <principal-name>securityRole1Principal2</principal-name>
       </security-role>
-      <security-role id="securityRole2-id">
-         <description>en-securityRole2-desc</description>
-         <description xml:lang="fr">fr-securityRole2-desc</description>
-         <description xml:lang="de">de-securityRole2-desc</description>
+      <security-role>
          <role-name>securityRoleRef2RoleLink</role-name>
          <principal-name>securityRole2Principal1</principal-name>
          <principal-name>securityRole2Principal2</principal-name>
       </security-role>
 
-      <message-destination id="messageDestination1-id">
-         <description>en-messageDestination1-desc</description>
-         <description xml:lang="fr">fr-messageDestination1-desc</description>
-         <description xml:lang="de">de-messageDestination1-desc</description>
-         <display-name>en-messageDestination1-disp</display-name>
-         <display-name xml:lang="fr">fr-messageDestination1-disp</display-name>
-         <display-name xml:lang="de">de-messageDestination1-disp</display-name>
-         <icon id="en-messageDestination1-icon-id">
-            <small-icon>en-messageDestination1-small-icon</small-icon>
-            <large-icon>en-messageDestination1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-messageDestination1-icon-id">
-            <small-icon>fr-messageDestination1-small-icon</small-icon>
-            <large-icon>fr-messageDestination1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-messageDestination1-icon-id">
-            <small-icon>de-messageDestination1-small-icon</small-icon>
-            <large-icon>de-messageDestination1-large-icon</large-icon>
-         </icon>
+      <message-destination>
          <message-destination-name>messageDestination1Name</message-destination-name>
          <jndi-name>messageDestination1JndiName</jndi-name>
       </message-destination>
-      <message-destination id="messageDestination2-id">
-         <description>en-messageDestination2-desc</description>
-         <description xml:lang="fr">fr-messageDestination2-desc</description>
-         <description xml:lang="de">de-messageDestination2-desc</description>
-         <display-name>en-messageDestination2-disp</display-name>
-         <display-name xml:lang="fr">fr-messageDestination2-disp</display-name>
-         <display-name xml:lang="de">de-messageDestination2-disp</display-name>
-         <icon id="en-messageDestination2-icon-id">
-            <small-icon>en-messageDestination2-small-icon</small-icon>
-            <large-icon>en-messageDestination2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-messageDestination2-icon-id">
-            <small-icon>fr-messageDestination2-small-icon</small-icon>
-            <large-icon>fr-messageDestination2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-messageDestination2-icon-id">
-            <small-icon>de-messageDestination2-small-icon</small-icon>
-            <large-icon>de-messageDestination2-large-icon</large-icon>
-         </icon>
+      <message-destination>
          <message-destination-name>messageDestination2Name</message-destination-name>
          <jndi-name>messageDestination2JndiName</jndi-name>
       </message-destination>
 
    </assembly-descriptor>
 
-   <resource-managers id="resource-managers-id">
-      <description>en-resource-managers-desc</description>
-      <description xml:lang="fr">fr-resource-managers-desc</description>
-      <description xml:lang="de">de-resource-managers-desc</description>
-      <resource-manager id="resourceManager1-id" res-class="resourceManager1Class">
-         <description>en-resourceManager1-desc</description>
-         <description xml:lang="fr">fr-resourceManager1-desc</description>
-         <description xml:lang="de">de-resourceManager1-desc</description>
+   <resource-managers>
+      <resource-manager>
          <res-name>resourceManager1Name</res-name>
          <res-jndi-name>resourceManager1JndiName</res-jndi-name>
       </resource-manager>
-      <resource-manager id="resourceManager2-id" res-class="resourceManager2Class">
-         <description>en-resourceManager2-desc</description>
-         <description xml:lang="fr">fr-resourceManager2-desc</description>
-         <description xml:lang="de">de-resourceManager2-desc</description>
+      <resource-manager>
          <res-name>resourceManager2Name</res-name>
          <res-url>resourceManager2URL</res-url>
       </resource-manager>
    </resource-managers>
    
-   <invoker-proxy-bindings id="invoker-proxy-bindings-id">
-      <description>en-invoker-proxy-bindings-desc</description>
-      <description xml:lang="fr">fr-invoker-proxy-bindings-desc</description>
-      <description xml:lang="de">de-invoker-proxy-bindings-desc</description>
-      <invoker-proxy-binding id="invokerProxyBinding1-id">
-         <description>en-invokerProxyBinding1-desc</description>
-         <description xml:lang="fr">fr-invokerProxyBinding1-desc</description>
-         <description xml:lang="de">de-invokerProxyBinding1-desc</description>
-         <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+   <invoker-proxy-bindings>
+      <invoker-proxy-binding>
+         <name>invokerProxyBinding1Name</name>
          <invoker-mbean>invokerProxyBinding1InvokerMBean</invoker-mbean>
          <proxy-factory>invokerProxyBinding1ProxyFactory</proxy-factory>
+         <proxy-factory-config>
+            <client-interceptors>
+               <home>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.HomeInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.HomeInterceptorcbvt4.1</interceptor>
+               </home>
+               <bean>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.BeanInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.BeanInterceptorcbvt4.1</interceptor>
+               </bean>
+               <list-entity>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.EntityInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.EntityInterceptorcbvt4.1</interceptor>
+               </list-entity>
+            </client-interceptors>
+         </proxy-factory-config>
       </invoker-proxy-binding>
-      <invoker-proxy-binding id="invokerProxyBinding2-id">
-         <description>en-invokerProxyBinding2-desc</description>
-         <description xml:lang="fr">fr-invokerProxyBinding2-desc</description>
-         <description xml:lang="de">de-invokerProxyBinding2-desc</description>
-         <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+      <invoker-proxy-binding>
+         <name>invokerProxyBinding2Name</name>
          <invoker-mbean>invokerProxyBinding2InvokerMBean</invoker-mbean>
          <proxy-factory>invokerProxyBinding2ProxyFactory</proxy-factory>
          <proxy-factory-config>
@@ -2761,16 +899,10 @@
                </list-entity>
             </client-interceptors>
          </proxy-factory-config>
-         <!-- Unknown element to test duplicate wildcards -->
-         <wildcard />
       </invoker-proxy-binding>
    </invoker-proxy-bindings>   
    
-   <container-configurations id="container-configurations-id">
-      <description>en-container-configurations-desc</description>
-      <description xml:lang="fr">fr-container-configurations-desc</description>
-      <description xml:lang="de">de-container-configurations-desc</description>
-
+   <container-configurations>
       <container-configuration>
          <container-name>Standard Stateless SessionBean</container-name>
       </container-configuration>
@@ -2809,14 +941,11 @@
       <container-configuration>
          <container-name>containerConfiguration0Name</container-name>
       </container-configuration>
-      <container-configuration id="containerConfiguration1-id" extends="containerConfiguration1Extends">
-         <description>en-containerConfiguration1-desc</description>
-         <description xml:lang="fr">fr-containerConfiguration1-desc</description>
-         <description xml:lang="de">de-containerConfiguration1-desc</description>
+      <container-configuration extends="containerConfiguration1Extends">
          <container-name>containerConfiguration1Name</container-name>
          <call-logging>true</call-logging>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1</invoker-proxy-binding-name>
-         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2</invoker-proxy-binding-name> -->
          <sync-on-commit-only>true</sync-on-commit-only>
          <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
          <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
@@ -2850,17 +979,14 @@
 	          <cache-load-factor>0.75</cache-load-factor>
 	        </cache-policy-conf>
 	      </container-cache-conf>
-         <container-pool-conf id="containerConfiguration1-pool-conf">
+         <container-pool-conf>
            <MaximumSize>100</MaximumSize>
          </container-pool-conf>
 
          <commit-option>D</commit-option>
          <optiond-refresh-rate>10</optiond-refresh-rate>
          <security-domain>containerConfiguration1SecurityDomain</security-domain>
-         <cluster-config id="containerConfiguration1ClusterConfig-id">
-            <description>en-containerConfiguration1ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-containerConfiguration1ClusterConfig-desc</description>
-            <description xml:lang="de">de-containerConfiguration1ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>containerConfiguration1ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>containerConfiguration1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>containerConfiguration1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
@@ -2869,14 +995,11 @@
          <depends>containerConfiguration1Depends1</depends>
          <depends>containerConfiguration1Depends2</depends>
       </container-configuration>
-      <container-configuration id="containerConfiguration2-id" extends="containerConfiguration2Extends">
-         <description>en-containerConfiguration2-desc</description>
-         <description xml:lang="fr">fr-containerConfiguration2-desc</description>
-         <description xml:lang="de">de-containerConfiguration2-desc</description>
+      <container-configuration extends="containerConfiguration2Extends">
          <container-name>containerConfiguration2Name</container-name>
          <call-logging>false</call-logging>
          <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
-         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name> -->
          <sync-on-commit-only>false</sync-on-commit-only>
          <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
          <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
@@ -2910,16 +1033,13 @@
                <cache-load-factor>0.75</cache-load-factor>
             </cache-policy-conf>
          </container-cache-conf>
-         <container-pool-conf id="containerConfiguration2-pool-conf">
+         <container-pool-conf>
             <MaximumSize>100</MaximumSize>
          </container-pool-conf>
          <commit-option>D</commit-option>
          <optiond-refresh-rate>10</optiond-refresh-rate>
          <security-domain>containerConfiguration2SecurityDomain</security-domain>
-         <cluster-config id="containerConfiguration2ClusterConfig-id">
-            <description>en-containerConfiguration2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</description>
-            <description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>containerConfiguration2ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>containerConfiguration2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>containerConfiguration2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigBase.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigBase.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigBase.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -2,13 +2,12 @@
 
 <!-- A mock jboss5 standardjboss.xml that just has a couple cluster-config elements -->
 
-<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
-       xmlns:jee="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-       version="3.0"
-       id="jboss-id">        
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
 
+<jboss>         
+
   <container-configurations>
 
     <container-configuration>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigOverride.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigOverride.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testClusterConfigOverride.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -2,14 +2,15 @@
 <!-- $Id:$
 Test of overriding one jboss.xml with another
 -->
-<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
-       xmlns:jee="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-       version="5.0"
-       id="jboss-id-override">
+
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<jboss>         
+
          
-   <enterprise-beans id="enterprise-beans-id">
+   <enterprise-beans>
 
       <session id="bean1-id">         
          <ejb-name>bean1EjbName</ejb-name>         
@@ -50,7 +51,7 @@
    </enterprise-beans>
   
    
-   <container-configurations id="container-configurations-id-override">
+   <container-configurations>
    
       <!-- Each of these configurations overrides a config in 
            JBoss5xEverything_testClusterConfigBase.xml, but does not

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -986,868 +986,6 @@
 
       </session>
 
-      <entity>
-         <ejb-name>entity0EjbName</ejb-name>
-      </entity>
-
-      <entity id="entity1-id">
-         <description>en-entity1-desc</description>
-         <description xml:lang="fr">fr-entity1-desc</description>
-         <description xml:lang="de">de-entity1-desc</description>
-         <display-name>en-entity1-disp</display-name>
-         <display-name xml:lang="fr">fr-entity1-disp</display-name>
-         <display-name xml:lang="de">de-entity1-disp</display-name>
-         <icon id="en-entity1-icon-id">
-            <small-icon>en-entity1-small-icon</small-icon>
-            <large-icon>en-entity1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-entity1-icon-id">
-            <small-icon>fr-entity1-small-icon</small-icon>
-            <large-icon>fr-entity1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-entity1-icon-id">
-            <small-icon>de-entity1-small-icon</small-icon>
-            <large-icon>de-entity1-large-icon</large-icon>
-         </icon>
-
-         <ejb-name>entity1EjbName</ejb-name>
-
-         <jndi-name>entity1JndiName</jndi-name>
-         <local-jndi-name>entity1LocalJndiName</local-jndi-name>
-         <call-by-value>true</call-by-value>
-         <read-only>true</read-only>
-         <exception-on-rollback>true</exception-on-rollback>
-         <timer-persistence>true</timer-persistence>
-         <configuration-name>entity1ConfigurationName</configuration-name>
-         
-         <invoker-bindings id="entity1InvokerBindings-id">
-            <description>en-entity1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-entity1InvokerBindings-desc</description>
-            <description xml:lang="de">de-entity1InvokerBindings-desc</description>
-
-            <invoker id="entity1Invoker1-id">
-               <description>en-entity1Invoker1-desc</description>
-               <description xml:lang="fr">fr-entity1Invoker1-desc</description>
-               <description xml:lang="de">de-entity1Invoker1-desc</description>
-               
-               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
-               <jndi-name>entity1Invoker1JndiName</jndi-name>
-
-               <ejb-ref>
-                  <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
-                  <jndi-name>entity1Invoker1EjbName1</jndi-name>
-               </ejb-ref>
-            </invoker>
-            <invoker id="entity1Invoker2-id">
-               <description>en-entity1Invoker2-desc</description>
-               <description xml:lang="fr">fr-entity1Invoker2-desc</description>
-               <description xml:lang="de">de-entity1Invoker2-desc</description>
-               
-               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
-               <jndi-name>entity1Invoker2JndiName</jndi-name>
-
-               <ejb-ref>
-                  <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
-                  <jndi-name>entity1Invoker2EjbName1</jndi-name>
-               </ejb-ref>
-               <ejb-ref>
-                  <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
-                  <jndi-name>entity1Invoker2EjbName2</jndi-name>
-               </ejb-ref>
-            </invoker>
-         </invoker-bindings>
-         
-         <security-proxy>entity1SecurityProxy</security-proxy>
-         
-         <ejb-ref id="entity1EjbRef1-id">
-            <description>en-entity1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-entity1EjbRef1-desc</description>
-            <description xml:lang="de">de-entity1EjbRef1-desc</description>
-
-            <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </ejb-ref>
-         <ejb-ref id="entity1EjbRef2-id">
-            <description>en-entity1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-entity1EjbRef2-desc</description>
-            <description xml:lang="de">de-entity1EjbRef2-desc</description>
-
-            <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbRef2JndiName</jndi-name>
-         </ejb-ref>
-
-         <ejb-local-ref id="entity1EjbLocalRef1-id">
-            <description>en-entity1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-entity1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-entity1EjbLocalRef1-desc</description>
-
-            <ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </ejb-local-ref>
-         <ejb-local-ref id="entity1EjbLocalRef2-id">
-            <description>en-entity1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-entity1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-entity1EjbLocalRef2-desc</description>
-
-            <ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbLocalRef2JndiName</jndi-name>
-         </ejb-local-ref>
-
-         <!-- TODO service-ref -->
-
-         <resource-ref id="entity1ResourceRef1-id">
-            <description>en-entity1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
-            <description xml:lang="de">de-entity1ResourceRef1-desc</description>
-            <res-ref-name>entity1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </resource-ref>
-         <resource-ref id="entity1ResourceRef2-id">
-            <description>en-entity1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceRef2-desc</description>
-            <description xml:lang="de">de-entity1ResourceRef2-desc</description>
-            <res-ref-name>entity1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1ResourceRef2JndiName</jndi-name>
-         </resource-ref>
-         <resource-env-ref id="entity1ResourceEnvRef1-id">
-            <description>en-entity1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-entity1ResourceEnvRef1-desc</description>
-            <resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </resource-env-ref>
-         <resource-env-ref id="entity1ResourceEnvRef2-id">
-            <description>en-entity1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-entity1ResourceEnvRef2-desc</description>
-            <resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1ResourceEnvRef2JndiName</jndi-name>
-         </resource-env-ref>
-         <message-destination-ref id="entity1MessageDestinationRef1-id">
-            <description>en-entity1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef1-desc</description>
-            <message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </message-destination-ref>
-         <message-destination-ref id="entity1MessageDestinationRef2-id">
-            <description>en-entity1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef2-desc</description>
-            <message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1MessageDestinationRef2JndiName</jndi-name>
-         </message-destination-ref>
-         <message-destination-ref id="entity1MessageDestinationRef3-id">
-            <description>en-entity1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef3-desc</description>
-            <message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
-         </message-destination-ref>
-         
-         <method-attributes id="entity1MethodAttributes-id">
-            <method id="entity1MethodAttributesMethod1-id">
-               <method-name>get*</method-name>
-               <read-only>true</read-only>
-               <idempotent>true</idempotent>
-               <transaction-timeout>5000</transaction-timeout>
-            </method>
-            <method id="entity1MethodAttributesMethod2-id">
-               <method-name>*</method-name>
-            </method>
-         </method-attributes>
-         
-         <security-identity id="entity1SecurityIdentity-id">
-            <description>en-entity1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
-            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
-         <clustered>true</clustered>
-         
-         <cluster-config id="entity1ClusterConfig-id">
-            <description>en-entity1ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-entity1ClusterConfig-desc</description>
-            <description xml:lang="de">de-entity1ClusterConfig-desc</description>
-            <partition-name>entity1ClusterConfigPartitionName</partition-name>
-            <home-load-balance-policy>entity1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
-            <bean-load-balance-policy>entity1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
-         </cluster-config>
-         
-         <security-domain>entity1SecurityDomain</security-domain>
-         
-         <cache-invalidation>true</cache-invalidation>
-         <cache-invalidation-config id="entity1CacheInvalidationConfig-id">
-            <description>en-entity1CacheInvalidationConfig-desc</description>
-            <description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</description>
-            <description xml:lang="de">de-entity1CacheInvalidationConfig-desc</description>
-            <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
-            <invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
-         </cache-invalidation-config>
-         
-         <depends>entity1Depends1</depends>
-         <depends>entity1Depends2</depends>
-         
-         <ior-security-config id="entity1IorSecurityConfig-id">
-            <description>en-entity1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-entity1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-entity1IorSecurityConfig-desc</description>
-            <transport-config id="entity1TransportConfig-id">
-               <description>en-entity1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-entity1TransportConfig-desc</description>
-               <description xml:lang="de">de-entity1TransportConfig-desc</description>
-               <integrity>NONE</integrity>
-               <confidentiality>NONE</confidentiality>
-               <establish-trust-in-target>NONE</establish-trust-in-target>
-               <establish-trust-in-client>NONE</establish-trust-in-client>
-               <detect-misordering>NONE</detect-misordering>
-               <detect-replay>NONE</detect-replay>
-            </transport-config>
-            <as-context id="entity1ASContext-id">
-               <description>en-entity1ASContext-desc</description>
-               <description xml:lang="fr">fr-entity1ASContext-desc</description>
-               <description xml:lang="de">de-entity1ASContext-desc</description>
-               <auth-method>USERNAME_PASSWORD</auth-method>
-               <realm>entity1ASContextRealm</realm>
-               <required>false</required>
-            </as-context>
-            <sas-context id="entity1SASContext-id">
-               <description>en-entity1SASContext-desc</description>
-               <description xml:lang="fr">fr-entity1SASContext-desc</description>
-               <description xml:lang="de">de-entity1SASContext-desc</description>
-               <caller-propagation>NONE</caller-propagation>
-            </sas-context>
-         </ior-security-config>
-         
-         <annotation id="entity1Annotation1-id">
-            <description>en-entity1Annotation1-desc</description>
-            <description xml:lang="fr">fr-entity1Annotation1-desc</description>
-            <description xml:lang="de">de-entity1Annotation1-desc</description>
-            
-            <annotation-class>entity1Annotation1Class</annotation-class>
-            <annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity1Annotation1Property1-id">
-               <description>en-entity1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-entity1Annotation1Property1-desc</description>
-               <property-name>entity1Annotation1Property1Name</property-name>
-               <property-value>entity1Annotation1Property1Value</property-value>
-            </property>
-            <property id="entity1Annotation1Property2-id">
-               <description>en-entity1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-entity1Annotation1Property2-desc</description>
-               <property-name>entity1Annotation1Property2Name</property-name>
-               <property-value>entity1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="entity1Annotation2-id">
-            <description>en-entity1Annotation2-desc</description>
-            <description xml:lang="fr">fr-entity1Annotation2-desc</description>
-            <description xml:lang="de">de-entity1Annotation2-desc</description>
-            
-            <annotation-class>entity1Annotation2Class</annotation-class>
-            <annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity1Annotation2Property1-id">
-               <description>en-entity1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-entity1Annotation2Property1-desc</description>
-               <property-name>entity1Annotation2Property1Name</property-name>
-               <property-value>entity1Annotation2Property1Value</property-value>
-            </property>
-            <property id="entity1Annotation2Property2-id">
-               <description>en-entity1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-entity1Annotation2Property2-desc</description>
-               <property-name>entity1Annotation2Property2Name</property-name>
-               <property-value>entity1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="entity1IgnoreDependency-id">
-            <description>en-entity1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-entity1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-entity1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>entity1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>entity1AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-         
-         <jndi-ref id="entity1JndiRef1-id">
-            <description>en-entity1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-entity1JndiRef1-desc</description>
-            <description xml:lang="de">de-entity1JndiRef1-desc</description>
-            <jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
-            <mapped-name>entity1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="entity1JndiRef2-id">
-            <description>en-entity1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-entity1JndiRef2-desc</description>
-            <description xml:lang="de">de-entity1JndiRef2-desc</description>
-            <jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
-            <mapped-name>entity1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
-      </entity>
-
-      <entity id="entity2-id">
-         <description>en-entity2-desc</description>
-         <description xml:lang="fr">fr-entity2-desc</description>
-         <description xml:lang="de">de-entity2-desc</description>
-         <display-name>en-entity2-disp</display-name>
-         <display-name xml:lang="fr">fr-entity2-disp</display-name>
-         <display-name xml:lang="de">de-entity2-disp</display-name>
-         <icon id="en-entity2-icon-id">
-            <small-icon>en-entity2-small-icon</small-icon>
-            <large-icon>en-entity2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-entity2-icon-id">
-            <small-icon>fr-entity2-small-icon</small-icon>
-            <large-icon>fr-entity2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-entity2-icon-id">
-            <small-icon>de-entity2-small-icon</small-icon>
-            <large-icon>de-entity2-large-icon</large-icon>
-         </icon>
-
-         <ejb-name>entity2EjbName</ejb-name>
-
-         <jndi-name>entity2JndiName</jndi-name>
-         <local-jndi-name>entity2LocalJndiName</local-jndi-name>
-         <call-by-value>false</call-by-value>
-         <read-only>false</read-only>
-         <exception-on-rollback>false</exception-on-rollback>
-         <timer-persistence>false</timer-persistence>
-         <configuration-name>entity2ConfigurationName</configuration-name>
-         
-         <invoker-bindings id="entity2InvokerBindings-id">
-            <description>en-entity2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-entity2InvokerBindings-desc</description>
-            <description xml:lang="de">de-entity2InvokerBindings-desc</description>
-
-            <invoker id="entity2Invoker1-id">
-               <description>en-entity2Invoker1-desc</description>
-               <description xml:lang="fr">fr-entity2Invoker1-desc</description>
-               <description xml:lang="de">de-entity2Invoker1-desc</description>
-               
-               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
-               <jndi-name>entity2Invoker1JndiName</jndi-name>
-
-               <ejb-ref>
-                  <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
-                  <jndi-name>entity2Invoker1EjbName1</jndi-name>
-               </ejb-ref>
-            </invoker>
-            <invoker id="entity2Invoker2-id">
-               <description>en-entity2Invoker2-desc</description>
-               <description xml:lang="fr">fr-entity2Invoker2-desc</description>
-               <description xml:lang="de">de-entity2Invoker2-desc</description>
-               
-               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
-               <jndi-name>entity2Invoker2JndiName</jndi-name>
-
-               <ejb-ref>
-                  <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
-                  <jndi-name>entity2Invoker2EjbName1</jndi-name>
-               </ejb-ref>
-               <ejb-ref>
-                  <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
-                  <jndi-name>entity2Invoker2EjbName2</jndi-name>
-               </ejb-ref>
-            </invoker>
-         </invoker-bindings>
-         
-         <security-proxy>entity2SecurityProxy</security-proxy>
-         
-         <ejb-ref id="entity2EjbRef1-id">
-            <description>en-entity2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-entity2EjbRef1-desc</description>
-            <description xml:lang="de">de-entity2EjbRef1-desc</description>
-
-            <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </ejb-ref>
-         <ejb-ref id="entity2EjbRef2-id">
-            <description>en-entity2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-entity2EjbRef2-desc</description>
-            <description xml:lang="de">de-entity2EjbRef2-desc</description>
-
-            <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbRef2JndiName</jndi-name>
-         </ejb-ref>
-
-         <ejb-local-ref id="entity2EjbLocalRef1-id">
-            <description>en-entity2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-entity2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-entity2EjbLocalRef1-desc</description>
-
-            <ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </ejb-local-ref>
-         <ejb-local-ref id="entity2EjbLocalRef2-id">
-            <description>en-entity2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-entity2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-entity2EjbLocalRef2-desc</description>
-
-            <ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbLocalRef2JndiName</jndi-name>
-         </ejb-local-ref>
-
-         <!-- TODO service-ref -->
-
-         <resource-ref id="entity2ResourceRef1-id">
-            <description>en-entity2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
-            <description xml:lang="de">de-entity2ResourceRef1-desc</description>
-            <res-ref-name>entity2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </resource-ref>
-         <resource-ref id="entity2ResourceRef2-id">
-            <description>en-entity2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceRef2-desc</description>
-            <description xml:lang="de">de-entity2ResourceRef2-desc</description>
-            <res-ref-name>entity2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2ResourceRef2JndiName</jndi-name>
-         </resource-ref>
-         <resource-env-ref id="entity2ResourceEnvRef1-id">
-            <description>en-entity2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-entity2ResourceEnvRef1-desc</description>
-            <resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </resource-env-ref>
-         <resource-env-ref id="entity2ResourceEnvRef2-id">
-            <description>en-entity2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-entity2ResourceEnvRef2-desc</description>
-            <resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2ResourceEnvRef2JndiName</jndi-name>
-         </resource-env-ref>
-         <message-destination-ref id="entity2MessageDestinationRef1-id">
-            <description>en-entity2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef1-desc</description>
-            <message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
-         </message-destination-ref>
-         <message-destination-ref id="entity2MessageDestinationRef2-id">
-            <description>en-entity2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef2-desc</description>
-            <message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2MessageDestinationRef2JndiName</jndi-name>
-         </message-destination-ref>
-         <message-destination-ref id="entity2MessageDestinationRef3-id">
-            <description>en-entity2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef3-desc</description>
-            <message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
-         </message-destination-ref>
-         
-         <method-attributes id="entity2MethodAttributes-id">
-            <method id="entity2MethodAttributesMethod1-id">
-               <method-name>get*</method-name>
-               <read-only>true</read-only>
-               <idempotent>true</idempotent>
-               <transaction-timeout>5000</transaction-timeout>
-            </method>
-            <method id="entity2MethodAttributesMethod2-id">
-               <method-name>*</method-name>
-            </method>
-         </method-attributes>
-         
-         <security-identity id="entity2SecurityIdentity-id">
-            <description>en-entity2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
-            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
-         <clustered>false</clustered>
-         
-         <cluster-config id="entity2ClusterConfig-id">
-            <description>en-entity2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-entity2ClusterConfig-desc</description>
-            <description xml:lang="de">de-entity2ClusterConfig-desc</description>
-            <partition-name>entity2ClusterConfigPartitionName</partition-name>
-            <home-load-balance-policy>entity2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
-            <bean-load-balance-policy>entity2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
-         </cluster-config>
-         
-         <security-domain>entity2SecurityDomain</security-domain>
-
-         <cache-invalidation>false</cache-invalidation>
-         <cache-invalidation-config id="entity2CacheInvalidationConfig-id">
-            <description>en-entity2CacheInvalidationConfig-desc</description>
-            <description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</description>
-            <description xml:lang="de">de-entity2CacheInvalidationConfig-desc</description>
-            <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
-            <invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
-         </cache-invalidation-config>
-         
-         <depends>entity2Depends1</depends>
-         <depends>entity2Depends2</depends>
-         
-         <ior-security-config id="entity2IorSecurityConfig-id">
-            <description>en-entity2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-entity2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-entity2IorSecurityConfig-desc</description>
-            <transport-config id="entity2TransportConfig-id">
-               <description>en-entity2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-entity2TransportConfig-desc</description>
-               <description xml:lang="de">de-entity2TransportConfig-desc</description>
-               <integrity>NONE</integrity>
-               <confidentiality>NONE</confidentiality>
-               <establish-trust-in-target>NONE</establish-trust-in-target>
-               <establish-trust-in-client>NONE</establish-trust-in-client>
-               <detect-misordering>NONE</detect-misordering>
-               <detect-replay>NONE</detect-replay>
-            </transport-config>
-            <as-context id="entity2ASContext-id">
-               <description>en-entity2ASContext-desc</description>
-               <description xml:lang="fr">fr-entity2ASContext-desc</description>
-               <description xml:lang="de">de-entity2ASContext-desc</description>
-               <auth-method>USERNAME_PASSWORD</auth-method>
-               <realm>entity2ASContextRealm</realm>
-               <required>false</required>
-            </as-context>
-            <sas-context id="entity2SASContext-id">
-               <description>en-entity2SASContext-desc</description>
-               <description xml:lang="fr">fr-entity2SASContext-desc</description>
-               <description xml:lang="de">de-entity2SASContext-desc</description>
-               <caller-propagation>NONE</caller-propagation>
-            </sas-context>
-         </ior-security-config>
-         
-         <annotation id="entity2Annotation1-id">
-            <description>en-entity2Annotation1-desc</description>
-            <description xml:lang="fr">fr-entity2Annotation1-desc</description>
-            <description xml:lang="de">de-entity2Annotation1-desc</description>
-            
-            <annotation-class>entity2Annotation1Class</annotation-class>
-            <annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity2Annotation1Property1-id">
-               <description>en-entity2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-entity2Annotation1Property1-desc</description>
-               <property-name>entity2Annotation1Property1Name</property-name>
-               <property-value>entity2Annotation1Property1Value</property-value>
-            </property>
-            <property id="entity2Annotation1Property2-id">
-               <description>en-entity2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-entity2Annotation1Property2-desc</description>
-               <property-name>entity2Annotation1Property2Name</property-name>
-               <property-value>entity2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="entity2Annotation2-id">
-            <description>en-entity2Annotation2-desc</description>
-            <description xml:lang="fr">fr-entity2Annotation2-desc</description>
-            <description xml:lang="de">de-entity2Annotation2-desc</description>
-            
-            <annotation-class>entity2Annotation2Class</annotation-class>
-            <annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity2Annotation2Property1-id">
-               <description>en-entity2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-entity2Annotation2Property1-desc</description>
-               <property-name>entity2Annotation2Property1Name</property-name>
-               <property-value>entity2Annotation2Property1Value</property-value>
-            </property>
-            <property id="entity2Annotation2Property2-id">
-               <description>en-entity2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-entity2Annotation2Property2-desc</description>
-               <property-name>entity2Annotation2Property2Name</property-name>
-               <property-value>entity2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="entity2IgnoreDependency-id">
-            <description>en-entity2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-entity2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-entity2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>entity2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>entity2AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-         
-         <jndi-ref id="entity2JndiRef1-id">
-            <description>en-entity2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-entity2JndiRef1-desc</description>
-            <description xml:lang="de">de-entity2JndiRef1-desc</description>
-            <jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
-            <mapped-name>entity2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="entity2JndiRef2-id">
-            <description>en-entity2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-entity2JndiRef2-desc</description>
-            <description xml:lang="de">de-entity2JndiRef2-desc</description>
-            <jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
-            <mapped-name>entity2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
-      </entity>
-
       <message-driven>
          <ejb-name>mdb0EjbName</ejb-name>
       </message-driven>

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -0,0 +1,3567 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: JBoss5xEverything_testEverything.xml 67097 2007-11-14 21:23:18Z alex.loubyansky at jboss.com $ -->
+
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<!--
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+       xmlns:jee="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+       version="5.0"
+       id="jboss-id">
+-->
+<jboss>
+<!--         
+   <description>en-jboss-desc</description>
+   <description xml:lang="fr">fr-jboss-desc</description>
+   <description xml:lang="de">de-jboss-desc</description>
+   <display-name>en-jboss-disp</display-name>
+   <display-name xml:lang="fr">fr-jboss-disp</display-name>
+   <display-name xml:lang="de">de-jboss-disp</display-name>
+   <icon id="en-jboss-icon-id">
+      <small-icon>en-jboss-small-icon</small-icon>
+      <large-icon>en-jboss-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="fr" id="fr-jboss-icon-id">
+      <small-icon>fr-jboss-small-icon</small-icon>
+      <large-icon>fr-jboss-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="de" id="de-jboss-icon-id">
+      <small-icon>de-jboss-small-icon</small-icon>
+      <large-icon>de-jboss-large-icon</large-icon>
+   </icon>
+   
+   <loader-repository id="loaderRepository-id" loaderRepositoryClass="loaderRepositoryClass">
+-->
+   <loader-repository loaderRepositoryClass="loaderRepositoryClass">
+      loaderRepositoryName
+<!--      <loader-repository-config id="loaderRepositoryConfig1-id" configParserClass="loaderRepositoryConfigParserClass1"> -->
+      <loader-repository-config configParserClass="loaderRepositoryConfigParserClass1">
+         loaderRepositoryConfig1
+      </loader-repository-config>
+<!--      <loader-repository-config id="loaderRepositoryConfig2-id" configParserClass="loaderRepositoryConfigParserClass2"> -->
+      <loader-repository-config configParserClass="loaderRepositoryConfigParserClass2">
+         loaderRepositoryConfig2
+      </loader-repository-config>
+   </loader-repository>
+   
+   <jmx-name>jboss-jmx-name</jmx-name>
+   <enforce-ejb-restrictions>NO LONGER USED</enforce-ejb-restrictions>
+   <security-domain>jboss-security-domain</security-domain>
+   <missing-method-permissions-excluded-mode>false</missing-method-permissions-excluded-mode>
+   <unauthenticated-principal>jboss-unauthenticated-principal</unauthenticated-principal>
+   <exception-on-rollback>true</exception-on-rollback>
+   
+<!--   <webservices id="webservices-id"> -->
+   <webservices>
+      <context-root>webservicesContextRoot</context-root>
+<!--      <webservice-description id="webserviceDescription1-id"> -->
+      <webservice-description>
+         <webservice-description-name>webserviceDescription1Name</webservice-description-name>
+         <config-name>webserviceDescription1ConfigName</config-name>
+         <config-file>webserviceDescription1ConfigFile</config-file>
+         <wsdl-publish-location>webserviceDescription1WsdlPublishLocation</wsdl-publish-location>
+      </webservice-description>
+<!--      <webservice-description id="webserviceDescription2-id"> -->
+      <webservice-description>
+         <webservice-description-name>webserviceDescription2Name</webservice-description-name>
+         <config-name>webserviceDescription2ConfigName</config-name>
+         <config-file>webserviceDescription2ConfigFile</config-file>
+         <wsdl-publish-location>webserviceDescription2WsdlPublishLocation</wsdl-publish-location>
+      </webservice-description>
+   </webservices>
+   
+<!--   <enterprise-beans id="enterprise-beans-id"> -->
+   <enterprise-beans>
+
+      <session>
+         <ejb-name>session0EjbName</ejb-name>
+      </session>
+
+<!--
+      <session id="session1-id">
+         <description>en-session1-desc</description>
+         <description xml:lang="fr">fr-session1-desc</description>
+         <description xml:lang="de">de-session1-desc</description>
+         <display-name>en-session1-disp</display-name>
+         <display-name xml:lang="fr">fr-session1-disp</display-name>
+         <display-name xml:lang="de">de-session1-disp</display-name>
+         <icon id="en-session1-icon-id">
+            <small-icon>en-session1-small-icon</small-icon>
+            <large-icon>en-session1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-session1-icon-id">
+            <small-icon>fr-session1-small-icon</small-icon>
+            <large-icon>fr-session1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-session1-icon-id">
+            <small-icon>de-session1-small-icon</small-icon>
+            <large-icon>de-session1-large-icon</large-icon>
+         </icon>
+-->
+      <session id="session1-id">
+         <ejb-name>session1EjbName</ejb-name>
+
+<!--         
+         <remote-binding id="session1RemoteBinding-id">
+            <description>en-session1RemoteBinding-desc</description>
+            <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
+            <description xml:lang="de">de-session1RemoteBinding-desc</description>
+            <jndi-name>session1RemoteBindingJndiName</jndi-name>
+            <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
+            <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
+            <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
+         </remote-binding>
+-->
+
+         <jndi-name>session1JndiName</jndi-name>
+         <home-jndi-name>session1HomeJndiName</home-jndi-name>
+         <local-jndi-name>session1LocalJndiName</local-jndi-name>
+<!--         <local-home-jndi-name>session1LocalHomeJndiName</local-home-jndi-name> -->
+         <call-by-value>true</call-by-value>
+         <exception-on-rollback>true</exception-on-rollback>
+         <timer-persistence>true</timer-persistence>
+         <configuration-name>session1ConfigurationName</configuration-name>
+
+<!--         
+         <invoker-bindings id="session1InvokerBindings-id">
+            <description>en-session1InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
+            <description xml:lang="de">de-session1InvokerBindings-desc</description>
+
+            <invoker id="session1Invoker1-id">
+               <description>en-session1Invoker1-desc</description>
+               <description xml:lang="fr">fr-session1Invoker1-desc</description>
+               <description xml:lang="de">de-session1Invoker1-desc</description>
+-->
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+               <jndi-name>session1Invoker1JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
+                  <jndi-name>session1Invoker1EjbName1</jndi-name>
+               </ejb-ref>
+            </invoker>
+<!--
+            <invoker id="session1Invoker2-id">
+               <description>en-session1Invoker2-desc</description>
+               <description xml:lang="fr">fr-session1Invoker2-desc</description>
+               <description xml:lang="de">de-session1Invoker2-desc</description>
+-->
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+               <jndi-name>session1Invoker2JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
+                  <jndi-name>session1Invoker2EjbName1</jndi-name>
+               </ejb-ref>
+               <ejb-ref>
+                  <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
+                  <jndi-name>session1Invoker2EjbName2</jndi-name>
+               </ejb-ref>
+            </invoker>
+         </invoker-bindings>
+         
+         <security-proxy>session1SecurityProxy</security-proxy>
+
+<!--         
+         <ejb-ref id="session1EjbRef1-id">
+            <description>en-session1EjbRef1-desc</description>
+            <description xml:lang="fr">fr-session1EjbRef1-desc</description>
+            <description xml:lang="de">de-session1EjbRef1-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1EjbRef1Injection1Class</injection-target-class>
+               <injection-target-name>session1EjbRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1EjbRef1Injection2Class</injection-target-class>
+               <injection-target-name>session1EjbRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1EjbRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </ejb-ref>
+<!--
+         <ejb-ref id="session1EjbRef2-id">
+            <description>en-session1EjbRef2-desc</description>
+            <description xml:lang="fr">fr-session1EjbRef2-desc</description>
+            <description xml:lang="de">de-session1EjbRef2-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1EjbRef2Injection1Class</injection-target-class>
+               <injection-target-name>session1EjbRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1EjbRef2Injection2Class</injection-target-class>
+               <injection-target-name>session1EjbRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1EjbRef2JndiName</jndi-name>
+         </ejb-ref>
+
+<!--
+         <ejb-local-ref id="session1EjbLocalRef1-id">
+            <description>en-session1EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-session1EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-session1EjbLocalRef1-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1EjbLocalRef1Injection1Class</injection-target-class>
+               <injection-target-name>session1EjbLocalRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1EjbLocalRef1Injection2Class</injection-target-class>
+               <injection-target-name>session1EjbLocalRef1Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>session1EjbLocalRef1JndiName</jndi-name>
+            <ignore-dependency/>
+-->
+            <local-jndi-name>session1EjbLocalRef1JndiName</local-jndi-name>
+         </ejb-local-ref>
+<!--
+         <ejb-local-ref id="session1EjbLocalRef2-id">
+            <description>en-session1EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-session1EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-session1EjbLocalRef2-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1EjbLocalRef2Injection1Class</injection-target-class>
+               <injection-target-name>session1EjbLocalRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1EjbLocalRef2Injection2Class</injection-target-class>
+               <injection-target-name>session1EjbLocalRef2Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>session1EjbLocalRef2JndiName</jndi-name>
+-->
+            <local-jndi-name>session1EjbLocalRef2JndiName</local-jndi-name>
+         </ejb-local-ref>
+
+         <!-- TODO service-ref -->
+
+         <security-identity>
+            <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+<!--
+         <resource-ref id="session1ResourceRef1-id">
+            <description>en-session1ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-session1ResourceRef1-desc</description>
+            <description xml:lang="de">de-session1ResourceRef1-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>session1ResourceRef1Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
+               <injection-target-name>session1ResourceRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1ResourceRef1Injection2Class</injection-target-class>
+               <injection-target-name>session1ResourceRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1ResourceRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-ref>
+<!--
+         <resource-ref id="session1ResourceRef2-id">
+            <description>en-session1ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-session1ResourceRef2-desc</description>
+            <description xml:lang="de">de-session1ResourceRef2-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>session1ResourceRef2Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
+               <injection-target-name>session1ResourceRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1ResourceRef2Injection2Class</injection-target-class>
+               <injection-target-name>session1ResourceRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1ResourceRef2JndiName</jndi-name>
+         </resource-ref>
+<!--
+         <resource-env-ref id="session1ResourceEnvRef1-id">
+            <description>en-session1ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-session1ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-session1ResourceEnvRef1-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
+               <injection-target-name>session1ResourceEnvRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1ResourceEnvRef1Injection2Class</injection-target-class>
+               <injection-target-name>session1ResourceEnvRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1ResourceEnvRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-env-ref>
+<!--
+         <resource-env-ref id="session1ResourceEnvRef2-id">
+            <description>en-session1ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-session1ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-session1ResourceEnvRef2-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
+               <injection-target-name>session1ResourceEnvRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1ResourceEnvRef2Injection2Class</injection-target-class>
+               <injection-target-name>session1ResourceEnvRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
+         </resource-env-ref>
+<!--
+         <message-destination-ref id="session1MessageDestinationRef1-id">
+            <description>en-session1MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-session1MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-session1MessageDestinationRef1-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
+               <injection-target-name>session1MessageDestinationRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1MessageDestinationRef1Injection2Class</injection-target-class>
+               <injection-target-name>session1MessageDestinationRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1MessageDestinationRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="session1MessageDestinationRef2-id">
+            <description>en-session1MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-session1MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-session1MessageDestinationRef2-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
+               <injection-target-name>session1MessageDestinationRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1MessageDestinationRef2Injection2Class</injection-target-class>
+               <injection-target-name>session1MessageDestinationRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="session1MessageDestinationRef3-id">
+            <description>en-session1MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-session1MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-session1MessageDestinationRef3-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
+               <injection-target-name>session1MessageDestinationRef3Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1MessageDestinationRef3Injection2Class</injection-target-class>
+               <injection-target-name>session1MessageDestinationRef3Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <security-identity id="session1SecurityIdentity-id">
+            <description>en-session1SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
+            <description xml:lang="de">de-session1SecurityIdentity-desc</description>
+            <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+-->
+
+         <clustered>true</clustered>
+<!--
+         <cluster-config id="session1ClusterConfig-id">
+            <description>en-session1ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-session1ClusterConfig-desc</description>
+            <description xml:lang="de">de-session1ClusterConfig-desc</description>
+-->
+         <cluster-config>
+            <partition-name>session1ClusterConfigPartitionName</partition-name>
+            <home-load-balance-policy>session1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
+            <bean-load-balance-policy>session1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
+            <session-state-manager-jndi-name>session1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
+         </cluster-config>
+
+<!--         <security-domain>session1SecurityDomain</security-domain> -->
+         
+<!--
+         <method-attributes id="session1MethodAttributes-id">
+            <method id="session1MethodAttributesMethod1-id">
+-->
+         <method-attributes>
+            <method>
+               <method-name>get*</method-name>
+               <read-only>true</read-only>
+               <idempotent>true</idempotent>
+               <transaction-timeout>5000</transaction-timeout>
+            </method>
+<!--            <method id="session1MethodAttributesMethod2-id"> -->
+            <method>
+               <method-name>*</method-name>
+            </method>
+         </method-attributes>
+         
+         <depends>session1Depends1</depends>
+         <depends>session1Depends2</depends>
+         
+<!--
+         <ior-security-config id="session1IorSecurityConfig-id">
+            <description>en-session1IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
+            <transport-config id="session1TransportConfig-id">
+               <description>en-session1TransportConfig-desc</description>
+               <description xml:lang="fr">fr-session1TransportConfig-desc</description>
+               <description xml:lang="de">de-session1TransportConfig-desc</description>
+-->
+         <ior-security-config>
+            <transport-config>
+               <integrity>NONE</integrity>
+               <confidentiality>NONE</confidentiality>
+               <establish-trust-in-target>NONE</establish-trust-in-target>
+               <establish-trust-in-client>NONE</establish-trust-in-client>
+               <detect-misordering>NONE</detect-misordering>
+               <detect-replay>NONE</detect-replay>
+            </transport-config>
+<!--
+            <as-context id="session1ASContext-id">
+               <description>en-session1ASContext-desc</description>
+               <description xml:lang="fr">fr-session1ASContext-desc</description>
+               <description xml:lang="de">de-session1ASContext-desc</description>
+-->
+            <as-context>
+               <auth-method>USERNAME_PASSWORD</auth-method>
+               <realm>session1ASContextRealm</realm>
+               <required>false</required>
+            </as-context>
+<!--
+            <sas-context id="session1SASContext-id">
+               <description>en-session1SASContext-desc</description>
+               <description xml:lang="fr">fr-session1SASContext-desc</description>
+               <description xml:lang="de">de-session1SASContext-desc</description>
+-->
+            <sas-context>
+               <caller-propagation>NONE</caller-propagation>
+            </sas-context>
+         </ior-security-config>
+         
+<!--        <port-component id="session1PortComponent-id"> -->
+         <port-component>
+            <port-component-name>session1-PortComponent</port-component-name>
+            <port-component-uri>/session1/PortComponentURI</port-component-uri>
+            <auth-method>BASIC</auth-method>
+            <transport-guarantee>NONE</transport-guarantee>
+<!--            <secure-wsdl-access>true</secure-wsdl-access> -->
+         </port-component>
+
+<!--         
+         <ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
+            <description>en-session1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
+-->
+         <ejb-timeout-identity>
+            <run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
+         </ejb-timeout-identity>
+<!--
+         <annotation id="session1Annotation1-id">
+            <description>en-session1Annotation1-desc</description>
+            <description xml:lang="fr">fr-session1Annotation1-desc</description>
+            <description xml:lang="de">de-session1Annotation1-desc</description>
+            
+            <annotation-class>session1Annotation1Class</annotation-class>
+            <annotation-implementation-class>session1Annotation1Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>session1Annotation1InjectionTargetClass</injection-target-class>
+               <injection-target-name>session1Annotation1InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="session1Annotation1Property1-id">
+               <description>en-session1Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-session1Annotation1Property1-desc</description>
+               <description xml:lang="de">de-session1Annotation1Property1-desc</description>
+               <property-name>session1Annotation1Property1Name</property-name>
+               <property-value>session1Annotation1Property1Value</property-value>
+            </property>
+            <property id="session1Annotation1Property2-id">
+               <description>en-session1Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-session1Annotation1Property2-desc</description>
+               <description xml:lang="de">de-session1Annotation1Property2-desc</description>
+               <property-name>session1Annotation1Property2Name</property-name>
+               <property-value>session1Annotation1Property2Value</property-value>
+            </property>
+         </annotation>
+         <annotation id="session1Annotation2-id">
+            <description>en-session1Annotation2-desc</description>
+            <description xml:lang="fr">fr-session1Annotation2-desc</description>
+            <description xml:lang="de">de-session1Annotation2-desc</description>
+            
+            <annotation-class>session1Annotation2Class</annotation-class>
+            <annotation-implementation-class>session1Annotation2Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>session1Annotation2InjectionTargetClass</injection-target-class>
+               <injection-target-name>session1Annotation2InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="session1Annotation2Property1-id">
+               <description>en-session1Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-session1Annotation2Property1-desc</description>
+               <description xml:lang="de">de-session1Annotation2Property1-desc</description>
+               <property-name>session1Annotation2Property1Name</property-name>
+               <property-value>session1Annotation2Property1Value</property-value>
+            </property>
+            <property id="session1Annotation2Property2-id">
+               <description>en-session1Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-session1Annotation2Property2-desc</description>
+               <description xml:lang="de">de-session1Annotation2Property2-desc</description>
+               <property-name>session1Annotation2Property2Name</property-name>
+               <property-value>session1Annotation2Property2Value</property-value>
+            </property>
+         </annotation>
+
+         <ignore-dependency id="session1IgnoreDependency-id">
+            <description>en-session1IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-session1IgnoreDependency-desc</description>
+            <description xml:lang="de">de-session1IgnoreDependency-desc</description>
+            <injection-target>
+               <injection-target-class>session1IgnoreDependencyInjection1Class</injection-target-class>
+               <injection-target-name>session1IgnoreDependencyInjection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1IgnoreDependencyInjection2Class</injection-target-class>
+               <injection-target-name>session1IgnoreDependencyInjection2Name</injection-target-name>
+            </injection-target>
+         </ignore-dependency>
+
+         <aop-domain-name>session1AOPDomain</aop-domain-name>         
+
+         <cache-config>
+            <cache-value>session1CacheClass</cache-value>
+            <cache-max-size>10</cache-max-size>
+            <idle-timeout-seconds>11</idle-timeout-seconds>
+            <remove-timeout-seconds>12</remove-timeout-seconds>
+            <cache-name>session1CacheName</cache-name>
+            <persistence-manager>session1PersistenceManager</persistence-manager>
+         </cache-config>
+         
+         <pool-config>
+            <pool-value>session1PoolClass</pool-value>
+            <pool-max-size>10</pool-max-size>
+            <pool-timeout>11</pool-timeout>
+         </pool-config>
+
+         <concurrent>true</concurrent>         
+         
+         <!- - TODO jndi ref - ->
+         <jndi-ref id="session1JndiRef1-id">
+            <description>en-session1JndiRef1-desc</description>
+            <description xml:lang="fr">fr-session1JndiRef1-desc</description>
+            <description xml:lang="de">de-session1JndiRef1-desc</description>
+            <jndi-ref-name>session1JndiRef1Name</jndi-ref-name>
+            <mapped-name>session1JndiRef1MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>session1JndiRef1Injection1Class</injection-target-class>
+               <injection-target-name>session1JndiRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1JndiRef1Injection2Class</injection-target-class>
+               <injection-target-name>session1JndiRef1Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         <jndi-ref id="session1JndiRef2-id">
+            <description>en-session1JndiRef2-desc</description>
+            <description xml:lang="fr">fr-session1JndiRef2-desc</description>
+            <description xml:lang="de">de-session1JndiRef2-desc</description>
+            <jndi-ref-name>session1JndiRef2Name</jndi-ref-name>
+            <mapped-name>session1JndiRef2MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>session1JndiRef2Injection1Class</injection-target-class>
+               <injection-target-name>session1JndiRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session1JndiRef2Injection2Class</injection-target-class>
+               <injection-target-name>session1JndiRef2Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+-->
+      </session>
+
+<!--
+      <session id="session2-id">
+         <description>en-session2-desc</description>
+         <description xml:lang="fr">fr-session2-desc</description>
+         <description xml:lang="de">de-session2-desc</description>
+         <display-name>en-session2-disp</display-name>
+         <display-name xml:lang="fr">fr-session2-disp</display-name>
+         <display-name xml:lang="de">de-session2-disp</display-name>
+         <icon id="en-session2-icon-id">
+            <small-icon>en-session2-small-icon</small-icon>
+            <large-icon>en-session2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-session2-icon-id">
+            <small-icon>fr-session2-small-icon</small-icon>
+            <large-icon>fr-session2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-session2-icon-id">
+            <small-icon>de-session2-small-icon</small-icon>
+            <large-icon>de-session2-large-icon</large-icon>
+         </icon>
+-->
+      <session id="session2-id">
+         <ejb-name>session2EjbName</ejb-name>
+         
+<!--
+         <remote-binding id="session2RemoteBinding-id">
+            <description>en-session2RemoteBinding-desc</description>
+            <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
+            <description xml:lang="de">de-session2RemoteBinding-desc</description>
+            <jndi-name>session2RemoteBindingJndiName</jndi-name>
+            <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
+            <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
+            <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
+         </remote-binding>
+-->
+
+         <jndi-name>session2JndiName</jndi-name>
+         <home-jndi-name>session2HomeJndiName</home-jndi-name>
+         <local-jndi-name>session2LocalJndiName</local-jndi-name>
+<!--         <local-home-jndi-name>session2LocalHomeJndiName</local-home-jndi-name> -->
+         <call-by-value>false</call-by-value>
+         <exception-on-rollback>false</exception-on-rollback>
+         <timer-persistence>false</timer-persistence>
+         <configuration-name>session2ConfigurationName</configuration-name>
+<!--         
+         <invoker-bindings id="session2InvokerBindings-id">
+            <description>en-session2InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
+            <description xml:lang="de">de-session2InvokerBindings-desc</description>
+
+            <invoker id="session2Invoker1-id">
+               <description>en-session2Invoker1-desc</description>
+               <description xml:lang="fr">fr-session2Invoker1-desc</description>
+               <description xml:lang="de">de-session2Invoker1-desc</description>
+-->
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+               <jndi-name>session2Invoker1JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
+                  <jndi-name>session2Invoker1EjbName1</jndi-name>
+               </ejb-ref>
+            </invoker>
+<!--
+            <invoker id="session2Invoker2-id">
+               <description>en-session2Invoker2-desc</description>
+               <description xml:lang="fr">fr-session2Invoker2-desc</description>
+               <description xml:lang="de">de-session2Invoker2-desc</description>
+-->
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+               <jndi-name>session2Invoker2JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
+                  <jndi-name>session2Invoker2EjbName1</jndi-name>
+               </ejb-ref>
+               <ejb-ref>
+                  <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
+                  <jndi-name>session2Invoker2EjbName2</jndi-name>
+               </ejb-ref>
+            </invoker>
+         </invoker-bindings>
+         
+         <security-proxy>session2SecurityProxy</security-proxy>
+<!--         
+         <ejb-ref id="session2EjbRef1-id">
+            <description>en-session2EjbRef1-desc</description>
+            <description xml:lang="fr">fr-session2EjbRef1-desc</description>
+            <description xml:lang="de">de-session2EjbRef1-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2EjbRef1Injection1Class</injection-target-class>
+               <injection-target-name>session2EjbRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2EjbRef1Injection2Class</injection-target-class>
+               <injection-target-name>session2EjbRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2EjbRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </ejb-ref>
+<!--
+         <ejb-ref id="session2EjbRef2-id">
+            <description>en-session2EjbRef2-desc</description>
+            <description xml:lang="fr">fr-session2EjbRef2-desc</description>
+            <description xml:lang="de">de-session2EjbRef2-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2EjbRef2Injection1Class</injection-target-class>
+               <injection-target-name>session2EjbRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2EjbRef2Injection2Class</injection-target-class>
+               <injection-target-name>session2EjbRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2EjbRef2JndiName</jndi-name>
+         </ejb-ref>
+<!--
+         <ejb-local-ref id="session2EjbLocalRef1-id">
+            <description>en-session2EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-session2EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-session2EjbLocalRef1-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2EjbLocalRef1Injection1Class</injection-target-class>
+               <injection-target-name>session2EjbLocalRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2EjbLocalRef1Injection2Class</injection-target-class>
+               <injection-target-name>session2EjbLocalRef1Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>session2EjbLocalRef1JndiName</jndi-name>
+            <ignore-dependency/>
+-->
+            <local-jndi-name>session2EjbLocalRef1JndiName</local-jndi-name>
+         </ejb-local-ref>
+<!--
+         <ejb-local-ref id="session2EjbLocalRef2-id">
+            <description>en-session2EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-session2EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-session2EjbLocalRef2-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2EjbLocalRef2Injection1Class</injection-target-class>
+               <injection-target-name>session2EjbLocalRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2EjbLocalRef2Injection2Class</injection-target-class>
+               <injection-target-name>session2EjbLocalRef2Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>session2EjbLocalRef2JndiName</jndi-name>
+-->
+            <local-jndi-name>session2EjbLocalRef2JndiName</local-jndi-name>
+         </ejb-local-ref>
+
+         <!-- TODO service-ref -->
+
+         <security-identity>
+            <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+<!--
+         <resource-ref id="session2ResourceRef1-id">
+            <description>en-session2ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-session2ResourceRef1-desc</description>
+            <description xml:lang="de">de-session2ResourceRef1-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>session2ResourceRef1Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
+               <injection-target-name>session2ResourceRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2ResourceRef1Injection2Class</injection-target-class>
+               <injection-target-name>session2ResourceRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2ResourceRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-ref>
+<!--
+         <resource-ref id="session2ResourceRef2-id">
+            <description>en-session2ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-session2ResourceRef2-desc</description>
+            <description xml:lang="de">de-session2ResourceRef2-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>session2ResourceRef2Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
+               <injection-target-name>session2ResourceRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2ResourceRef2Injection2Class</injection-target-class>
+               <injection-target-name>session2ResourceRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2ResourceRef2JndiName</jndi-name>
+         </resource-ref>
+<!--
+         <resource-env-ref id="session2ResourceEnvRef1-id">
+            <description>en-session2ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-session2ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-session2ResourceEnvRef1-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
+               <injection-target-name>session2ResourceEnvRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2ResourceEnvRef1Injection2Class</injection-target-class>
+               <injection-target-name>session2ResourceEnvRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2ResourceEnvRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-env-ref>
+<!--
+         <resource-env-ref id="session2ResourceEnvRef2-id">
+            <description>en-session2ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-session2ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-session2ResourceEnvRef2-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
+               <injection-target-name>session2ResourceEnvRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2ResourceEnvRef2Injection2Class</injection-target-class>
+               <injection-target-name>session2ResourceEnvRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
+         </resource-env-ref>
+<!--
+         <message-destination-ref id="session2MessageDestinationRef1-id">
+            <description>en-session2MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-session2MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-session2MessageDestinationRef1-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
+               <injection-target-name>session2MessageDestinationRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2MessageDestinationRef1Injection2Class</injection-target-class>
+               <injection-target-name>session2MessageDestinationRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2MessageDestinationRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="session2MessageDestinationRef2-id">
+            <description>en-session2MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-session2MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-session2MessageDestinationRef2-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
+               <injection-target-name>session2MessageDestinationRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2MessageDestinationRef2Injection2Class</injection-target-class>
+               <injection-target-name>session2MessageDestinationRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="session2MessageDestinationRef3-id">
+            <description>en-session2MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-session2MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-session2MessageDestinationRef3-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
+               <injection-target-name>session2MessageDestinationRef3Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2MessageDestinationRef3Injection2Class</injection-target-class>
+               <injection-target-name>session2MessageDestinationRef3Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <security-identity id="session2SecurityIdentity-id">
+            <description>en-session2SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
+            <description xml:lang="de">de-session2SecurityIdentity-desc</description>
+            <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+-->
+         <clustered>false</clustered>
+<!--         
+         <cluster-config id="session2ClusterConfig-id">
+            <description>en-session2ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-session2ClusterConfig-desc</description>
+            <description xml:lang="de">de-session2ClusterConfig-desc</description>
+-->
+         <cluster-config>
+            <partition-name>session2ClusterConfigPartitionName</partition-name>
+            <home-load-balance-policy>session2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
+            <bean-load-balance-policy>session2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
+            <session-state-manager-jndi-name>session2ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
+         </cluster-config>
+
+<!--         <security-domain>session2SecurityDomain</security-domain> -->
+
+<!--         
+         <method-attributes id="session2MethodAttributes-id">
+            <method id="session2MethodAttributesMethod1-id">
+-->
+         <method-attributes>
+            <method>
+               <method-name>get*</method-name>
+               <read-only>true</read-only>
+               <idempotent>true</idempotent>
+               <transaction-timeout>5000</transaction-timeout>
+            </method>
+<!--            <method id="session2MethodAttributesMethod2-id"> -->
+            <method>
+               <method-name>*</method-name>
+            </method>
+         </method-attributes>
+         
+         <depends>session2Depends1</depends>
+         <depends>session2Depends2</depends>
+<!--         
+         <ior-security-config id="session2IorSecurityConfig-id">
+            <description>en-session2IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
+            <transport-config id="session2TransportConfig-id">
+               <description>en-session2TransportConfig-desc</description>
+               <description xml:lang="fr">fr-session2TransportConfig-desc</description>
+               <description xml:lang="de">de-session2TransportConfig-desc</description>
+-->
+         <ior-security-config>
+            <transport-config>
+               <integrity>NONE</integrity>
+               <confidentiality>NONE</confidentiality>
+               <establish-trust-in-target>NONE</establish-trust-in-target>
+               <establish-trust-in-client>NONE</establish-trust-in-client>
+               <detect-misordering>NONE</detect-misordering>
+               <detect-replay>NONE</detect-replay>
+            </transport-config>
+<!--
+            <as-context id="session2ASContext-id">
+               <description>en-session2ASContext-desc</description>
+               <description xml:lang="fr">fr-session2ASContext-desc</description>
+               <description xml:lang="de">de-session2ASContext-desc</description>
+-->
+            <as-context>
+               <auth-method>USERNAME_PASSWORD</auth-method>
+               <realm>session2ASContextRealm</realm>
+               <required>false</required>
+            </as-context>
+<!--
+            <sas-context id="session2SASContext-id">
+               <description>en-session2SASContext-desc</description>
+               <description xml:lang="fr">fr-session2SASContext-desc</description>
+               <description xml:lang="de">de-session2SASContext-desc</description>
+-->
+            <sas-context>
+               <caller-propagation>NONE</caller-propagation>
+            </sas-context>
+         </ior-security-config>
+         
+<!--         <port-component id="session2PortComponent-id"> -->
+         <port-component>
+            <port-component-name>session2-PortComponent</port-component-name>
+            <port-component-uri>/session2/PortComponentURI</port-component-uri>
+            <auth-method>BASIC</auth-method>
+            <transport-guarantee>NONE</transport-guarantee>
+<!--            <secure-wsdl-access>true</secure-wsdl-access> -->
+         </port-component>         
+<!--         
+         <ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
+            <description>en-session2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
+-->
+         <ejb-timeout-identity>
+            <run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
+         </ejb-timeout-identity>
+<!--         
+         <annotation id="session2Annotation1-id">
+            <description>en-session2Annotation1-desc</description>
+            <description xml:lang="fr">fr-session2Annotation1-desc</description>
+            <description xml:lang="de">de-session2Annotation1-desc</description>
+            
+            <annotation-class>session2Annotation1Class</annotation-class>
+            <annotation-implementation-class>session2Annotation1Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>session2Annotation1InjectionTargetClass</injection-target-class>
+               <injection-target-name>session2Annotation1InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="session2Annotation1Property1-id">
+               <description>en-session2Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-session2Annotation1Property1-desc</description>
+               <description xml:lang="de">de-session2Annotation1Property1-desc</description>
+               <property-name>session2Annotation1Property1Name</property-name>
+               <property-value>session2Annotation1Property1Value</property-value>
+            </property>
+            <property id="session2Annotation1Property2-id">
+               <description>en-session2Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-session2Annotation1Property2-desc</description>
+               <description xml:lang="de">de-session2Annotation1Property2-desc</description>
+               <property-name>session2Annotation1Property2Name</property-name>
+               <property-value>session2Annotation1Property2Value</property-value>
+            </property>
+         </annotation>
+         <annotation id="session2Annotation2-id">
+            <description>en-session2Annotation2-desc</description>
+            <description xml:lang="fr">fr-session2Annotation2-desc</description>
+            <description xml:lang="de">de-session2Annotation2-desc</description>
+            
+            <annotation-class>session2Annotation2Class</annotation-class>
+            <annotation-implementation-class>session2Annotation2Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>session2Annotation2InjectionTargetClass</injection-target-class>
+               <injection-target-name>session2Annotation2InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="session2Annotation2Property1-id">
+               <description>en-session2Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-session2Annotation2Property1-desc</description>
+               <description xml:lang="de">de-session2Annotation2Property1-desc</description>
+               <property-name>session2Annotation2Property1Name</property-name>
+               <property-value>session2Annotation2Property1Value</property-value>
+            </property>
+            <property id="session2Annotation2Property2-id">
+               <description>en-session2Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-session2Annotation2Property2-desc</description>
+               <description xml:lang="de">de-session2Annotation2Property2-desc</description>
+               <property-name>session2Annotation2Property2Name</property-name>
+               <property-value>session2Annotation2Property2Value</property-value>
+            </property>
+         </annotation>
+
+         <ignore-dependency id="session2IgnoreDependency-id">
+            <description>en-session2IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-session2IgnoreDependency-desc</description>
+            <description xml:lang="de">de-session2IgnoreDependency-desc</description>
+            <injection-target>
+               <injection-target-class>session2IgnoreDependencyInjection1Class</injection-target-class>
+               <injection-target-name>session2IgnoreDependencyInjection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2IgnoreDependencyInjection2Class</injection-target-class>
+               <injection-target-name>session2IgnoreDependencyInjection2Name</injection-target-name>
+            </injection-target>
+         </ignore-dependency>
+
+         <aop-domain-name>session2AOPDomain</aop-domain-name>         
+         
+         <cache-config>
+            <cache-value>session2CacheClass</cache-value>
+            <cache-max-size>20</cache-max-size>
+            <idle-timeout-seconds>22</idle-timeout-seconds>
+            <remove-timeout-seconds>24</remove-timeout-seconds>
+            <cache-name>session2CacheName</cache-name>
+            <persistence-manager>session2PersistenceManager</persistence-manager>
+         </cache-config>
+         
+         <pool-config>
+            <pool-value>session2PoolClass</pool-value>
+            <pool-max-size>10</pool-max-size>
+            <pool-timeout>11</pool-timeout>
+         </pool-config>
+
+         <concurrent>false</concurrent>         
+         
+         <jndi-ref id="session2JndiRef1-id">
+            <description>en-session2JndiRef1-desc</description>
+            <description xml:lang="fr">fr-session2JndiRef1-desc</description>
+            <description xml:lang="de">de-session2JndiRef1-desc</description>
+            <jndi-ref-name>session2JndiRef1Name</jndi-ref-name>
+            <mapped-name>session2JndiRef1MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>session2JndiRef1Injection1Class</injection-target-class>
+               <injection-target-name>session2JndiRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2JndiRef1Injection2Class</injection-target-class>
+               <injection-target-name>session2JndiRef1Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         <jndi-ref id="session2JndiRef2-id">
+            <description>en-session2JndiRef2-desc</description>
+            <description xml:lang="fr">fr-session2JndiRef2-desc</description>
+            <description xml:lang="de">de-session2JndiRef2-desc</description>
+            <jndi-ref-name>session2JndiRef2Name</jndi-ref-name>
+            <mapped-name>session2JndiRef2MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>session2JndiRef2Injection1Class</injection-target-class>
+               <injection-target-name>session2JndiRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>session2JndiRef2Injection2Class</injection-target-class>
+               <injection-target-name>session2JndiRef2Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+-->
+      </session>
+
+      <entity>
+         <ejb-name>entity0EjbName</ejb-name>
+      </entity>
+<!--
+      <entity id="entity1-id">
+         <description>en-entity1-desc</description>
+         <description xml:lang="fr">fr-entity1-desc</description>
+         <description xml:lang="de">de-entity1-desc</description>
+         <display-name>en-entity1-disp</display-name>
+         <display-name xml:lang="fr">fr-entity1-disp</display-name>
+         <display-name xml:lang="de">de-entity1-disp</display-name>
+         <icon id="en-entity1-icon-id">
+            <small-icon>en-entity1-small-icon</small-icon>
+            <large-icon>en-entity1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-entity1-icon-id">
+            <small-icon>fr-entity1-small-icon</small-icon>
+            <large-icon>fr-entity1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-entity1-icon-id">
+            <small-icon>de-entity1-small-icon</small-icon>
+            <large-icon>de-entity1-large-icon</large-icon>
+         </icon>
+-->
+      <entity id="entity1-id">
+         <ejb-name>entity1EjbName</ejb-name>
+
+         <jndi-name>entity1JndiName</jndi-name>
+         <local-jndi-name>entity1LocalJndiName</local-jndi-name>
+         <call-by-value>true</call-by-value>
+         <read-only>true</read-only>
+         <exception-on-rollback>true</exception-on-rollback>
+         <timer-persistence>true</timer-persistence>
+         <configuration-name>entity1ConfigurationName</configuration-name>
+<!--
+         <invoker-bindings id="entity1InvokerBindings-id">
+            <description>en-entity1InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-entity1InvokerBindings-desc</description>
+            <description xml:lang="de">de-entity1InvokerBindings-desc</description>
+
+            <invoker id="entity1Invoker1-id">
+               <description>en-entity1Invoker1-desc</description>
+               <description xml:lang="fr">fr-entity1Invoker1-desc</description>
+               <description xml:lang="de">de-entity1Invoker1-desc</description>
+-->
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+               <jndi-name>entity1Invoker1JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
+                  <jndi-name>entity1Invoker1EjbName1</jndi-name>
+               </ejb-ref>
+            </invoker>
+<!--
+            <invoker id="entity1Invoker2-id">
+               <description>en-entity1Invoker2-desc</description>
+               <description xml:lang="fr">fr-entity1Invoker2-desc</description>
+               <description xml:lang="de">de-entity1Invoker2-desc</description>
+-->
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+               <jndi-name>entity1Invoker2JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
+                  <jndi-name>entity1Invoker2EjbName1</jndi-name>
+               </ejb-ref>
+               <ejb-ref>
+                  <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
+                  <jndi-name>entity1Invoker2EjbName2</jndi-name>
+               </ejb-ref>
+            </invoker>
+         </invoker-bindings>
+         
+         <security-proxy>entity1SecurityProxy</security-proxy>
+<!--
+         <ejb-ref id="entity1EjbRef1-id">
+            <description>en-entity1EjbRef1-desc</description>
+            <description xml:lang="fr">fr-entity1EjbRef1-desc</description>
+            <description xml:lang="de">de-entity1EjbRef1-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1EjbRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity1EjbRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1EjbRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity1EjbRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1EjbRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </ejb-ref>
+<!--
+         <ejb-ref id="entity1EjbRef2-id">
+            <description>en-entity1EjbRef2-desc</description>
+            <description xml:lang="fr">fr-entity1EjbRef2-desc</description>
+            <description xml:lang="de">de-entity1EjbRef2-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1EjbRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity1EjbRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1EjbRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity1EjbRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1EjbRef2JndiName</jndi-name>
+         </ejb-ref>
+<!--
+         <ejb-local-ref id="entity1EjbLocalRef1-id">
+            <description>en-entity1EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-entity1EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-entity1EjbLocalRef1-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1EjbLocalRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity1EjbLocalRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1EjbLocalRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity1EjbLocalRef1Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>entity1EjbLocalRef1JndiName</jndi-name>
+            <ignore-dependency/>
+-->
+            <local-jndi-name>entity1EjbLocalRef1JndiName</local-jndi-name>
+         </ejb-local-ref>
+<!--
+         <ejb-local-ref id="entity1EjbLocalRef2-id">
+            <description>en-entity1EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-entity1EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-entity1EjbLocalRef2-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1EjbLocalRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity1EjbLocalRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1EjbLocalRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity1EjbLocalRef2Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>entity1EjbLocalRef2JndiName</jndi-name>
+-->
+            <local-jndi-name>entity1EjbLocalRef2JndiName</local-jndi-name>
+         </ejb-local-ref>
+
+         <!-- TODO service-ref -->
+
+         <security-identity>
+            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+<!--
+         <resource-ref id="entity1ResourceRef1-id">
+            <description>en-entity1ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
+            <description xml:lang="de">de-entity1ResourceRef1-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>entity1ResourceRef1Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity1ResourceRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1ResourceRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity1ResourceRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1ResourceRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-ref>
+<!--
+         <resource-ref id="entity1ResourceRef2-id">
+            <description>en-entity1ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceRef2-desc</description>
+            <description xml:lang="de">de-entity1ResourceRef2-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>entity1ResourceRef2Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity1ResourceRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1ResourceRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity1ResourceRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1ResourceRef2JndiName</jndi-name>
+         </resource-ref>
+<!--
+         <resource-env-ref id="entity1ResourceEnvRef1-id">
+            <description>en-entity1ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-entity1ResourceEnvRef1-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity1ResourceEnvRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1ResourceEnvRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity1ResourceEnvRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1ResourceEnvRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-env-ref>
+<!--
+         <resource-env-ref id="entity1ResourceEnvRef2-id">
+            <description>en-entity1ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-entity1ResourceEnvRef2-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity1ResourceEnvRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1ResourceEnvRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity1ResourceEnvRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1ResourceEnvRef2JndiName</jndi-name>
+         </resource-env-ref>
+<!--
+         <message-destination-ref id="entity1MessageDestinationRef1-id">
+            <description>en-entity1MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-entity1MessageDestinationRef1-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity1MessageDestinationRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1MessageDestinationRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity1MessageDestinationRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1MessageDestinationRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="entity1MessageDestinationRef2-id">
+            <description>en-entity1MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-entity1MessageDestinationRef2-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity1MessageDestinationRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1MessageDestinationRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity1MessageDestinationRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1MessageDestinationRef2JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="entity1MessageDestinationRef3-id">
+            <description>en-entity1MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-entity1MessageDestinationRef3-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
+               <injection-target-name>entity1MessageDestinationRef3Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1MessageDestinationRef3Injection2Class</injection-target-class>
+               <injection-target-name>entity1MessageDestinationRef3Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <method-attributes id="entity1MethodAttributes-id">
+            <method id="entity1MethodAttributesMethod1-id">
+-->
+         <method-attributes>
+            <method>
+               <method-name>get*</method-name>
+               <read-only>true</read-only>
+               <idempotent>true</idempotent>
+               <transaction-timeout>5000</transaction-timeout>
+            </method>
+<!--            <method id="entity1MethodAttributesMethod2-id"> -->
+            <method>
+               <method-name>*</method-name>
+            </method>
+         </method-attributes>
+<!--
+         <security-identity id="entity1SecurityIdentity-id">
+            <description>en-entity1SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
+            <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
+            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+-->
+         <clustered>true</clustered>
+<!--         
+         <cluster-config id="entity1ClusterConfig-id">
+            <description>en-entity1ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-entity1ClusterConfig-desc</description>
+            <description xml:lang="de">de-entity1ClusterConfig-desc</description>
+-->
+         <cluster-config>
+            <partition-name>entity1ClusterConfigPartitionName</partition-name>
+            <home-load-balance-policy>entity1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
+            <bean-load-balance-policy>entity1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
+         </cluster-config>
+         
+<!--         <security-domain>entity1SecurityDomain</security-domain> -->
+         
+         <cache-invalidation>true</cache-invalidation>
+<!--
+         <cache-invalidation-config id="entity1CacheInvalidationConfig-id">
+            <description>en-entity1CacheInvalidationConfig-desc</description>
+            <description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</description>
+            <description xml:lang="de">de-entity1CacheInvalidationConfig-desc</description>
+-->
+         <cache-invalidation-config>
+            <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
+            <invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
+         </cache-invalidation-config>
+         
+         <depends>entity1Depends1</depends>
+         <depends>entity1Depends2</depends>
+<!--         
+         <ior-security-config id="entity1IorSecurityConfig-id">
+            <description>en-entity1IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-entity1IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-entity1IorSecurityConfig-desc</description>
+            <transport-config id="entity1TransportConfig-id">
+               <description>en-entity1TransportConfig-desc</description>
+               <description xml:lang="fr">fr-entity1TransportConfig-desc</description>
+               <description xml:lang="de">de-entity1TransportConfig-desc</description>
+-->
+         <ior-security-config>
+            <transport-config>
+               <integrity>NONE</integrity>
+               <confidentiality>NONE</confidentiality>
+               <establish-trust-in-target>NONE</establish-trust-in-target>
+               <establish-trust-in-client>NONE</establish-trust-in-client>
+               <detect-misordering>NONE</detect-misordering>
+               <detect-replay>NONE</detect-replay>
+            </transport-config>
+<!--
+            <as-context id="entity1ASContext-id">
+               <description>en-entity1ASContext-desc</description>
+               <description xml:lang="fr">fr-entity1ASContext-desc</description>
+               <description xml:lang="de">de-entity1ASContext-desc</description>
+-->
+            <as-context>
+               <auth-method>USERNAME_PASSWORD</auth-method>
+               <realm>entity1ASContextRealm</realm>
+               <required>false</required>
+            </as-context>
+<!--
+            <sas-context id="entity1SASContext-id">
+               <description>en-entity1SASContext-desc</description>
+               <description xml:lang="fr">fr-entity1SASContext-desc</description>
+               <description xml:lang="de">de-entity1SASContext-desc</description>
+-->
+            <sas-context>
+               <caller-propagation>NONE</caller-propagation>
+            </sas-context>
+         </ior-security-config>
+<!--
+         <annotation id="entity1Annotation1-id">
+            <description>en-entity1Annotation1-desc</description>
+            <description xml:lang="fr">fr-entity1Annotation1-desc</description>
+            <description xml:lang="de">de-entity1Annotation1-desc</description>
+            
+            <annotation-class>entity1Annotation1Class</annotation-class>
+            <annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>entity1Annotation1InjectionTargetClass</injection-target-class>
+               <injection-target-name>entity1Annotation1InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="entity1Annotation1Property1-id">
+               <description>en-entity1Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation1Property1-desc</description>
+               <description xml:lang="de">de-entity1Annotation1Property1-desc</description>
+               <property-name>entity1Annotation1Property1Name</property-name>
+               <property-value>entity1Annotation1Property1Value</property-value>
+            </property>
+            <property id="entity1Annotation1Property2-id">
+               <description>en-entity1Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation1Property2-desc</description>
+               <description xml:lang="de">de-entity1Annotation1Property2-desc</description>
+               <property-name>entity1Annotation1Property2Name</property-name>
+               <property-value>entity1Annotation1Property2Value</property-value>
+            </property>
+         </annotation>
+         <annotation id="entity1Annotation2-id">
+            <description>en-entity1Annotation2-desc</description>
+            <description xml:lang="fr">fr-entity1Annotation2-desc</description>
+            <description xml:lang="de">de-entity1Annotation2-desc</description>
+            
+            <annotation-class>entity1Annotation2Class</annotation-class>
+            <annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>entity1Annotation2InjectionTargetClass</injection-target-class>
+               <injection-target-name>entity1Annotation2InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="entity1Annotation2Property1-id">
+               <description>en-entity1Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation2Property1-desc</description>
+               <description xml:lang="de">de-entity1Annotation2Property1-desc</description>
+               <property-name>entity1Annotation2Property1Name</property-name>
+               <property-value>entity1Annotation2Property1Value</property-value>
+            </property>
+            <property id="entity1Annotation2Property2-id">
+               <description>en-entity1Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation2Property2-desc</description>
+               <description xml:lang="de">de-entity1Annotation2Property2-desc</description>
+               <property-name>entity1Annotation2Property2Name</property-name>
+               <property-value>entity1Annotation2Property2Value</property-value>
+            </property>
+         </annotation>
+
+         <ignore-dependency id="entity1IgnoreDependency-id">
+            <description>en-entity1IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-entity1IgnoreDependency-desc</description>
+            <description xml:lang="de">de-entity1IgnoreDependency-desc</description>
+            <injection-target>
+               <injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
+               <injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1IgnoreDependencyInjection2Class</injection-target-class>
+               <injection-target-name>entity1IgnoreDependencyInjection2Name</injection-target-name>
+            </injection-target>
+         </ignore-dependency>
+
+         <aop-domain-name>entity1AOPDomain</aop-domain-name>         
+         
+         <!- - TODO cache config - ->
+         
+         <!- - TODO pool config - ->
+         
+         <jndi-ref id="entity1JndiRef1-id">
+            <description>en-entity1JndiRef1-desc</description>
+            <description xml:lang="fr">fr-entity1JndiRef1-desc</description>
+            <description xml:lang="de">de-entity1JndiRef1-desc</description>
+            <jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
+            <mapped-name>entity1JndiRef1MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>entity1JndiRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity1JndiRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1JndiRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity1JndiRef1Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         <jndi-ref id="entity1JndiRef2-id">
+            <description>en-entity1JndiRef2-desc</description>
+            <description xml:lang="fr">fr-entity1JndiRef2-desc</description>
+            <description xml:lang="de">de-entity1JndiRef2-desc</description>
+            <jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
+            <mapped-name>entity1JndiRef2MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>entity1JndiRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity1JndiRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity1JndiRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity1JndiRef2Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+-->
+      </entity>
+
+      <entity id="entity2-id">
+<!--
+         <description>en-entity2-desc</description>
+         <description xml:lang="fr">fr-entity2-desc</description>
+         <description xml:lang="de">de-entity2-desc</description>
+         <display-name>en-entity2-disp</display-name>
+         <display-name xml:lang="fr">fr-entity2-disp</display-name>
+         <display-name xml:lang="de">de-entity2-disp</display-name>
+         <icon id="en-entity2-icon-id">
+            <small-icon>en-entity2-small-icon</small-icon>
+            <large-icon>en-entity2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-entity2-icon-id">
+            <small-icon>fr-entity2-small-icon</small-icon>
+            <large-icon>fr-entity2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-entity2-icon-id">
+            <small-icon>de-entity2-small-icon</small-icon>
+            <large-icon>de-entity2-large-icon</large-icon>
+         </icon>
+-->
+         <ejb-name>entity2EjbName</ejb-name>
+
+         <jndi-name>entity2JndiName</jndi-name>
+         <local-jndi-name>entity2LocalJndiName</local-jndi-name>
+         <call-by-value>false</call-by-value>
+         <read-only>false</read-only>
+         <exception-on-rollback>false</exception-on-rollback>
+         <timer-persistence>false</timer-persistence>
+         <configuration-name>entity2ConfigurationName</configuration-name>
+<!--
+         <invoker-bindings id="entity2InvokerBindings-id">
+            <description>en-entity2InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-entity2InvokerBindings-desc</description>
+            <description xml:lang="de">de-entity2InvokerBindings-desc</description>
+
+            <invoker id="entity2Invoker1-id">
+               <description>en-entity2Invoker1-desc</description>
+               <description xml:lang="fr">fr-entity2Invoker1-desc</description>
+               <description xml:lang="de">de-entity2Invoker1-desc</description>
+-->
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+               <jndi-name>entity2Invoker1JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
+                  <jndi-name>entity2Invoker1EjbName1</jndi-name>
+               </ejb-ref>
+            </invoker>
+<!--
+            <invoker id="entity2Invoker2-id">
+               <description>en-entity2Invoker2-desc</description>
+               <description xml:lang="fr">fr-entity2Invoker2-desc</description>
+               <description xml:lang="de">de-entity2Invoker2-desc</description>
+-->
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+               <jndi-name>entity2Invoker2JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
+                  <jndi-name>entity2Invoker2EjbName1</jndi-name>
+               </ejb-ref>
+               <ejb-ref>
+                  <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
+                  <jndi-name>entity2Invoker2EjbName2</jndi-name>
+               </ejb-ref>
+            </invoker>
+         </invoker-bindings>
+         
+         <security-proxy>entity2SecurityProxy</security-proxy>
+<!--
+         <ejb-ref id="entity2EjbRef1-id">
+            <description>en-entity2EjbRef1-desc</description>
+            <description xml:lang="fr">fr-entity2EjbRef1-desc</description>
+            <description xml:lang="de">de-entity2EjbRef1-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2EjbRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity2EjbRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2EjbRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity2EjbRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2EjbRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </ejb-ref>
+<!--
+         <ejb-ref id="entity2EjbRef2-id">
+            <description>en-entity2EjbRef2-desc</description>
+            <description xml:lang="fr">fr-entity2EjbRef2-desc</description>
+            <description xml:lang="de">de-entity2EjbRef2-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2EjbRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity2EjbRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2EjbRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity2EjbRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2EjbRef2JndiName</jndi-name>
+         </ejb-ref>
+
+<!--
+         <ejb-local-ref id="entity2EjbLocalRef1-id">
+            <description>en-entity2EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-entity2EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-entity2EjbLocalRef1-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2EjbLocalRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity2EjbLocalRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2EjbLocalRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity2EjbLocalRef1Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>entity2EjbLocalRef1JndiName</jndi-name>
+            <ignore-dependency/>
+-->
+            <local-jndi-name>entity2EjbLocalRef1JndiName</local-jndi-name>
+         </ejb-local-ref>
+<!--
+         <ejb-local-ref id="entity2EjbLocalRef2-id">
+            <description>en-entity2EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-entity2EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-entity2EjbLocalRef2-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2EjbLocalRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity2EjbLocalRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2EjbLocalRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity2EjbLocalRef2Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>entity2EjbLocalRef2JndiName</jndi-name>
+-->
+            <local-jndi-name>entity2EjbLocalRef2JndiName</local-jndi-name>
+         </ejb-local-ref>
+
+         <!-- TODO service-ref -->
+
+         <security-identity>
+            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+<!--
+         <resource-ref id="entity2ResourceRef1-id">
+            <description>en-entity2ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
+            <description xml:lang="de">de-entity2ResourceRef1-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>entity2ResourceRef1Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity2ResourceRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2ResourceRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity2ResourceRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2ResourceRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-ref>
+<!--
+         <resource-ref id="entity2ResourceRef2-id">
+            <description>en-entity2ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceRef2-desc</description>
+            <description xml:lang="de">de-entity2ResourceRef2-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>entity2ResourceRef2Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity2ResourceRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2ResourceRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity2ResourceRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2ResourceRef2JndiName</jndi-name>
+         </resource-ref>
+<!--
+         <resource-env-ref id="entity2ResourceEnvRef1-id">
+            <description>en-entity2ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-entity2ResourceEnvRef1-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity2ResourceEnvRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2ResourceEnvRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity2ResourceEnvRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2ResourceEnvRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-env-ref>
+<!--
+         <resource-env-ref id="entity2ResourceEnvRef2-id">
+            <description>en-entity2ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-entity2ResourceEnvRef2-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity2ResourceEnvRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2ResourceEnvRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity2ResourceEnvRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2ResourceEnvRef2JndiName</jndi-name>
+         </resource-env-ref>
+<!--
+         <message-destination-ref id="entity2MessageDestinationRef1-id">
+            <description>en-entity2MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-entity2MessageDestinationRef1-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity2MessageDestinationRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2MessageDestinationRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity2MessageDestinationRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2MessageDestinationRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="entity2MessageDestinationRef2-id">
+            <description>en-entity2MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-entity2MessageDestinationRef2-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity2MessageDestinationRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2MessageDestinationRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity2MessageDestinationRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2MessageDestinationRef2JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="entity2MessageDestinationRef3-id">
+            <description>en-entity2MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-entity2MessageDestinationRef3-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
+               <injection-target-name>entity2MessageDestinationRef3Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2MessageDestinationRef3Injection2Class</injection-target-class>
+               <injection-target-name>entity2MessageDestinationRef3Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <method-attributes id="entity2MethodAttributes-id">
+            <method id="entity2MethodAttributesMethod1-id">
+-->
+         <method-attributes>
+            <method>
+               <method-name>get*</method-name>
+               <read-only>true</read-only>
+               <idempotent>true</idempotent>
+               <transaction-timeout>5000</transaction-timeout>
+            </method>
+<!--            <method id="entity2MethodAttributesMethod2-id"> -->
+            <method>
+               <method-name>*</method-name>
+            </method>
+         </method-attributes>
+<!--
+         <security-identity id="entity2SecurityIdentity-id">
+            <description>en-entity2SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
+            <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
+            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+-->
+         <clustered>false</clustered>
+<!--         
+         <cluster-config id="entity2ClusterConfig-id">
+            <description>en-entity2ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-entity2ClusterConfig-desc</description>
+            <description xml:lang="de">de-entity2ClusterConfig-desc</description>
+-->
+         <cluster-config>
+            <partition-name>entity2ClusterConfigPartitionName</partition-name>
+            <home-load-balance-policy>entity2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
+            <bean-load-balance-policy>entity2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
+         </cluster-config>
+         
+<!--         <security-domain>entity2SecurityDomain</security-domain> -->
+
+         <cache-invalidation>false</cache-invalidation>
+<!--
+         <cache-invalidation-config id="entity2CacheInvalidationConfig-id">
+            <description>en-entity2CacheInvalidationConfig-desc</description>
+            <description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</description>
+            <description xml:lang="de">de-entity2CacheInvalidationConfig-desc</description>
+-->
+         <cache-invalidation-config>
+            <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
+            <invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
+         </cache-invalidation-config>
+         
+         <depends>entity2Depends1</depends>
+         <depends>entity2Depends2</depends>
+         
+<!--
+         <ior-security-config id="entity2IorSecurityConfig-id">
+            <description>en-entity2IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-entity2IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-entity2IorSecurityConfig-desc</description>
+            <transport-config id="entity2TransportConfig-id">
+               <description>en-entity2TransportConfig-desc</description>
+               <description xml:lang="fr">fr-entity2TransportConfig-desc</description>
+               <description xml:lang="de">de-entity2TransportConfig-desc</description>
+
+-->
+         <ior-security-config>
+            <transport-config>
+               <integrity>NONE</integrity>
+               <confidentiality>NONE</confidentiality>
+               <establish-trust-in-target>NONE</establish-trust-in-target>
+               <establish-trust-in-client>NONE</establish-trust-in-client>
+               <detect-misordering>NONE</detect-misordering>
+               <detect-replay>NONE</detect-replay>
+            </transport-config>
+<!--
+            <as-context id="entity2ASContext-id">
+               <description>en-entity2ASContext-desc</description>
+               <description xml:lang="fr">fr-entity2ASContext-desc</description>
+               <description xml:lang="de">de-entity2ASContext-desc</description>
+-->
+            <as-context>
+               <auth-method>USERNAME_PASSWORD</auth-method>
+               <realm>entity2ASContextRealm</realm>
+               <required>false</required>
+            </as-context>
+<!--
+            <sas-context id="entity2SASContext-id">
+               <description>en-entity2SASContext-desc</description>
+               <description xml:lang="fr">fr-entity2SASContext-desc</description>
+               <description xml:lang="de">de-entity2SASContext-desc</description>
+-->
+            <sas-context>
+               <caller-propagation>NONE</caller-propagation>
+            </sas-context>
+         </ior-security-config>
+<!--
+         <annotation id="entity2Annotation1-id">
+            <description>en-entity2Annotation1-desc</description>
+            <description xml:lang="fr">fr-entity2Annotation1-desc</description>
+            <description xml:lang="de">de-entity2Annotation1-desc</description>
+            
+            <annotation-class>entity2Annotation1Class</annotation-class>
+            <annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>entity2Annotation1InjectionTargetClass</injection-target-class>
+               <injection-target-name>entity2Annotation1InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="entity2Annotation1Property1-id">
+               <description>en-entity2Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation1Property1-desc</description>
+               <description xml:lang="de">de-entity2Annotation1Property1-desc</description>
+               <property-name>entity2Annotation1Property1Name</property-name>
+               <property-value>entity2Annotation1Property1Value</property-value>
+            </property>
+            <property id="entity2Annotation1Property2-id">
+               <description>en-entity2Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation1Property2-desc</description>
+               <description xml:lang="de">de-entity2Annotation1Property2-desc</description>
+               <property-name>entity2Annotation1Property2Name</property-name>
+               <property-value>entity2Annotation1Property2Value</property-value>
+            </property>
+         </annotation>
+         <annotation id="entity2Annotation2-id">
+            <description>en-entity2Annotation2-desc</description>
+            <description xml:lang="fr">fr-entity2Annotation2-desc</description>
+            <description xml:lang="de">de-entity2Annotation2-desc</description>
+            
+            <annotation-class>entity2Annotation2Class</annotation-class>
+            <annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>entity2Annotation2InjectionTargetClass</injection-target-class>
+               <injection-target-name>entity2Annotation2InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="entity2Annotation2Property1-id">
+               <description>en-entity2Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation2Property1-desc</description>
+               <description xml:lang="de">de-entity2Annotation2Property1-desc</description>
+               <property-name>entity2Annotation2Property1Name</property-name>
+               <property-value>entity2Annotation2Property1Value</property-value>
+            </property>
+            <property id="entity2Annotation2Property2-id">
+               <description>en-entity2Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation2Property2-desc</description>
+               <description xml:lang="de">de-entity2Annotation2Property2-desc</description>
+               <property-name>entity2Annotation2Property2Name</property-name>
+               <property-value>entity2Annotation2Property2Value</property-value>
+            </property>
+         </annotation>
+
+         <ignore-dependency id="entity2IgnoreDependency-id">
+            <description>en-entity2IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-entity2IgnoreDependency-desc</description>
+            <description xml:lang="de">de-entity2IgnoreDependency-desc</description>
+            <injection-target>
+               <injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
+               <injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2IgnoreDependencyInjection2Class</injection-target-class>
+               <injection-target-name>entity2IgnoreDependencyInjection2Name</injection-target-name>
+            </injection-target>
+         </ignore-dependency>
+
+         <aop-domain-name>entity2AOPDomain</aop-domain-name>         
+         
+         <!- - TODO cache config - ->
+         
+         <!- - TODO pool config - ->
+         
+         <jndi-ref id="entity2JndiRef1-id">
+            <description>en-entity2JndiRef1-desc</description>
+            <description xml:lang="fr">fr-entity2JndiRef1-desc</description>
+            <description xml:lang="de">de-entity2JndiRef1-desc</description>
+            <jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
+            <mapped-name>entity2JndiRef1MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>entity2JndiRef1Injection1Class</injection-target-class>
+               <injection-target-name>entity2JndiRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2JndiRef1Injection2Class</injection-target-class>
+               <injection-target-name>entity2JndiRef1Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         <jndi-ref id="entity2JndiRef2-id">
+            <description>en-entity2JndiRef2-desc</description>
+            <description xml:lang="fr">fr-entity2JndiRef2-desc</description>
+            <description xml:lang="de">de-entity2JndiRef2-desc</description>
+            <jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
+            <mapped-name>entity2JndiRef2MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>entity2JndiRef2Injection1Class</injection-target-class>
+               <injection-target-name>entity2JndiRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>entity2JndiRef2Injection2Class</injection-target-class>
+               <injection-target-name>entity2JndiRef2Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+-->
+      </entity>
+
+      <message-driven>
+         <ejb-name>mdb0EjbName</ejb-name>
+      </message-driven>
+
+      <message-driven id="mdb1-id">
+<!--
+         <description>en-mdb1-desc</description>
+         <description xml:lang="fr">fr-mdb1-desc</description>
+         <description xml:lang="de">de-mdb1-desc</description>
+         <display-name>en-mdb1-disp</display-name>
+         <display-name xml:lang="fr">fr-mdb1-disp</display-name>
+         <display-name xml:lang="de">de-mdb1-disp</display-name>
+         <icon id="en-mdb1-icon-id">
+            <small-icon>en-mdb1-small-icon</small-icon>
+            <large-icon>en-mdb1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-mdb1-icon-id">
+            <small-icon>fr-mdb1-small-icon</small-icon>
+            <large-icon>fr-mdb1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-mdb1-icon-id">
+            <small-icon>de-mdb1-small-icon</small-icon>
+            <large-icon>de-mdb1-large-icon</large-icon>
+         </icon>
+-->
+         <ejb-name>mdb1EjbName</ejb-name>
+
+         <destination-jndi-name>mdb1DestinationJndiName</destination-jndi-name>
+         <local-jndi-name>mdb1LocalJndiName</local-jndi-name>
+         <mdb-user>mdb1User</mdb-user>
+         <mdb-passwd>mdb1Password</mdb-passwd>
+         <mdb-client-id>mdb1ClientId</mdb-client-id>
+         <mdb-subscription-id>mdb1SubscriptionId</mdb-subscription-id>
+         <resource-adapter-name>mdb1RAR</resource-adapter-name>
+         <exception-on-rollback>true</exception-on-rollback>
+         <timer-persistence>true</timer-persistence>
+         <configuration-name>mdb1ConfigurationName</configuration-name>
+<!--
+         <invoker-bindings id="mdb1InvokerBindings-id">
+            <description>en-mdb1InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-mdb1InvokerBindings-desc</description>
+            <description xml:lang="de">de-mdb1InvokerBindings-desc</description>
+
+            <invoker id="mdb1Invoker1-id">
+               <description>en-mdb1Invoker1-desc</description>
+               <description xml:lang="fr">fr-mdb1Invoker1-desc</description>
+               <description xml:lang="de">de-mdb1Invoker1-desc</description>
+-->
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+               <jndi-name>mdb1Invoker1JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
+                  <jndi-name>mdb1Invoker1EjbName1</jndi-name>
+               </ejb-ref>
+            </invoker>
+<!--
+            <invoker id="mdb1Invoker2-id">
+               <description>en-mdb1Invoker2-desc</description>
+               <description xml:lang="fr">fr-mdb1Invoker2-desc</description>
+               <description xml:lang="de">de-mdb1Invoker2-desc</description>
+-->
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+               <jndi-name>mdb1Invoker2JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
+                  <jndi-name>mdb1Invoker2EjbName1</jndi-name>
+               </ejb-ref>
+               <ejb-ref>
+                  <ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
+                  <jndi-name>mdb1Invoker2EjbName2</jndi-name>
+               </ejb-ref>
+            </invoker>
+         </invoker-bindings>
+         
+         <security-proxy>mdb1SecurityProxy</security-proxy>
+<!--         
+         <ejb-ref id="mdb1EjbRef1-id">
+            <description>en-mdb1EjbRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbRef1-desc</description>
+            <description xml:lang="de">de-mdb1EjbRef1-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1EjbRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb1EjbRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1EjbRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb1EjbRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1EjbRef1JndiName</jndi-name>
+<!--
+            <ignore-dependency/>
+-->
+         </ejb-ref>
+<!--
+         <ejb-ref id="mdb1EjbRef2-id">
+            <description>en-mdb1EjbRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbRef2-desc</description>
+            <description xml:lang="de">de-mdb1EjbRef2-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1EjbRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb1EjbRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1EjbRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb1EjbRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1EjbRef2JndiName</jndi-name>
+         </ejb-ref>
+<!--
+         <ejb-local-ref id="mdb1EjbLocalRef1-id">
+            <description>en-mdb1EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-mdb1EjbLocalRef1-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1EjbLocalRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb1EjbLocalRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1EjbLocalRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb1EjbLocalRef1Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>mdb1EjbLocalRef1JndiName</jndi-name>
+            <ignore-dependency/>
+-->
+            <local-jndi-name>mdb1EjbLocalRef1JndiName</local-jndi-name>
+         </ejb-local-ref>
+<!--
+         <ejb-local-ref id="mdb1EjbLocalRef2-id">
+            <description>en-mdb1EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-mdb1EjbLocalRef2-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1EjbLocalRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb1EjbLocalRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1EjbLocalRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb1EjbLocalRef2Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>mdb1EjbLocalRef2JndiName</jndi-name>
+-->
+            <local-jndi-name>mdb1EjbLocalRef2JndiName</local-jndi-name>
+         </ejb-local-ref>
+
+         <!-- TODO service-ref -->
+
+         <security-identity>
+            <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+<!--
+         <resource-ref id="mdb1ResourceRef1-id">
+            <description>en-mdb1ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
+            <description xml:lang="de">de-mdb1ResourceRef1-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>mdb1ResourceRef1Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb1ResourceRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1ResourceRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb1ResourceRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1ResourceRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-ref>
+<!--
+         <resource-ref id="mdb1ResourceRef2-id">
+            <description>en-mdb1ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceRef2-desc</description>
+            <description xml:lang="de">de-mdb1ResourceRef2-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>mdb1ResourceRef2Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb1ResourceRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1ResourceRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb1ResourceRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1ResourceRef2JndiName</jndi-name>
+         </resource-ref>
+<!--
+         <resource-env-ref id="mdb1ResourceEnvRef1-id">
+            <description>en-mdb1ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-mdb1ResourceEnvRef1-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb1ResourceEnvRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1ResourceEnvRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb1ResourceEnvRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1ResourceEnvRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-env-ref>
+<!--
+         <resource-env-ref id="mdb1ResourceEnvRef2-id">
+            <description>en-mdb1ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-mdb1ResourceEnvRef2-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb1ResourceEnvRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1ResourceEnvRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb1ResourceEnvRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
+         </resource-env-ref>
+<!--
+         <message-destination-ref id="mdb1MessageDestinationRef1-id">
+            <description>en-mdb1MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-mdb1MessageDestinationRef1-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb1MessageDestinationRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1MessageDestinationRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb1MessageDestinationRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1MessageDestinationRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="mdb1MessageDestinationRef2-id">
+            <description>en-mdb1MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-mdb1MessageDestinationRef2-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb1MessageDestinationRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1MessageDestinationRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb1MessageDestinationRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="mdb1MessageDestinationRef3-id">
+            <description>en-mdb1MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-mdb1MessageDestinationRef3-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
+               <injection-target-name>mdb1MessageDestinationRef3Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1MessageDestinationRef3Injection2Class</injection-target-class>
+               <injection-target-name>mdb1MessageDestinationRef3Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <method-attributes id="mdb1MethodAttributes-id">
+            <method id="mdb1MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
+               <method-name>get*</method-name>
+               <read-only>true</read-only>
+               <idempotent>true</idempotent>
+               <transaction-timeout>5000</transaction-timeout>
+            </method>
+            <method id="mdb1MethodAttributesMethod2-id">
+            <method>
+               <method-name>*</method-name>
+            </method>
+         </method-attributes>
+-->
+
+<!--
+         <security-identity id="mdb1SecurityIdentity-id">
+            <description>en-mdb1SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
+            <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
+            <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+-->
+
+         <depends>mdb1Depends1</depends>
+         <depends>mdb1Depends2</depends>
+<!--         
+         <ior-security-config id="mdb1IorSecurityConfig-id">
+            <description>en-mdb1IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-mdb1IorSecurityConfig-desc</description>
+            <transport-config id="mdb1TransportConfig-id">
+               <description>en-mdb1TransportConfig-desc</description>
+               <description xml:lang="fr">fr-mdb1TransportConfig-desc</description>
+               <description xml:lang="de">de-mdb1TransportConfig-desc</description>
+-->
+         <ior-security-config>
+            <transport-config>
+               <integrity>NONE</integrity>
+               <confidentiality>NONE</confidentiality>
+               <establish-trust-in-target>NONE</establish-trust-in-target>
+               <establish-trust-in-client>NONE</establish-trust-in-client>
+               <detect-misordering>NONE</detect-misordering>
+               <detect-replay>NONE</detect-replay>
+            </transport-config>
+<!--
+            <as-context id="mdb1ASContext-id">
+               <description>en-mdb1ASContext-desc</description>
+               <description xml:lang="fr">fr-mdb1ASContext-desc</description>
+               <description xml:lang="de">de-mdb1ASContext-desc</description>
+-->
+            <as-context>
+               <auth-method>USERNAME_PASSWORD</auth-method>
+               <realm>mdb1ASContextRealm</realm>
+               <required>false</required>
+            </as-context>
+<!--
+            <sas-context id="mdb1SASContext-id">
+               <description>en-mdb1SASContext-desc</description>
+               <description xml:lang="fr">fr-mdb1SASContext-desc</description>
+               <description xml:lang="de">de-mdb1SASContext-desc</description>
+-->
+            <sas-context>
+               <caller-propagation>NONE</caller-propagation>
+            </sas-context>
+         </ior-security-config>
+<!--
+         <ejb-timeout-identity id="mdb1EjbTimeoutIdentity-id">
+            <description>en-mdb1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</description>
+-->
+         <ejb-timeout-identity>
+            <run-as-principal>mdb1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
+         </ejb-timeout-identity>
+         
+<!--
+         <annotation id="mdb1Annotation1-id">
+            <description>en-mdb1Annotation1-desc</description>
+            <description xml:lang="fr">fr-mdb1Annotation1-desc</description>
+            <description xml:lang="de">de-mdb1Annotation1-desc</description>
+            
+            <annotation-class>mdb1Annotation1Class</annotation-class>
+            <annotation-implementation-class>mdb1Annotation1Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>mdb1Annotation1InjectionTargetClass</injection-target-class>
+               <injection-target-name>mdb1Annotation1InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="mdb1Annotation1Property1-id">
+               <description>en-mdb1Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation1Property1-desc</description>
+               <description xml:lang="de">de-mdb1Annotation1Property1-desc</description>
+               <property-name>mdb1Annotation1Property1Name</property-name>
+               <property-value>mdb1Annotation1Property1Value</property-value>
+            </property>
+            <property id="mdb1Annotation1Property2-id">
+               <description>en-mdb1Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation1Property2-desc</description>
+               <description xml:lang="de">de-mdb1Annotation1Property2-desc</description>
+               <property-name>mdb1Annotation1Property2Name</property-name>
+               <property-value>mdb1Annotation1Property2Value</property-value>
+            </property>
+         </annotation>
+         <annotation id="mdb1Annotation2-id">
+            <description>en-mdb1Annotation2-desc</description>
+            <description xml:lang="fr">fr-mdb1Annotation2-desc</description>
+            <description xml:lang="de">de-mdb1Annotation2-desc</description>
+            
+            <annotation-class>mdb1Annotation2Class</annotation-class>
+            <annotation-implementation-class>mdb1Annotation2Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>mdb1Annotation2InjectionTargetClass</injection-target-class>
+               <injection-target-name>mdb1Annotation2InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="mdb1Annotation2Property1-id">
+               <description>en-mdb1Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation2Property1-desc</description>
+               <description xml:lang="de">de-mdb1Annotation2Property1-desc</description>
+               <property-name>mdb1Annotation2Property1Name</property-name>
+               <property-value>mdb1Annotation2Property1Value</property-value>
+            </property>
+            <property id="mdb1Annotation2Property2-id">
+               <description>en-mdb1Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation2Property2-desc</description>
+               <description xml:lang="de">de-mdb1Annotation2Property2-desc</description>
+               <property-name>mdb1Annotation2Property2Name</property-name>
+               <property-value>mdb1Annotation2Property2Value</property-value>
+            </property>
+         </annotation>
+
+         <ignore-dependency id="mdb1IgnoreDependency-id">
+            <description>en-mdb1IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-mdb1IgnoreDependency-desc</description>
+            <description xml:lang="de">de-mdb1IgnoreDependency-desc</description>
+            <injection-target>
+               <injection-target-class>mdb1IgnoreDependencyInjection1Class</injection-target-class>
+               <injection-target-name>mdb1IgnoreDependencyInjection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1IgnoreDependencyInjection2Class</injection-target-class>
+               <injection-target-name>mdb1IgnoreDependencyInjection2Name</injection-target-name>
+            </injection-target>
+         </ignore-dependency>
+
+         <aop-domain-name>mdb1AOPDomain</aop-domain-name>         
+         
+         <!- - TODO pool config - ->
+
+         <jndi-ref id="mdb1JndiRef1-id">
+            <description>en-mdb1JndiRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1JndiRef1-desc</description>
+            <description xml:lang="de">de-mdb1JndiRef1-desc</description>
+            <jndi-ref-name>mdb1JndiRef1Name</jndi-ref-name>
+            <mapped-name>mdb1JndiRef1MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>mdb1JndiRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb1JndiRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1JndiRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb1JndiRef1Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         <jndi-ref id="mdb1JndiRef2-id">
+            <description>en-mdb1JndiRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1JndiRef2-desc</description>
+            <description xml:lang="de">de-mdb1JndiRef2-desc</description>
+            <jndi-ref-name>mdb1JndiRef2Name</jndi-ref-name>
+            <mapped-name>mdb1JndiRef2MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>mdb1JndiRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb1JndiRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb1JndiRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb1JndiRef2Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+
+         <default-activation-config id="mdb1DefaultActivationConfig-id">
+            <activation-config-property id="mdb1DefaultActivationConfigProperty1-id">
+               <activation-config-property-name>mdb1DefaultActivationConfigProperty1Name</activation-config-property-name>
+               <activation-config-property-value>mdb1DefaultActivationConfigProperty1Value</activation-config-property-value>
+            </activation-config-property>
+            <activation-config-property id="mdb1DefaultActivationConfigProperty2-id">
+               <activation-config-property-name>mdb1DefaultActivationConfigProperty2Name</activation-config-property-name>
+               <activation-config-property-value>mdb1DefaultActivationConfigProperty2Value</activation-config-property-value>
+            </activation-config-property>
+         </default-activation-config>
+-->
+      </message-driven>
+
+      <message-driven id="mdb2-id">
+<!--
+         <description>en-mdb2-desc</description>
+         <description xml:lang="fr">fr-mdb2-desc</description>
+         <description xml:lang="de">de-mdb2-desc</description>
+         <display-name>en-mdb2-disp</display-name>
+         <display-name xml:lang="fr">fr-mdb2-disp</display-name>
+         <display-name xml:lang="de">de-mdb2-disp</display-name>
+         <icon id="en-mdb2-icon-id">
+            <small-icon>en-mdb2-small-icon</small-icon>
+            <large-icon>en-mdb2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-mdb2-icon-id">
+            <small-icon>fr-mdb2-small-icon</small-icon>
+            <large-icon>fr-mdb2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-mdb2-icon-id">
+            <small-icon>de-mdb2-small-icon</small-icon>
+            <large-icon>de-mdb2-large-icon</large-icon>
+         </icon>
+-->
+         <ejb-name>mdb2EjbName</ejb-name>
+
+         <destination-jndi-name>mdb2DestinationJndiName</destination-jndi-name>
+         <local-jndi-name>mdb2LocalJndiName</local-jndi-name>
+         <mdb-user>mdb2User</mdb-user>
+         <mdb-passwd>mdb2Password</mdb-passwd>
+         <mdb-client-id>mdb2ClientId</mdb-client-id>
+         <mdb-subscription-id>mdb2SubscriptionId</mdb-subscription-id>
+         <resource-adapter-name>mdb2RAR</resource-adapter-name>
+         <exception-on-rollback>false</exception-on-rollback>
+         <timer-persistence>false</timer-persistence>
+         <configuration-name>mdb2ConfigurationName</configuration-name>
+<!--
+         <invoker-bindings id="mdb2InvokerBindings-id">
+            <description>en-mdb2InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-mdb2InvokerBindings-desc</description>
+            <description xml:lang="de">de-mdb2InvokerBindings-desc</description>
+
+            <invoker id="mdb2Invoker1-id">
+               <description>en-mdb2Invoker1-desc</description>
+               <description xml:lang="fr">fr-mdb2Invoker1-desc</description>
+               <description xml:lang="de">de-mdb2Invoker1-desc</description>
+-->
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
+               <jndi-name>mdb2Invoker1JndiName</jndi-name>
+               <ejb-ref>
+                  <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
+                  <jndi-name>mdb2Invoker1EjbName1</jndi-name>
+               </ejb-ref>
+            </invoker>
+<!--
+            <invoker id="mdb2Invoker2-id">
+               <description>en-mdb2Invoker2-desc</description>
+               <description xml:lang="fr">fr-mdb2Invoker2-desc</description>
+               <description xml:lang="de">de-mdb2Invoker2-desc</description>
+-->
+            <invoker>
+               <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
+               <jndi-name>mdb2Invoker2JndiName</jndi-name>
+
+               <ejb-ref>
+                  <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
+                  <jndi-name>mdb2Invoker2EjbName1</jndi-name>
+               </ejb-ref>
+               <ejb-ref>
+                  <ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
+                  <jndi-name>mdb2Invoker2EjbName2</jndi-name>
+               </ejb-ref>
+            </invoker>
+         </invoker-bindings>
+         
+         <security-proxy>mdb2SecurityProxy</security-proxy>
+         
+<!--
+         <ejb-ref id="mdb2EjbRef1-id">
+            <description>en-mdb2EjbRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbRef1-desc</description>
+            <description xml:lang="de">de-mdb2EjbRef1-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2EjbRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb2EjbRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2EjbRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb2EjbRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2EjbRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </ejb-ref>
+<!--
+         <ejb-ref id="mdb2EjbRef2-id">
+            <description>en-mdb2EjbRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbRef2-desc</description>
+            <description xml:lang="de">de-mdb2EjbRef2-desc</description>
+-->
+         <ejb-ref>
+            <ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2EjbRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb2EjbRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2EjbRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb2EjbRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2EjbRef2JndiName</jndi-name>
+         </ejb-ref>
+<!--
+         <ejb-local-ref id="mdb2EjbLocalRef1-id">
+            <description>en-mdb2EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-mdb2EjbLocalRef1-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2EjbLocalRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb2EjbLocalRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2EjbLocalRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb2EjbLocalRef1Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>mdb2EjbLocalRef1JndiName</jndi-name>
+            <ignore-dependency/>
+-->
+            <local-jndi-name>mdb2EjbLocalRef1JndiName</local-jndi-name>
+         </ejb-local-ref>
+<!--
+         <ejb-local-ref id="mdb2EjbLocalRef2-id">
+            <description>en-mdb2EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-mdb2EjbLocalRef2-desc</description>
+-->
+         <ejb-local-ref>
+            <ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2EjbLocalRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb2EjbLocalRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2EjbLocalRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb2EjbLocalRef2Injection2Name</injection-target-name>
+            </injection-target>
+            <jndi-name>mdb2EjbLocalRef2JndiName</jndi-name>
+-->
+            <local-jndi-name>mdb2EjbLocalRef2JndiName</local-jndi-name>
+         </ejb-local-ref>
+
+         <!-- TODO service-ref -->
+
+         <security-identity>
+            <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+<!--
+         <resource-ref id="mdb2ResourceRef1-id">
+            <description>en-mdb2ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
+            <description xml:lang="de">de-mdb2ResourceRef1-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>mdb2ResourceRef1Name</res-ref-name>
+
+<!--
+            <injection-target>
+               <injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb2ResourceRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2ResourceRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb2ResourceRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2ResourceRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-ref>
+<!--
+         <resource-ref id="mdb2ResourceRef2-id">
+            <description>en-mdb2ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceRef2-desc</description>
+            <description xml:lang="de">de-mdb2ResourceRef2-desc</description>
+-->
+         <resource-ref>
+            <res-ref-name>mdb2ResourceRef2Name</res-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb2ResourceRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2ResourceRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb2ResourceRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2ResourceRef2JndiName</jndi-name>
+         </resource-ref>
+<!--
+         <resource-env-ref id="mdb2ResourceEnvRef1-id">
+            <description>en-mdb2ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-mdb2ResourceEnvRef1-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb2ResourceEnvRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2ResourceEnvRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb2ResourceEnvRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2ResourceEnvRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </resource-env-ref>
+<!--
+         <resource-env-ref id="mdb2ResourceEnvRef2-id">
+            <description>en-mdb2ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-mdb2ResourceEnvRef2-desc</description>
+-->
+         <resource-env-ref>
+            <resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb2ResourceEnvRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2ResourceEnvRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb2ResourceEnvRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
+         </resource-env-ref>
+<!--
+         <message-destination-ref id="mdb2MessageDestinationRef1-id">
+            <description>en-mdb2MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-mdb2MessageDestinationRef1-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb2MessageDestinationRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2MessageDestinationRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb2MessageDestinationRef1Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2MessageDestinationRef1JndiName</jndi-name>
+<!--            <ignore-dependency/> -->
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="mdb2MessageDestinationRef2-id">
+            <description>en-mdb2MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-mdb2MessageDestinationRef2-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb2MessageDestinationRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2MessageDestinationRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb2MessageDestinationRef2Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <message-destination-ref id="mdb2MessageDestinationRef3-id">
+            <description>en-mdb2MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-mdb2MessageDestinationRef3-desc</description>
+-->
+         <message-destination-ref>
+            <message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
+<!--
+            <injection-target>
+               <injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
+               <injection-target-name>mdb2MessageDestinationRef3Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2MessageDestinationRef3Injection2Class</injection-target-class>
+               <injection-target-name>mdb2MessageDestinationRef3Injection2Name</injection-target-name>
+            </injection-target>
+-->
+            <jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
+         </message-destination-ref>
+<!--
+         <method-attributes id="mdb2MethodAttributes-id">
+            <method id="mdb2MethodAttributesMethod1-id">
+               <method-name>get*</method-name>
+               <read-only>true</read-only>
+               <idempotent>true</idempotent>
+               <transaction-timeout>5000</transaction-timeout>
+            </method>
+            <method id="mdb2MethodAttributesMethod2-id">
+               <method-name>*</method-name>
+            </method>
+         </method-attributes>
+         
+         <security-identity id="mdb2SecurityIdentity-id">
+            <description>en-mdb2SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
+            <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
+            <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+-->
+         <depends>mdb2Depends1</depends>
+         <depends>mdb2Depends2</depends>
+<!--         
+         <ior-security-config id="mdb2IorSecurityConfig-id">
+            <description>en-mdb2IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-mdb2IorSecurityConfig-desc</description>
+            <transport-config id="mdb2TransportConfig-id">
+               <description>en-mdb2TransportConfig-desc</description>
+               <description xml:lang="fr">fr-mdb2TransportConfig-desc</description>
+               <description xml:lang="de">de-mdb2TransportConfig-desc</description>
+-->
+         <ior-security-config>
+            <transport-config>
+               <integrity>NONE</integrity>
+               <confidentiality>NONE</confidentiality>
+               <establish-trust-in-target>NONE</establish-trust-in-target>
+               <establish-trust-in-client>NONE</establish-trust-in-client>
+               <detect-misordering>NONE</detect-misordering>
+               <detect-replay>NONE</detect-replay>
+            </transport-config>
+<!--
+            <as-context id="mdb2ASContext-id">
+               <description>en-mdb2ASContext-desc</description>
+               <description xml:lang="fr">fr-mdb2ASContext-desc</description>
+               <description xml:lang="de">de-mdb2ASContext-desc</description>
+-->
+            <as-context>
+               <auth-method>USERNAME_PASSWORD</auth-method>
+               <realm>mdb2ASContextRealm</realm>
+               <required>false</required>
+            </as-context>
+<!--
+            <sas-context id="mdb2SASContext-id">
+               <description>en-mdb2SASContext-desc</description>
+               <description xml:lang="fr">fr-mdb2SASContext-desc</description>
+               <description xml:lang="de">de-mdb2SASContext-desc</description>
+-->
+            <sas-context>
+               <caller-propagation>NONE</caller-propagation>
+            </sas-context>
+         </ior-security-config>
+<!--
+         <ejb-timeout-identity id="mdb2EjbTimeoutIdentity-id">
+            <description>en-mdb2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</description>
+-->
+         <ejb-timeout-identity>
+            <run-as-principal>mdb2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
+         </ejb-timeout-identity>
+<!--         
+         <annotation id="mdb2Annotation1-id">
+            <description>en-mdb2Annotation1-desc</description>
+            <description xml:lang="fr">fr-mdb2Annotation1-desc</description>
+            <description xml:lang="de">de-mdb2Annotation1-desc</description>
+            
+            <annotation-class>mdb2Annotation1Class</annotation-class>
+            <annotation-implementation-class>mdb2Annotation1Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>mdb2Annotation1InjectionTargetClass</injection-target-class>
+               <injection-target-name>mdb2Annotation1InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="mdb2Annotation1Property1-id">
+               <description>en-mdb2Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation1Property1-desc</description>
+               <description xml:lang="de">de-mdb2Annotation1Property1-desc</description>
+               <property-name>mdb2Annotation1Property1Name</property-name>
+               <property-value>mdb2Annotation1Property1Value</property-value>
+            </property>
+            <property id="mdb2Annotation1Property2-id">
+               <description>en-mdb2Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation1Property2-desc</description>
+               <description xml:lang="de">de-mdb2Annotation1Property2-desc</description>
+               <property-name>mdb2Annotation1Property2Name</property-name>
+               <property-value>mdb2Annotation1Property2Value</property-value>
+            </property>
+         </annotation>
+         <annotation id="mdb2Annotation2-id">
+            <description>en-mdb2Annotation2-desc</description>
+            <description xml:lang="fr">fr-mdb2Annotation2-desc</description>
+            <description xml:lang="de">de-mdb2Annotation2-desc</description>
+            
+            <annotation-class>mdb2Annotation2Class</annotation-class>
+            <annotation-implementation-class>mdb2Annotation2Impl</annotation-implementation-class>
+            <injection-target>
+               <injection-target-class>mdb2Annotation2InjectionTargetClass</injection-target-class>
+               <injection-target-name>mdb2Annotation2InjectionTargetName</injection-target-name>
+            </injection-target>
+            <property id="mdb2Annotation2Property1-id">
+               <description>en-mdb2Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation2Property1-desc</description>
+               <description xml:lang="de">de-mdb2Annotation2Property1-desc</description>
+               <property-name>mdb2Annotation2Property1Name</property-name>
+               <property-value>mdb2Annotation2Property1Value</property-value>
+            </property>
+            <property id="mdb2Annotation2Property2-id">
+               <description>en-mdb2Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation2Property2-desc</description>
+               <description xml:lang="de">de-mdb2Annotation2Property2-desc</description>
+               <property-name>mdb2Annotation2Property2Name</property-name>
+               <property-value>mdb2Annotation2Property2Value</property-value>
+            </property>
+         </annotation>
+
+         <ignore-dependency id="mdb2IgnoreDependency-id">
+            <description>en-mdb2IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-mdb2IgnoreDependency-desc</description>
+            <description xml:lang="de">de-mdb2IgnoreDependency-desc</description>
+            <injection-target>
+               <injection-target-class>mdb2IgnoreDependencyInjection1Class</injection-target-class>
+               <injection-target-name>mdb2IgnoreDependencyInjection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2IgnoreDependencyInjection2Class</injection-target-class>
+               <injection-target-name>mdb2IgnoreDependencyInjection2Name</injection-target-name>
+            </injection-target>
+         </ignore-dependency>
+
+         <aop-domain-name>mdb2AOPDomain</aop-domain-name>         
+         
+         <!- - TODO pool config - ->
+
+         <jndi-ref id="mdb2JndiRef1-id">
+            <description>en-mdb2JndiRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2JndiRef1-desc</description>
+            <description xml:lang="de">de-mdb2JndiRef1-desc</description>
+            <jndi-ref-name>mdb2JndiRef1Name</jndi-ref-name>
+            <mapped-name>mdb2JndiRef1MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>mdb2JndiRef1Injection1Class</injection-target-class>
+               <injection-target-name>mdb2JndiRef1Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2JndiRef1Injection2Class</injection-target-class>
+               <injection-target-name>mdb2JndiRef1Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         <jndi-ref id="mdb2JndiRef2-id">
+            <description>en-mdb2JndiRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2JndiRef2-desc</description>
+            <description xml:lang="de">de-mdb2JndiRef2-desc</description>
+            <jndi-ref-name>mdb2JndiRef2Name</jndi-ref-name>
+            <mapped-name>mdb2JndiRef2MappedName</mapped-name>
+            <injection-target>
+               <injection-target-class>mdb2JndiRef2Injection1Class</injection-target-class>
+               <injection-target-name>mdb2JndiRef2Injection1Name</injection-target-name>
+            </injection-target>
+            <injection-target>
+               <injection-target-class>mdb2JndiRef2Injection2Class</injection-target-class>
+               <injection-target-name>mdb2JndiRef2Injection2Name</injection-target-name>
+            </injection-target>
+         </jndi-ref>
+         
+         <default-activation-config id="mdb2DefaultActivationConfig-id">
+            <activation-config-property id="mdb2DefaultActivationConfigProperty1-id">
+               <activation-config-property-name>mdb2DefaultActivationConfigProperty1Name</activation-config-property-name>
+               <activation-config-property-value>mdb2DefaultActivationConfigProperty1Value</activation-config-property-value>
+            </activation-config-property>
+            <activation-config-property id="mdb2DefaultActivationConfigProperty2-id">
+               <activation-config-property-name>mdb2DefaultActivationConfigProperty2Name</activation-config-property-name>
+               <activation-config-property-value>mdb2DefaultActivationConfigProperty2Value</activation-config-property-value>
+            </activation-config-property>
+         </default-activation-config>
+-->
+      </message-driven>
+
+   </enterprise-beans>
+
+<!--
+   <assembly-descriptor id="assembly-descriptor-id">
+
+      <security-role id="securityRole1-id">
+         <description>en-securityRole1-desc</description>
+         <description xml:lang="fr">fr-securityRole1-desc</description>
+         <description xml:lang="de">de-securityRole1-desc</description>
+-->
+   <assembly-descriptor>
+      <security-role>
+         <role-name>securityRoleRef1RoleLink</role-name>
+         <principal-name>securityRole1Principal1</principal-name>
+         <principal-name>securityRole1Principal2</principal-name>
+      </security-role>
+<!--
+      <security-role id="securityRole2-id">
+         <description>en-securityRole2-desc</description>
+         <description xml:lang="fr">fr-securityRole2-desc</description>
+         <description xml:lang="de">de-securityRole2-desc</description>
+-->
+      <security-role>
+         <role-name>securityRoleRef2RoleLink</role-name>
+         <principal-name>securityRole2Principal1</principal-name>
+         <principal-name>securityRole2Principal2</principal-name>
+      </security-role>
+<!--
+      <message-destination id="messageDestination1-id">
+         <description>en-messageDestination1-desc</description>
+         <description xml:lang="fr">fr-messageDestination1-desc</description>
+         <description xml:lang="de">de-messageDestination1-desc</description>
+         <display-name>en-messageDestination1-disp</display-name>
+         <display-name xml:lang="fr">fr-messageDestination1-disp</display-name>
+         <display-name xml:lang="de">de-messageDestination1-disp</display-name>
+         <icon id="en-messageDestination1-icon-id">
+            <small-icon>en-messageDestination1-small-icon</small-icon>
+            <large-icon>en-messageDestination1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-messageDestination1-icon-id">
+            <small-icon>fr-messageDestination1-small-icon</small-icon>
+            <large-icon>fr-messageDestination1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-messageDestination1-icon-id">
+            <small-icon>de-messageDestination1-small-icon</small-icon>
+            <large-icon>de-messageDestination1-large-icon</large-icon>
+         </icon>
+-->
+      <message-destination>
+         <message-destination-name>messageDestination1Name</message-destination-name>
+         <jndi-name>messageDestination1JndiName</jndi-name>
+      </message-destination>
+<!--
+      <message-destination id="messageDestination2-id">
+         <description>en-messageDestination2-desc</description>
+         <description xml:lang="fr">fr-messageDestination2-desc</description>
+         <description xml:lang="de">de-messageDestination2-desc</description>
+         <display-name>en-messageDestination2-disp</display-name>
+         <display-name xml:lang="fr">fr-messageDestination2-disp</display-name>
+         <display-name xml:lang="de">de-messageDestination2-disp</display-name>
+         <icon id="en-messageDestination2-icon-id">
+            <small-icon>en-messageDestination2-small-icon</small-icon>
+            <large-icon>en-messageDestination2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-messageDestination2-icon-id">
+            <small-icon>fr-messageDestination2-small-icon</small-icon>
+            <large-icon>fr-messageDestination2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-messageDestination2-icon-id">
+            <small-icon>de-messageDestination2-small-icon</small-icon>
+            <large-icon>de-messageDestination2-large-icon</large-icon>
+         </icon>
+-->
+      <message-destination>
+         <message-destination-name>messageDestination2Name</message-destination-name>
+         <jndi-name>messageDestination2JndiName</jndi-name>
+      </message-destination>
+
+   </assembly-descriptor>
+
+<!--
+   <resource-managers id="resource-managers-id">
+      <description>en-resource-managers-desc</description>
+      <description xml:lang="fr">fr-resource-managers-desc</description>
+      <description xml:lang="de">de-resource-managers-desc</description>
+      <resource-manager id="resourceManager1-id" res-class="resourceManager1Class">
+         <description>en-resourceManager1-desc</description>
+         <description xml:lang="fr">fr-resourceManager1-desc</description>
+         <description xml:lang="de">de-resourceManager1-desc</description>
+
+-->
+   <resource-managers>
+      <resource-manager>
+         <res-name>resourceManager1Name</res-name>
+         <res-jndi-name>resourceManager1JndiName</res-jndi-name>
+      </resource-manager>
+<!--
+      <resource-manager id="resourceManager2-id" res-class="resourceManager2Class">
+         <description>en-resourceManager2-desc</description>
+         <description xml:lang="fr">fr-resourceManager2-desc</description>
+         <description xml:lang="de">de-resourceManager2-desc</description>
+-->
+      <resource-manager>
+         <res-name>resourceManager2Name</res-name>
+         <res-url>resourceManager2URL</res-url>
+      </resource-manager>
+   </resource-managers>
+<!--
+   <invoker-proxy-bindings id="invoker-proxy-bindings-id">
+      <description>en-invoker-proxy-bindings-desc</description>
+      <description xml:lang="fr">fr-invoker-proxy-bindings-desc</description>
+      <description xml:lang="de">de-invoker-proxy-bindings-desc</description>
+      <invoker-proxy-binding id="invokerProxyBinding1-id">
+         <description>en-invokerProxyBinding1-desc</description>
+         <description xml:lang="fr">fr-invokerProxyBinding1-desc</description>
+         <description xml:lang="de">de-invokerProxyBinding1-desc</description>
+-->
+   <invoker-proxy-bindings>
+      <invoker-proxy-binding>
+<!--         <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name> -->
+         <name>invokerProxyBinding1Name</name>
+         <invoker-mbean>invokerProxyBinding1InvokerMBean</invoker-mbean>
+         <proxy-factory>invokerProxyBinding1ProxyFactory</proxy-factory>
+         <proxy-factory-config>
+            <client-interceptors>
+               <home>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.HomeInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.HomeInterceptorcbvt4.1</interceptor>
+               </home>
+               <bean>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.BeanInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.BeanInterceptorcbvt4.1</interceptor>
+               </bean>
+               <list-entity>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.EntityInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.EntityInterceptorcbvt4.1</interceptor>
+               </list-entity>
+            </client-interceptors>
+         </proxy-factory-config>
+      </invoker-proxy-binding>
+<!--
+      <invoker-proxy-binding id="invokerProxyBinding2-id">
+         <description>en-invokerProxyBinding2-desc</description>
+         <description xml:lang="fr">fr-invokerProxyBinding2-desc</description>
+         <description xml:lang="de">de-invokerProxyBinding2-desc</description>
+-->
+      <invoker-proxy-binding>
+<!--         <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name> -->
+         <name>invokerProxyBinding2Name</name>
+         <invoker-mbean>invokerProxyBinding2InvokerMBean</invoker-mbean>
+         <proxy-factory>invokerProxyBinding2ProxyFactory</proxy-factory>
+         <proxy-factory-config>
+            <client-interceptors>
+               <home>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor1.2</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor2.2</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.HomeInterceptorcbvf3.2</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.HomeInterceptorcbvt4.2</interceptor>
+               </home>
+               <bean>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor1.2</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor2.2</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.BeanInterceptorcbvf3.2</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.BeanInterceptorcbvt4.2</interceptor>
+               </bean>
+               <list-entity>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor1.2</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor2.2</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.EntityInterceptorcbvf3.2</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.EntityInterceptorcbvt4.2</interceptor>
+               </list-entity>
+            </client-interceptors>
+         </proxy-factory-config>
+         <!-- Unknown element to test duplicate wildcards 
+         <wildcard />-->
+      </invoker-proxy-binding>
+   </invoker-proxy-bindings>   
+   
+<!--
+   <container-configurations id="container-configurations-id">
+      <description>en-container-configurations-desc</description>
+      <description xml:lang="fr">fr-container-configurations-desc</description>
+      <description xml:lang="de">de-container-configurations-desc</description>
+-->
+   <container-configurations>
+      <container-configuration>
+         <container-name>containerConfiguration1Extends</container-name>
+      </container-configuration>
+      <container-configuration>
+         <container-name>containerConfiguration2Extends</container-name>
+      </container-configuration>
+
+      <container-configuration extends="Standard Stateless SessionBean">
+         <container-name>session1ConfigurationName</container-name>
+      </container-configuration>
+      <container-configuration extends="Standard Stateless SessionBean">
+         <container-name>session2ConfigurationName</container-name>
+      </container-configuration>
+      <container-configuration extends="Standard CMP 2.x EntityBean">
+         <container-name>entity1ConfigurationName</container-name>
+      </container-configuration>
+      <container-configuration extends="Standard CMP 2.x EntityBean">
+         <container-name>entity2ConfigurationName</container-name>
+      </container-configuration>
+      <container-configuration extends="Standard Message Inflow Driven Bean">
+         <container-name>mdb1ConfigurationName</container-name>
+      </container-configuration>
+      <container-configuration extends="Standard Message Inflow Driven Bean">
+         <container-name>mdb2ConfigurationName</container-name>
+      </container-configuration>
+
+      <container-configuration>
+         <container-name>containerConfiguration0Name</container-name>
+      </container-configuration>
+<!--
+      <container-configuration id="containerConfiguration1-id" extends="containerConfiguration1Extends">
+         <description>en-containerConfiguration1-desc</description>
+         <description xml:lang="fr">fr-containerConfiguration1-desc</description>
+         <description xml:lang="de">de-containerConfiguration1-desc</description>
+-->
+      <container-configuration extends="containerConfiguration1Extends">
+         <container-name>containerConfiguration1Name</container-name>
+         <call-logging>true</call-logging>
+         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2</invoker-proxy-binding-name> -->
+         <sync-on-commit-only>true</sync-on-commit-only>
+         <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
+         <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
+         <store-not-flushed>true</store-not-flushed>
+	      <container-interceptors>
+	         <interceptor>containerConfiguration1.Interceptor1</interceptor>
+	         <interceptor>containerConfiguration1.Interceptor2</interceptor>
+	        <!-- CMT -->
+	         <interceptor transaction="Container">containerConfiguration1.Interceptor3c</interceptor>
+	        <!-- BMT -->
+	         <interceptor transaction="Bean">containerConfiguration1.Interceptor4b</interceptor>
+	         <interceptor>containerConfiguration1.Interceptor5</interceptor>
+	      </container-interceptors>
+         <instance-pool>containerConfiguration1InstancePool</instance-pool>
+         <instance-cache>containerConfiguration1InstanceCache</instance-cache>
+         <persistence-manager>containerConfiguration1PersistenceManager</persistence-manager>
+         <web-class-loader>containerConfiguration1WebClassLoader</web-class-loader>
+         <locking-policy>containerConfiguration1LockingPolicy</locking-policy>
+	      <container-cache-conf>
+	         <cache-policy>containerConfiguration1.Policy</cache-policy>
+	        <cache-policy-conf>
+	          <min-capacity>50</min-capacity>
+	          <max-capacity>1000000</max-capacity>
+	          <remover-period>1800</remover-period>
+	          <max-bean-life>1800</max-bean-life>
+	          <overager-period>300</overager-period>
+	          <max-bean-age>600</max-bean-age>
+	          <resizer-period>400</resizer-period>
+	          <max-cache-miss-period>60</max-cache-miss-period>
+	          <min-cache-miss-period>1</min-cache-miss-period>
+	          <cache-load-factor>0.75</cache-load-factor>
+	        </cache-policy-conf>
+	      </container-cache-conf>
+<!--         <container-pool-conf id="containerConfiguration1-pool-conf"> -->
+         <container-pool-conf>
+           <MaximumSize>100</MaximumSize>
+         </container-pool-conf>
+
+         <commit-option>D</commit-option>
+         <optiond-refresh-rate>10</optiond-refresh-rate>
+         <security-domain>containerConfiguration1SecurityDomain</security-domain>
+<!--
+         <cluster-config id="containerConfiguration1ClusterConfig-id">
+            <description>en-containerConfiguration1ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-containerConfiguration1ClusterConfig-desc</description>
+            <description xml:lang="de">de-containerConfiguration1ClusterConfig-desc</description>
+-->
+         <cluster-config>
+            <partition-name>containerConfiguration1ClusterConfigPartitionName</partition-name>
+            <home-load-balance-policy>containerConfiguration1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
+            <bean-load-balance-policy>containerConfiguration1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
+            <session-state-manager-jndi-name>containerConfiguration1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
+         </cluster-config>
+         <depends>containerConfiguration1Depends1</depends>
+         <depends>containerConfiguration1Depends2</depends>
+      </container-configuration>
+<!--
+      <container-configuration id="containerConfiguration2-id" extends="containerConfiguration2Extends">
+         <description>en-containerConfiguration2-desc</description>
+         <description xml:lang="fr">fr-containerConfiguration2-desc</description>
+         <description xml:lang="de">de-containerConfiguration2-desc</description>
+-->
+      <container-configuration extends="containerConfiguration2Extends">
+         <container-name>containerConfiguration2Name</container-name>
+         <call-logging>false</call-logging>
+         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name> -->
+         <sync-on-commit-only>false</sync-on-commit-only>
+         <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
+         <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
+         <store-not-flushed>false</store-not-flushed>
+         <container-interceptors>
+            <interceptor>containerConfiguration2.Interceptor1</interceptor>
+            <interceptor>containerConfiguration2.Interceptor2</interceptor>
+            <!-- CMT -->
+            <interceptor transaction="Container">containerConfiguration2.Interceptor3c</interceptor>
+            <!-- BMT -->
+            <interceptor transaction="Bean">containerConfiguration2.Interceptor4b</interceptor>
+            <interceptor>containerConfiguration2.Interceptor5</interceptor>
+         </container-interceptors>         
+         <instance-pool>containerConfiguration2InstancePool</instance-pool>
+         <instance-cache>containerConfiguration2InstanceCache</instance-cache>
+         <persistence-manager>containerConfiguration2PersistenceManager</persistence-manager>
+         <web-class-loader>containerConfiguration2WebClassLoader</web-class-loader>
+         <locking-policy>containerConfiguration2LockingPolicy</locking-policy>
+         <container-cache-conf>
+            <cache-policy>containerConfiguration2.Policy</cache-policy>
+            <cache-policy-conf>
+               <min-capacity>50</min-capacity>
+               <max-capacity>1000000</max-capacity>
+               <remover-period>1800</remover-period>
+               <max-bean-life>1800</max-bean-life>
+               <overager-period>300</overager-period>
+               <max-bean-age>600</max-bean-age>
+               <resizer-period>400</resizer-period>
+               <max-cache-miss-period>60</max-cache-miss-period>
+               <min-cache-miss-period>1</min-cache-miss-period>
+               <cache-load-factor>0.75</cache-load-factor>
+            </cache-policy-conf>
+         </container-cache-conf>
+<!--         <container-pool-conf id="containerConfiguration2-pool-conf"> -->
+         <container-pool-conf>
+            <MaximumSize>100</MaximumSize>
+         </container-pool-conf>
+         <commit-option>D</commit-option>
+         <optiond-refresh-rate>10</optiond-refresh-rate>
+         <security-domain>containerConfiguration2SecurityDomain</security-domain>
+<!--
+         <cluster-config id="containerConfiguration2ClusterConfig-id">
+            <description>en-containerConfiguration2ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</description>
+            <description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</description>
+-->
+         <cluster-config>
+            <partition-name>containerConfiguration2ClusterConfigPartitionName</partition-name>
+            <home-load-balance-policy>containerConfiguration2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
+            <bean-load-balance-policy>containerConfiguration2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
+            <session-state-manager-jndi-name>containerConfiguration2ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
+         </cluster-config>
+         <depends>containerConfiguration2Depends1</depends>
+         <depends>containerConfiguration2Depends2</depends>
+      </container-configuration>
+      <container-configuration>
+         <container-name>containerConfiguration3Name</container-name>
+         <commit-option>B</commit-option>
+      </container-configuration>
+      <container-configuration>
+         <container-name>containerConfiguration4Name</container-name>
+         <commit-option>C</commit-option>
+      </container-configuration>
+   </container-configurations>
+      
+</jboss>
\ No newline at end of file


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
___________________________________________________________________
Name: svn:executable
   + *

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -2,16 +2,22 @@
 <!-- $Id:$
 Test of overriding one jboss.xml with another
 -->
+
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+<!--
 <jboss xmlns="http://www.jboss.com/xml/ns/javaee"
        xmlns:jee="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
        version="5.0"
        id="jboss-id-override">
-         
-   <loader-repository id="loaderRepository-id-override" loaderRepositoryClass="loaderRepositoryClass-override">
+-->
+<jboss>
+   <loader-repository loaderRepositoryClass="loaderRepositoryClass-override">
       loaderRepositoryName-override
-      <loader-repository-config id="loaderRepositoryConfig1-id" configParserClass="loaderRepositoryConfigParserClass1-override">
+      <loader-repository-config configParserClass="loaderRepositoryConfigParserClass1-override">
          loaderRepositoryConfig1-override
       </loader-repository-config>
    </loader-repository>
@@ -22,15 +28,15 @@
    <unauthenticated-principal>jboss-unauthenticated-principal-override</unauthenticated-principal>
    <exception-on-rollback>false</exception-on-rollback>
 
-   <webservices id="webservices-id">
+   <webservices>
       <context-root>webservicesContextRoot</context-root>
-      <webservice-description id="webserviceDescription1-id">
+      <webservice-description>
          <webservice-description-name>webserviceDescription1Name</webservice-description-name>
          <config-name>webserviceDescription1ConfigName</config-name>
          <config-file>webserviceDescription1ConfigFile</config-file>
          <wsdl-publish-location>webserviceDescription1WsdlPublishLocation</wsdl-publish-location>
       </webservice-description>
-      <webservice-description id="webserviceDescription2-id">
+      <webservice-description>
          <webservice-description-name>webserviceDescription2Name</webservice-description-name>
          <config-name>webserviceDescription2ConfigName</config-name>
          <config-file>webserviceDescription2ConfigFile</config-file>
@@ -38,43 +44,15 @@
       </webservice-description>
    </webservices>
    
-   <enterprise-beans id="enterprise-beans-id">
+   <enterprise-beans>
 
       <session>
          <ejb-name>session0EjbName</ejb-name>
       </session>
 
       <session id="session1-id">
-         <description>en-session1-desc</description>
-         <description xml:lang="fr">fr-session1-desc</description>
-         <description xml:lang="de">de-session1-desc</description>
-         <display-name>en-session1-disp</display-name>
-         <display-name xml:lang="fr">fr-session1-disp</display-name>
-         <display-name xml:lang="de">de-session1-disp</display-name>
-         <icon id="en-session1-icon-id">
-            <small-icon>en-session1-small-icon</small-icon>
-            <large-icon>en-session1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-session1-icon-id">
-            <small-icon>fr-session1-small-icon</small-icon>
-            <large-icon>fr-session1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-session1-icon-id">
-            <small-icon>de-session1-small-icon</small-icon>
-            <large-icon>de-session1-large-icon</large-icon>
-         </icon>
 
          <ejb-name>session1EjbName</ejb-name>
-         
-         <remote-binding id="session1RemoteBinding-id">
-            <description>en-session1RemoteBinding-desc</description>
-            <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
-            <description xml:lang="de">de-session1RemoteBinding-desc</description>
-            <jndi-name>session1RemoteBindingJndiName</jndi-name>
-            <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
-            <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
-            <proxy-factory>session1RemoteBindingProxyFactory</proxy-factory>
-         </remote-binding>
 
          <jndi-name>session1JndiName</jndi-name>
          <local-jndi-name>session1LocalJndiName</local-jndi-name>
@@ -83,25 +61,13 @@
          <timer-persistence>true</timer-persistence>
          <configuration-name>session1ConfigurationName</configuration-name>
          
-         <invoker-bindings id="session1InvokerBindings-id">
-            <description>en-session1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
-            <description xml:lang="de">de-session1InvokerBindings-desc</description>
-
-            <invoker id="session1Invoker1-id">
-               <description>en-session1Invoker1-desc</description>
-               <description xml:lang="fr">fr-session1Invoker1-desc</description>
-               <description xml:lang="de">de-session1Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>session1Invoker1Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="session1Invoker2-id">
-               <description>en-session1Invoker2-desc</description>
-               <description xml:lang="fr">fr-session1Invoker2-desc</description>
-               <description xml:lang="de">de-session1Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>session1Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -110,214 +76,78 @@
          
          <security-proxy>session1SecurityProxy</security-proxy>
          
-         <ejb-ref id="session1EjbRef1-id">
-            <description>en-session1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-session1EjbRef1-desc</description>
-            <description xml:lang="de">de-session1EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="session1EjbRef2-id">
-            <description>en-session1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-session1EjbRef2-desc</description>
-            <description xml:lang="de">de-session1EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="session1EjbLocalRef1-id">
-            <description>en-session1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-session1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-session1EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>session1EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="session1EjbLocalRef2-id">
-            <description>en-session1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-session1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-session1EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session1EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>session1EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="session1ResourceRef1-id">
-            <description>en-session1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-session1ResourceRef1-desc</description>
-            <description xml:lang="de">de-session1ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>session1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="session1ResourceRef2-id">
-            <description>en-session1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-session1ResourceRef2-desc</description>
-            <description xml:lang="de">de-session1ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>session1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="session1ResourceEnvRef1-id">
-            <description>en-session1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-session1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-session1ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="session1ResourceEnvRef2-id">
-            <description>en-session1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-session1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-session1ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="session1MessageDestinationRef1-id">
-            <description>en-session1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-session1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-session1MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="session1MessageDestinationRef2-id">
-            <description>en-session1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-session1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-session1MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="session1MessageDestinationRef3-id">
-            <description>en-session1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-session1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-session1MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>session1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <security-identity id="session1SecurityIdentity-id">
-            <description>en-session1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-session1SecurityIdentity-desc</description>
-            <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <clustered>true</clustered>
          
-         <cluster-config id="session1ClusterConfig-id">
-            <description>en-session1ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-session1ClusterConfig-desc</description>
-            <description xml:lang="de">de-session1ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>session1ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>session1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>session1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
             <session-state-manager-jndi-name>session1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
          </cluster-config>
 
-         <security-domain>session1SecurityDomain</security-domain>
+<!--         <security-domain>session1SecurityDomain</security-domain> -->
          
-         <method-attributes id="session1MethodAttributes-id">
-            <method id="session1MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="session1MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
@@ -325,14 +155,8 @@
          <depends>session1Depends1</depends>
          <depends>session1Depends2</depends>
          
-         <ior-security-config id="session1IorSecurityConfig-id">
-            <description>en-session1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
-            <transport-config id="session1TransportConfig-id">
-               <description>en-session1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-session1TransportConfig-desc</description>
-               <description xml:lang="de">de-session1TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -340,178 +164,31 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="session1ASContext-id">
-               <description>en-session1ASContext-desc</description>
-               <description xml:lang="fr">fr-session1ASContext-desc</description>
-               <description xml:lang="de">de-session1ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>session1ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="session1SASContext-id">
-               <description>en-session1SASContext-desc</description>
-               <description xml:lang="fr">fr-session1SASContext-desc</description>
-               <description xml:lang="de">de-session1SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <port-component id="session1PortComponent-id">
+         <port-component>
             <port-component-name>session1-PortComponent</port-component-name>
             <port-component-uri>/session1/PortComponentURI</port-component-uri>
             <auth-method>BASIC</auth-method>
             <transport-guarantee>NONE</transport-guarantee>
-            <secure-wsdl-access>true</secure-wsdl-access>
          </port-component>
          
-         <ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
-            <description>en-session1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
          
-         <annotation id="session1Annotation1-id">
-            <description>en-session1Annotation1-desc</description>
-            <description xml:lang="fr">fr-session1Annotation1-desc</description>
-            <description xml:lang="de">de-session1Annotation1-desc</description>
-            
-            <annotation-class>session1Annotation1Class</annotation-class>
-            <annotation-implementation-class>session1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>session1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session1Annotation1Property1-id">
-               <description>en-session1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-session1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-session1Annotation1Property1-desc</description>
-               <property-name>session1Annotation1Property1Name</property-name>
-               <property-value>session1Annotation1Property1Value</property-value>
-            </property>
-            <property id="session1Annotation1Property2-id">
-               <description>en-session1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-session1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-session1Annotation1Property2-desc</description>
-               <property-name>session1Annotation1Property2Name</property-name>
-               <property-value>session1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="session1Annotation2-id">
-            <description>en-session1Annotation2-desc</description>
-            <description xml:lang="fr">fr-session1Annotation2-desc</description>
-            <description xml:lang="de">de-session1Annotation2-desc</description>
-            
-            <annotation-class>session1Annotation2Class</annotation-class>
-            <annotation-implementation-class>session1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>session1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session1Annotation2Property1-id">
-               <description>en-session1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-session1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-session1Annotation2Property1-desc</description>
-               <property-name>session1Annotation2Property1Name</property-name>
-               <property-value>session1Annotation2Property1Value</property-value>
-            </property>
-            <property id="session1Annotation2Property2-id">
-               <description>en-session1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-session1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-session1Annotation2Property2-desc</description>
-               <property-name>session1Annotation2Property2Name</property-name>
-               <property-value>session1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="session1IgnoreDependency-id">
-            <description>en-session1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-session1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-session1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>session1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>session1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>session1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>session1AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-
-         <concurrent>true</concurrent>         
-         
-         <!-- TODO jndi ref -->
-         <jndi-ref id="session1JndiRef1-id">
-            <description>en-session1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-session1JndiRef1-desc</description>
-            <description xml:lang="de">de-session1JndiRef1-desc</description>
-            <jndi-ref-name>session1JndiRef1Name</jndi-ref-name>
-            <mapped-name>session1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>session1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>session1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="session1JndiRef2-id">
-            <description>en-session1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-session1JndiRef2-desc</description>
-            <description xml:lang="de">de-session1JndiRef2-desc</description>
-            <jndi-ref-name>session1JndiRef2Name</jndi-ref-name>
-            <mapped-name>session1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>session1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>session1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
       </session>
 
       <session id="session2-id">
-         <description>en-session2-desc</description>
-         <description xml:lang="fr">fr-session2-desc</description>
-         <description xml:lang="de">de-session2-desc</description>
-         <display-name>en-session2-disp</display-name>
-         <display-name xml:lang="fr">fr-session2-disp</display-name>
-         <display-name xml:lang="de">de-session2-disp</display-name>
-         <icon id="en-session2-icon-id">
-            <small-icon>en-session2-small-icon</small-icon>
-            <large-icon>en-session2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-session2-icon-id">
-            <small-icon>fr-session2-small-icon</small-icon>
-            <large-icon>fr-session2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-session2-icon-id">
-            <small-icon>de-session2-small-icon</small-icon>
-            <large-icon>de-session2-large-icon</large-icon>
-         </icon>
-
          <ejb-name>session2EjbName</ejb-name>
-         
-         <remote-binding id="session2RemoteBinding-id">
-            <description>en-session2RemoteBinding-desc</description>
-            <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
-            <description xml:lang="de">de-session2RemoteBinding-desc</description>
-            <jndi-name>session2RemoteBindingJndiName</jndi-name>
-            <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
-            <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
-            <proxy-factory>session2RemoteBindingProxyFactory</proxy-factory>
-         </remote-binding>
-
          <jndi-name>session2JndiName</jndi-name>
          <local-jndi-name>session2LocalJndiName</local-jndi-name>
          <call-by-value>false</call-by-value>
@@ -519,25 +196,13 @@
          <timer-persistence>false</timer-persistence>
          <configuration-name>session2ConfigurationName</configuration-name>
          
-         <invoker-bindings id="session2InvokerBindings-id">
-            <description>en-session2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
-            <description xml:lang="de">de-session2InvokerBindings-desc</description>
-
-            <invoker id="session2Invoker1-id">
-               <description>en-session2Invoker1-desc</description>
-               <description xml:lang="fr">fr-session2Invoker1-desc</description>
-               <description xml:lang="de">de-session2Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>session2Invoker1Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="session2Invoker2-id">
-               <description>en-session2Invoker2-desc</description>
-               <description xml:lang="fr">fr-session2Invoker2-desc</description>
-               <description xml:lang="de">de-session2Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>session2Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -546,214 +211,78 @@
          
          <security-proxy>session2SecurityProxy</security-proxy>
          
-         <ejb-ref id="session2EjbRef1-id">
-            <description>en-session2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-session2EjbRef1-desc</description>
-            <description xml:lang="de">de-session2EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="session2EjbRef2-id">
-            <description>en-session2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-session2EjbRef2-desc</description>
-            <description xml:lang="de">de-session2EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="session2EjbLocalRef1-id">
-            <description>en-session2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-session2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-session2EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>session2EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="session2EjbLocalRef2-id">
-            <description>en-session2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-session2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-session2EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>session2EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>session2EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="session2ResourceRef1-id">
-            <description>en-session2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-session2ResourceRef1-desc</description>
-            <description xml:lang="de">de-session2ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>session2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="session2ResourceRef2-id">
-            <description>en-session2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-session2ResourceRef2-desc</description>
-            <description xml:lang="de">de-session2ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>session2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="session2ResourceEnvRef1-id">
-            <description>en-session2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-session2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-session2ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="session2ResourceEnvRef2-id">
-            <description>en-session2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-session2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-session2ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="session2MessageDestinationRef1-id">
-            <description>en-session2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-session2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-session2MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="session2MessageDestinationRef2-id">
-            <description>en-session2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-session2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-session2MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="session2MessageDestinationRef3-id">
-            <description>en-session2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-session2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-session2MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>session2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <security-identity id="session2SecurityIdentity-id">
-            <description>en-session2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-session2SecurityIdentity-desc</description>
-            <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <clustered>false</clustered>
          
-         <cluster-config id="session2ClusterConfig-id">
-            <description>en-session2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-session2ClusterConfig-desc</description>
-            <description xml:lang="de">de-session2ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>session2ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>session2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>session2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
             <session-state-manager-jndi-name>session2ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
          </cluster-config>
 
-         <security-domain>session2SecurityDomain</security-domain>
+<!--         <security-domain>session2SecurityDomain</security-domain> -->
          
-         <method-attributes id="session2MethodAttributes-id">
-            <method id="session2MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="session2MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
@@ -761,14 +290,8 @@
          <depends>session2Depends1</depends>
          <depends>session2Depends2</depends>
          
-         <ior-security-config id="session2IorSecurityConfig-id">
-            <description>en-session2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
-            <transport-config id="session2TransportConfig-id">
-               <description>en-session2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-session2TransportConfig-desc</description>
-               <description xml:lang="de">de-session2TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -776,143 +299,26 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="session2ASContext-id">
-               <description>en-session2ASContext-desc</description>
-               <description xml:lang="fr">fr-session2ASContext-desc</description>
-               <description xml:lang="de">de-session2ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>session2ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="session2SASContext-id">
-               <description>en-session2SASContext-desc</description>
-               <description xml:lang="fr">fr-session2SASContext-desc</description>
-               <description xml:lang="de">de-session2SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <port-component id="session2PortComponent-id">
+         <port-component>
             <port-component-name>session2-PortComponent</port-component-name>
             <port-component-uri>/session2/PortComponentURI</port-component-uri>
             <auth-method>BASIC</auth-method>
             <transport-guarantee>NONE</transport-guarantee>
-            <secure-wsdl-access>true</secure-wsdl-access>
          </port-component>         
          
-         <ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
-            <description>en-session2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
-         
-         <annotation id="session2Annotation1-id">
-            <description>en-session2Annotation1-desc</description>
-            <description xml:lang="fr">fr-session2Annotation1-desc</description>
-            <description xml:lang="de">de-session2Annotation1-desc</description>
-            
-            <annotation-class>session2Annotation1Class</annotation-class>
-            <annotation-implementation-class>session2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>session2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session2Annotation1Property1-id">
-               <description>en-session2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-session2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-session2Annotation1Property1-desc</description>
-               <property-name>session2Annotation1Property1Name</property-name>
-               <property-value>session2Annotation1Property1Value</property-value>
-            </property>
-            <property id="session2Annotation1Property2-id">
-               <description>en-session2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-session2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-session2Annotation1Property2-desc</description>
-               <property-name>session2Annotation1Property2Name</property-name>
-               <property-value>session2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="session2Annotation2-id">
-            <description>en-session2Annotation2-desc</description>
-            <description xml:lang="fr">fr-session2Annotation2-desc</description>
-            <description xml:lang="de">de-session2Annotation2-desc</description>
-            
-            <annotation-class>session2Annotation2Class</annotation-class>
-            <annotation-implementation-class>session2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>session2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>session2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="session2Annotation2Property1-id">
-               <description>en-session2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-session2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-session2Annotation2Property1-desc</description>
-               <property-name>session2Annotation2Property1Name</property-name>
-               <property-value>session2Annotation2Property1Value</property-value>
-            </property>
-            <property id="session2Annotation2Property2-id">
-               <description>en-session2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-session2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-session2Annotation2Property2-desc</description>
-               <property-name>session2Annotation2Property2Name</property-name>
-               <property-value>session2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="session2IgnoreDependency-id">
-            <description>en-session2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-session2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-session2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>session2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>session2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>session2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>session2AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-
-         <concurrent>false</concurrent>         
-         
-         <jndi-ref id="session2JndiRef1-id">
-            <description>en-session2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-session2JndiRef1-desc</description>
-            <description xml:lang="de">de-session2JndiRef1-desc</description>
-            <jndi-ref-name>session2JndiRef1Name</jndi-ref-name>
-            <mapped-name>session2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>session2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>session2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="session2JndiRef2-id">
-            <description>en-session2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-session2JndiRef2-desc</description>
-            <description xml:lang="de">de-session2JndiRef2-desc</description>
-            <jndi-ref-name>session2JndiRef2Name</jndi-ref-name>
-            <mapped-name>session2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>session2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>session2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>session2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>session2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
       </session>
 
       <entity>
@@ -920,25 +326,6 @@
       </entity>
 
       <entity id="entity1-id">
-         <description>en-entity1-desc</description>
-         <description xml:lang="fr">fr-entity1-desc</description>
-         <description xml:lang="de">de-entity1-desc</description>
-         <display-name>en-entity1-disp</display-name>
-         <display-name xml:lang="fr">fr-entity1-disp</display-name>
-         <display-name xml:lang="de">de-entity1-disp</display-name>
-         <icon id="en-entity1-icon-id">
-            <small-icon>en-entity1-small-icon</small-icon>
-            <large-icon>en-entity1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-entity1-icon-id">
-            <small-icon>fr-entity1-small-icon</small-icon>
-            <large-icon>fr-entity1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-entity1-icon-id">
-            <small-icon>de-entity1-small-icon</small-icon>
-            <large-icon>de-entity1-large-icon</large-icon>
-         </icon>
-
          <ejb-name>entity1EjbName</ejb-name>
 
          <jndi-name>entity1JndiName</jndi-name>
@@ -949,25 +336,13 @@
          <timer-persistence>true</timer-persistence>
          <configuration-name>entity1ConfigurationName</configuration-name>
          
-         <invoker-bindings id="entity1InvokerBindings-id">
-            <description>en-entity1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-entity1InvokerBindings-desc</description>
-            <description xml:lang="de">de-entity1InvokerBindings-desc</description>
-
-            <invoker id="entity1Invoker1-id">
-               <description>en-entity1Invoker1-desc</description>
-               <description xml:lang="fr">fr-entity1Invoker1-desc</description>
-               <description xml:lang="de">de-entity1Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>entity1Invoker1Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="entity1Invoker2-id">
-               <description>en-entity1Invoker2-desc</description>
-               <description xml:lang="fr">fr-entity1Invoker2-desc</description>
-               <description xml:lang="de">de-entity1Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>entity1Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -976,222 +351,83 @@
          
          <security-proxy>entity1SecurityProxy</security-proxy>
          
-         <ejb-ref id="entity1EjbRef1-id">
-            <description>en-entity1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-entity1EjbRef1-desc</description>
-            <description xml:lang="de">de-entity1EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="entity1EjbRef2-id">
-            <description>en-entity1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-entity1EjbRef2-desc</description>
-            <description xml:lang="de">de-entity1EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="entity1EjbLocalRef1-id">
-            <description>en-entity1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-entity1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-entity1EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>entity1EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="entity1EjbLocalRef2-id">
-            <description>en-entity1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-entity1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-entity1EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity1EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>entity1EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="entity1ResourceRef1-id">
-            <description>en-entity1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
-            <description xml:lang="de">de-entity1ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>entity1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="entity1ResourceRef2-id">
-            <description>en-entity1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceRef2-desc</description>
-            <description xml:lang="de">de-entity1ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>entity1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="entity1ResourceEnvRef1-id">
-            <description>en-entity1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-entity1ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="entity1ResourceEnvRef2-id">
-            <description>en-entity1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-entity1ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="entity1MessageDestinationRef1-id">
-            <description>en-entity1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="entity1MessageDestinationRef2-id">
-            <description>en-entity1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="entity1MessageDestinationRef3-id">
-            <description>en-entity1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-entity1MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>entity1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity1MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <method-attributes id="entity1MethodAttributes-id">
-            <method id="entity1MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="entity1MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
          
-         <security-identity id="entity1SecurityIdentity-id">
-            <description>en-entity1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
-            <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <clustered>true</clustered>
          
-         <cluster-config id="entity1ClusterConfig-id">
-            <description>en-entity1ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-entity1ClusterConfig-desc</description>
-            <description xml:lang="de">de-entity1ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>entity1ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>entity1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>entity1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
          </cluster-config>
          
-         <security-domain>entity1SecurityDomain</security-domain>
+<!--         <security-domain>entity1SecurityDomain</security-domain> -->
          
          <cache-invalidation>true</cache-invalidation>
-         <cache-invalidation-config id="entity1CacheInvalidationConfig-id">
-            <description>en-entity1CacheInvalidationConfig-desc</description>
-            <description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</description>
-            <description xml:lang="de">de-entity1CacheInvalidationConfig-desc</description>
+         <cache-invalidation-config>
             <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1199,14 +435,8 @@
          <depends>entity1Depends1</depends>
          <depends>entity1Depends2</depends>
          
-         <ior-security-config id="entity1IorSecurityConfig-id">
-            <description>en-entity1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-entity1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-entity1IorSecurityConfig-desc</description>
-            <transport-config id="entity1TransportConfig-id">
-               <description>en-entity1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-entity1TransportConfig-desc</description>
-               <description xml:lang="de">de-entity1TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1214,148 +444,18 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="entity1ASContext-id">
-               <description>en-entity1ASContext-desc</description>
-               <description xml:lang="fr">fr-entity1ASContext-desc</description>
-               <description xml:lang="de">de-entity1ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>entity1ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="entity1SASContext-id">
-               <description>en-entity1SASContext-desc</description>
-               <description xml:lang="fr">fr-entity1SASContext-desc</description>
-               <description xml:lang="de">de-entity1SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
-         
-         <annotation id="entity1Annotation1-id">
-            <description>en-entity1Annotation1-desc</description>
-            <description xml:lang="fr">fr-entity1Annotation1-desc</description>
-            <description xml:lang="de">de-entity1Annotation1-desc</description>
-            
-            <annotation-class>entity1Annotation1Class</annotation-class>
-            <annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity1Annotation1Property1-id">
-               <description>en-entity1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-entity1Annotation1Property1-desc</description>
-               <property-name>entity1Annotation1Property1Name</property-name>
-               <property-value>entity1Annotation1Property1Value</property-value>
-            </property>
-            <property id="entity1Annotation1Property2-id">
-               <description>en-entity1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-entity1Annotation1Property2-desc</description>
-               <property-name>entity1Annotation1Property2Name</property-name>
-               <property-value>entity1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="entity1Annotation2-id">
-            <description>en-entity1Annotation2-desc</description>
-            <description xml:lang="fr">fr-entity1Annotation2-desc</description>
-            <description xml:lang="de">de-entity1Annotation2-desc</description>
-            
-            <annotation-class>entity1Annotation2Class</annotation-class>
-            <annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity1Annotation2Property1-id">
-               <description>en-entity1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-entity1Annotation2Property1-desc</description>
-               <property-name>entity1Annotation2Property1Name</property-name>
-               <property-value>entity1Annotation2Property1Value</property-value>
-            </property>
-            <property id="entity1Annotation2Property2-id">
-               <description>en-entity1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-entity1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-entity1Annotation2Property2-desc</description>
-               <property-name>entity1Annotation2Property2Name</property-name>
-               <property-value>entity1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="entity1IgnoreDependency-id">
-            <description>en-entity1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-entity1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-entity1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>entity1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>entity1AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-         
-         <jndi-ref id="entity1JndiRef1-id">
-            <description>en-entity1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-entity1JndiRef1-desc</description>
-            <description xml:lang="de">de-entity1JndiRef1-desc</description>
-            <jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
-            <mapped-name>entity1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="entity1JndiRef2-id">
-            <description>en-entity1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-entity1JndiRef2-desc</description>
-            <description xml:lang="de">de-entity1JndiRef2-desc</description>
-            <jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
-            <mapped-name>entity1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
       </entity>
 
       <entity id="entity2-id">
-         <description>en-entity2-desc</description>
-         <description xml:lang="fr">fr-entity2-desc</description>
-         <description xml:lang="de">de-entity2-desc</description>
-         <display-name>en-entity2-disp</display-name>
-         <display-name xml:lang="fr">fr-entity2-disp</display-name>
-         <display-name xml:lang="de">de-entity2-disp</display-name>
-         <icon id="en-entity2-icon-id">
-            <small-icon>en-entity2-small-icon</small-icon>
-            <large-icon>en-entity2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-entity2-icon-id">
-            <small-icon>fr-entity2-small-icon</small-icon>
-            <large-icon>fr-entity2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-entity2-icon-id">
-            <small-icon>de-entity2-small-icon</small-icon>
-            <large-icon>de-entity2-large-icon</large-icon>
-         </icon>
-
          <ejb-name>entity2EjbName</ejb-name>
 
          <jndi-name>entity2JndiName</jndi-name>
@@ -1366,25 +466,13 @@
          <timer-persistence>false</timer-persistence>
          <configuration-name>entity2ConfigurationName</configuration-name>
          
-         <invoker-bindings id="entity2InvokerBindings-id">
-            <description>en-entity2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-entity2InvokerBindings-desc</description>
-            <description xml:lang="de">de-entity2InvokerBindings-desc</description>
-
-            <invoker id="entity2Invoker1-id">
-               <description>en-entity2Invoker1-desc</description>
-               <description xml:lang="fr">fr-entity2Invoker1-desc</description>
-               <description xml:lang="de">de-entity2Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>entity2Invoker1Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="entity2Invoker2-id">
-               <description>en-entity2Invoker2-desc</description>
-               <description xml:lang="fr">fr-entity2Invoker2-desc</description>
-               <description xml:lang="de">de-entity2Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>entity2Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -1393,222 +481,83 @@
          
          <security-proxy>entity2SecurityProxy</security-proxy>
          
-         <ejb-ref id="entity2EjbRef1-id">
-            <description>en-entity2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-entity2EjbRef1-desc</description>
-            <description xml:lang="de">de-entity2EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="entity2EjbRef2-id">
-            <description>en-entity2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-entity2EjbRef2-desc</description>
-            <description xml:lang="de">de-entity2EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="entity2EjbLocalRef1-id">
-            <description>en-entity2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-entity2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-entity2EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>entity2EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="entity2EjbLocalRef2-id">
-            <description>en-entity2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-entity2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-entity2EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>entity2EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>entity2EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="entity2ResourceRef1-id">
-            <description>en-entity2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
-            <description xml:lang="de">de-entity2ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>entity2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="entity2ResourceRef2-id">
-            <description>en-entity2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceRef2-desc</description>
-            <description xml:lang="de">de-entity2ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>entity2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="entity2ResourceEnvRef1-id">
-            <description>en-entity2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-entity2ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="entity2ResourceEnvRef2-id">
-            <description>en-entity2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-entity2ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="entity2MessageDestinationRef1-id">
-            <description>en-entity2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="entity2MessageDestinationRef2-id">
-            <description>en-entity2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="entity2MessageDestinationRef3-id">
-            <description>en-entity2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-entity2MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>entity2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>entity2MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
          
-         <method-attributes id="entity2MethodAttributes-id">
-            <method id="entity2MethodAttributesMethod1-id">
+         <method-attributes>
+            <method>
                <method-name>get*</method-name>
                <read-only>true</read-only>
                <idempotent>true</idempotent>
                <transaction-timeout>5000</transaction-timeout>
             </method>
-            <method id="entity2MethodAttributesMethod2-id">
+            <method>
                <method-name>*</method-name>
             </method>
          </method-attributes>
          
-         <security-identity id="entity2SecurityIdentity-id">
-            <description>en-entity2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
-            <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <clustered>false</clustered>
          
-         <cluster-config id="entity2ClusterConfig-id">
-            <description>en-entity2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-entity2ClusterConfig-desc</description>
-            <description xml:lang="de">de-entity2ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>entity2ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>entity2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>entity2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
          </cluster-config>
          
-         <security-domain>entity2SecurityDomain</security-domain>
+<!--         <security-domain>entity2SecurityDomain</security-domain> -->
 
          <cache-invalidation>false</cache-invalidation>
-         <cache-invalidation-config id="entity2CacheInvalidationConfig-id">
-            <description>en-entity2CacheInvalidationConfig-desc</description>
-            <description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</description>
-            <description xml:lang="de">de-entity2CacheInvalidationConfig-desc</description>
+         <cache-invalidation-config>
             <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1616,14 +565,8 @@
          <depends>entity2Depends1</depends>
          <depends>entity2Depends2</depends>
          
-         <ior-security-config id="entity2IorSecurityConfig-id">
-            <description>en-entity2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-entity2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-entity2IorSecurityConfig-desc</description>
-            <transport-config id="entity2TransportConfig-id">
-               <description>en-entity2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-entity2TransportConfig-desc</description>
-               <description xml:lang="de">de-entity2TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1631,126 +574,15 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="entity2ASContext-id">
-               <description>en-entity2ASContext-desc</description>
-               <description xml:lang="fr">fr-entity2ASContext-desc</description>
-               <description xml:lang="de">de-entity2ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>entity2ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="entity2SASContext-id">
-               <description>en-entity2SASContext-desc</description>
-               <description xml:lang="fr">fr-entity2SASContext-desc</description>
-               <description xml:lang="de">de-entity2SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
-         
-         <annotation id="entity2Annotation1-id">
-            <description>en-entity2Annotation1-desc</description>
-            <description xml:lang="fr">fr-entity2Annotation1-desc</description>
-            <description xml:lang="de">de-entity2Annotation1-desc</description>
-            
-            <annotation-class>entity2Annotation1Class</annotation-class>
-            <annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity2Annotation1Property1-id">
-               <description>en-entity2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-entity2Annotation1Property1-desc</description>
-               <property-name>entity2Annotation1Property1Name</property-name>
-               <property-value>entity2Annotation1Property1Value</property-value>
-            </property>
-            <property id="entity2Annotation1Property2-id">
-               <description>en-entity2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-entity2Annotation1Property2-desc</description>
-               <property-name>entity2Annotation1Property2Name</property-name>
-               <property-value>entity2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="entity2Annotation2-id">
-            <description>en-entity2Annotation2-desc</description>
-            <description xml:lang="fr">fr-entity2Annotation2-desc</description>
-            <description xml:lang="de">de-entity2Annotation2-desc</description>
-            
-            <annotation-class>entity2Annotation2Class</annotation-class>
-            <annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>entity2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>entity2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="entity2Annotation2Property1-id">
-               <description>en-entity2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-entity2Annotation2Property1-desc</description>
-               <property-name>entity2Annotation2Property1Name</property-name>
-               <property-value>entity2Annotation2Property1Value</property-value>
-            </property>
-            <property id="entity2Annotation2Property2-id">
-               <description>en-entity2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-entity2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-entity2Annotation2Property2-desc</description>
-               <property-name>entity2Annotation2Property2Name</property-name>
-               <property-value>entity2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="entity2IgnoreDependency-id">
-            <description>en-entity2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-entity2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-entity2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>entity2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>entity2AOPDomain</aop-domain-name>         
-         
-         <!-- TODO cache config -->
-         
-         <!-- TODO pool config -->
-         
-         <jndi-ref id="entity2JndiRef1-id">
-            <description>en-entity2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-entity2JndiRef1-desc</description>
-            <description xml:lang="de">de-entity2JndiRef1-desc</description>
-            <jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
-            <mapped-name>entity2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>entity2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>entity2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="entity2JndiRef2-id">
-            <description>en-entity2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-entity2JndiRef2-desc</description>
-            <description xml:lang="de">de-entity2JndiRef2-desc</description>
-            <jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
-            <mapped-name>entity2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>entity2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>entity2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>entity2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>entity2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-
       </entity>
 
       <message-driven>
@@ -1758,25 +590,6 @@
       </message-driven>
 
       <message-driven id="mdb1-id">
-         <description>en-mdb1-desc</description>
-         <description xml:lang="fr">fr-mdb1-desc</description>
-         <description xml:lang="de">de-mdb1-desc</description>
-         <display-name>en-mdb1-disp</display-name>
-         <display-name xml:lang="fr">fr-mdb1-disp</display-name>
-         <display-name xml:lang="de">de-mdb1-disp</display-name>
-         <icon id="en-mdb1-icon-id">
-            <small-icon>en-mdb1-small-icon</small-icon>
-            <large-icon>en-mdb1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-mdb1-icon-id">
-            <small-icon>fr-mdb1-small-icon</small-icon>
-            <large-icon>fr-mdb1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-mdb1-icon-id">
-            <small-icon>de-mdb1-small-icon</small-icon>
-            <large-icon>de-mdb1-large-icon</large-icon>
-         </icon>
-
          <ejb-name>mdb1EjbName</ejb-name>
 
          <destination-jndi-name>mdb1DestinationJndiName</destination-jndi-name>
@@ -1790,25 +603,13 @@
          <timer-persistence>true</timer-persistence>
          <configuration-name>mdb1ConfigurationName</configuration-name>
          
-         <invoker-bindings id="mdb1InvokerBindings-id">
-            <description>en-mdb1InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-mdb1InvokerBindings-desc</description>
-            <description xml:lang="de">de-mdb1InvokerBindings-desc</description>
-
-            <invoker id="mdb1Invoker1-id">
-               <description>en-mdb1Invoker1-desc</description>
-               <description xml:lang="fr">fr-mdb1Invoker1-desc</description>
-               <description xml:lang="de">de-mdb1Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>mdb1Invoker1Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="mdb1Invoker2-id">
-               <description>en-mdb1Invoker2-desc</description>
-               <description xml:lang="fr">fr-mdb1Invoker2-desc</description>
-               <description xml:lang="de">de-mdb1Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>mdb1Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -1817,215 +618,64 @@
          
          <security-proxy>mdb1SecurityProxy</security-proxy>
          
-         <ejb-ref id="mdb1EjbRef1-id">
-            <description>en-mdb1EjbRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbRef1-desc</description>
-            <description xml:lang="de">de-mdb1EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="mdb1EjbRef2-id">
-            <description>en-mdb1EjbRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbRef2-desc</description>
-            <description xml:lang="de">de-mdb1EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="mdb1EjbLocalRef1-id">
-            <description>en-mdb1EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-mdb1EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb1EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>mdb1EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="mdb1EjbLocalRef2-id">
-            <description>en-mdb1EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-mdb1EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb1EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>mdb1EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="mdb1ResourceRef1-id">
-            <description>en-mdb1ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
-            <description xml:lang="de">de-mdb1ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>mdb1ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="mdb1ResourceRef2-id">
-            <description>en-mdb1ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceRef2-desc</description>
-            <description xml:lang="de">de-mdb1ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>mdb1ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="mdb1ResourceEnvRef1-id">
-            <description>en-mdb1ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-mdb1ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="mdb1ResourceEnvRef2-id">
-            <description>en-mdb1ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-mdb1ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="mdb1MessageDestinationRef1-id">
-            <description>en-mdb1MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-mdb1MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="mdb1MessageDestinationRef2-id">
-            <description>en-mdb1MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-mdb1MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="mdb1MessageDestinationRef3-id">
-            <description>en-mdb1MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-mdb1MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>mdb1MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb1MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
-         
-         <method-attributes id="mdb1MethodAttributes-id">
-            <method id="mdb1MethodAttributesMethod1-id">
-               <method-name>get*</method-name>
-               <read-only>true</read-only>
-               <idempotent>true</idempotent>
-               <transaction-timeout>5000</transaction-timeout>
-            </method>
-            <method id="mdb1MethodAttributesMethod2-id">
-               <method-name>*</method-name>
-            </method>
-         </method-attributes>
-         
-         <security-identity id="mdb1SecurityIdentity-id">
-            <description>en-mdb1SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
-            <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
-            <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
+                  
          <depends>mdb1Depends1</depends>
          <depends>mdb1Depends2</depends>
          
-         <ior-security-config id="mdb1IorSecurityConfig-id">
-            <description>en-mdb1IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-mdb1IorSecurityConfig-desc</description>
-            <transport-config id="mdb1TransportConfig-id">
-               <description>en-mdb1TransportConfig-desc</description>
-               <description xml:lang="fr">fr-mdb1TransportConfig-desc</description>
-               <description xml:lang="de">de-mdb1TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2033,164 +683,22 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="mdb1ASContext-id">
-               <description>en-mdb1ASContext-desc</description>
-               <description xml:lang="fr">fr-mdb1ASContext-desc</description>
-               <description xml:lang="de">de-mdb1ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>mdb1ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="mdb1SASContext-id">
-               <description>en-mdb1SASContext-desc</description>
-               <description xml:lang="fr">fr-mdb1SASContext-desc</description>
-               <description xml:lang="de">de-mdb1SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <ejb-timeout-identity id="mdb1EjbTimeoutIdentity-id">
-            <description>en-mdb1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>mdb1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
-         
-         <annotation id="mdb1Annotation1-id">
-            <description>en-mdb1Annotation1-desc</description>
-            <description xml:lang="fr">fr-mdb1Annotation1-desc</description>
-            <description xml:lang="de">de-mdb1Annotation1-desc</description>
-            
-            <annotation-class>mdb1Annotation1Class</annotation-class>
-            <annotation-implementation-class>mdb1Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb1Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb1Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb1Annotation1Property1-id">
-               <description>en-mdb1Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation1Property1-desc</description>
-               <description xml:lang="de">de-mdb1Annotation1Property1-desc</description>
-               <property-name>mdb1Annotation1Property1Name</property-name>
-               <property-value>mdb1Annotation1Property1Value</property-value>
-            </property>
-            <property id="mdb1Annotation1Property2-id">
-               <description>en-mdb1Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation1Property2-desc</description>
-               <description xml:lang="de">de-mdb1Annotation1Property2-desc</description>
-               <property-name>mdb1Annotation1Property2Name</property-name>
-               <property-value>mdb1Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="mdb1Annotation2-id">
-            <description>en-mdb1Annotation2-desc</description>
-            <description xml:lang="fr">fr-mdb1Annotation2-desc</description>
-            <description xml:lang="de">de-mdb1Annotation2-desc</description>
-            
-            <annotation-class>mdb1Annotation2Class</annotation-class>
-            <annotation-implementation-class>mdb1Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb1Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb1Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb1Annotation2Property1-id">
-               <description>en-mdb1Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation2Property1-desc</description>
-               <description xml:lang="de">de-mdb1Annotation2Property1-desc</description>
-               <property-name>mdb1Annotation2Property1Name</property-name>
-               <property-value>mdb1Annotation2Property1Value</property-value>
-            </property>
-            <property id="mdb1Annotation2Property2-id">
-               <description>en-mdb1Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-mdb1Annotation2Property2-desc</description>
-               <description xml:lang="de">de-mdb1Annotation2Property2-desc</description>
-               <property-name>mdb1Annotation2Property2Name</property-name>
-               <property-value>mdb1Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="mdb1IgnoreDependency-id">
-            <description>en-mdb1IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-mdb1IgnoreDependency-desc</description>
-            <description xml:lang="de">de-mdb1IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>mdb1IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>mdb1IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>mdb1IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>mdb1AOPDomain</aop-domain-name>         
-         
-         <!-- TODO pool config -->
-
-         <jndi-ref id="mdb1JndiRef1-id">
-            <description>en-mdb1JndiRef1-desc</description>
-            <description xml:lang="fr">fr-mdb1JndiRef1-desc</description>
-            <description xml:lang="de">de-mdb1JndiRef1-desc</description>
-            <jndi-ref-name>mdb1JndiRef1Name</jndi-ref-name>
-            <mapped-name>mdb1JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="mdb1JndiRef2-id">
-            <description>en-mdb1JndiRef2-desc</description>
-            <description xml:lang="fr">fr-mdb1JndiRef2-desc</description>
-            <description xml:lang="de">de-mdb1JndiRef2-desc</description>
-            <jndi-ref-name>mdb1JndiRef2Name</jndi-ref-name>
-            <mapped-name>mdb1JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb1JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb1JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         
-         <default-activation-config id="mdb1DefaultActivationConfig-id">
-            <activation-config-property id="mdb1DefaultActivationConfigProperty1-id">
-               <activation-config-property-name>mdb1DefaultActivationConfigProperty1Name</activation-config-property-name>
-               <activation-config-property-value>mdb1DefaultActivationConfigProperty1Value</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property id="mdb1DefaultActivationConfigProperty2-id">
-               <activation-config-property-name>mdb1DefaultActivationConfigProperty2Name</activation-config-property-name>
-               <activation-config-property-value>mdb1DefaultActivationConfigProperty2Value</activation-config-property-value>
-            </activation-config-property>
-         </default-activation-config>
-
       </message-driven>
 
       <message-driven id="mdb2-id">
-         <description>en-mdb2-desc</description>
-         <description xml:lang="fr">fr-mdb2-desc</description>
-         <description xml:lang="de">de-mdb2-desc</description>
-         <display-name>en-mdb2-disp</display-name>
-         <display-name xml:lang="fr">fr-mdb2-disp</display-name>
-         <display-name xml:lang="de">de-mdb2-disp</display-name>
-         <icon id="en-mdb2-icon-id">
-            <small-icon>en-mdb2-small-icon</small-icon>
-            <large-icon>en-mdb2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-mdb2-icon-id">
-            <small-icon>fr-mdb2-small-icon</small-icon>
-            <large-icon>fr-mdb2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-mdb2-icon-id">
-            <small-icon>de-mdb2-small-icon</small-icon>
-            <large-icon>de-mdb2-large-icon</large-icon>
-         </icon>
-
          <ejb-name>mdb2EjbName</ejb-name>
 
          <destination-jndi-name>mdb2DestinationJndiName</destination-jndi-name>
@@ -2204,25 +712,13 @@
          <timer-persistence>false</timer-persistence>
          <configuration-name>mdb2ConfigurationName</configuration-name>
          
-         <invoker-bindings id="mdb2InvokerBindings-id">
-            <description>en-mdb2InvokerBindings-desc</description>
-            <description xml:lang="fr">fr-mdb2InvokerBindings-desc</description>
-            <description xml:lang="de">de-mdb2InvokerBindings-desc</description>
-
-            <invoker id="mdb2Invoker1-id">
-               <description>en-mdb2Invoker1-desc</description>
-               <description xml:lang="fr">fr-mdb2Invoker1-desc</description>
-               <description xml:lang="de">de-mdb2Invoker1-desc</description>
-               
+         <invoker-bindings>
+            <invoker>
                <invoker-proxy-binding-name>mdb2Invoker1Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
-            <invoker id="mdb2Invoker2-id">
-               <description>en-mdb2Invoker2-desc</description>
-               <description xml:lang="fr">fr-mdb2Invoker2-desc</description>
-               <description xml:lang="de">de-mdb2Invoker2-desc</description>
-               
+            <invoker>
                <invoker-proxy-binding-name>mdb2Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker2JndiName</jndi-name>
                <!-- TODO ejb-ref -->
@@ -2231,215 +727,64 @@
          
          <security-proxy>mdb2SecurityProxy</security-proxy>
          
-         <ejb-ref id="mdb2EjbRef1-id">
-            <description>en-mdb2EjbRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbRef1-desc</description>
-            <description xml:lang="de">de-mdb2EjbRef1-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2EjbRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </ejb-ref>
-         <ejb-ref id="mdb2EjbRef2-id">
-            <description>en-mdb2EjbRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbRef2-desc</description>
-            <description xml:lang="de">de-mdb2EjbRef2-desc</description>
-
+         <ejb-ref>
             <ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2EjbRef2JndiName</jndi-name>
          </ejb-ref>
 
-         <ejb-local-ref id="mdb2EjbLocalRef1-id">
-            <description>en-mdb2EjbLocalRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</description>
-            <description xml:lang="de">de-mdb2EjbLocalRef1-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef1Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb2EjbLocalRef1JndiName</jndi-name>
-            <ignore-dependency/>
+            <local-jndi-name>mdb2EjbLocalRef1JndiName</local-jndi-name>
          </ejb-local-ref>
-         <ejb-local-ref id="mdb2EjbLocalRef2-id">
-            <description>en-mdb2EjbLocalRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</description>
-            <description xml:lang="de">de-mdb2EjbLocalRef2-desc</description>
-
+         <ejb-local-ref>
             <ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2EjbLocalRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2EjbLocalRef2Injection2Name</injection-target-name>
-            </injection-target>
-            <jndi-name>mdb2EjbLocalRef2JndiName</jndi-name>
+            <local-jndi-name>mdb2EjbLocalRef2JndiName</local-jndi-name>
          </ejb-local-ref>
 
          <!-- TODO service-ref -->
 
-         <resource-ref id="mdb2ResourceRef1-id">
-            <description>en-mdb2ResourceRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
-            <description xml:lang="de">de-mdb2ResourceRef1-desc</description>
+         <security-identity>
+            <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+         </security-identity>
+
+         <resource-ref>
             <res-ref-name>mdb2ResourceRef1Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-ref>
-         <resource-ref id="mdb2ResourceRef2-id">
-            <description>en-mdb2ResourceRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceRef2-desc</description>
-            <description xml:lang="de">de-mdb2ResourceRef2-desc</description>
+         <resource-ref>
             <res-ref-name>mdb2ResourceRef2Name</res-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceRef2JndiName</jndi-name>
          </resource-ref>
-         <resource-env-ref id="mdb2ResourceEnvRef1-id">
-            <description>en-mdb2ResourceEnvRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</description>
-            <description xml:lang="de">de-mdb2ResourceEnvRef1-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceEnvRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </resource-env-ref>
-         <resource-env-ref id="mdb2ResourceEnvRef2-id">
-            <description>en-mdb2ResourceEnvRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</description>
-            <description xml:lang="de">de-mdb2ResourceEnvRef2-desc</description>
+         <resource-env-ref>
             <resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2ResourceEnvRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2ResourceEnvRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
-         <message-destination-ref id="mdb2MessageDestinationRef1-id">
-            <description>en-mdb2MessageDestinationRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</description>
-            <description xml:lang="de">de-mdb2MessageDestinationRef1-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef1Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2MessageDestinationRef1JndiName</jndi-name>
-            <ignore-dependency/>
          </message-destination-ref>
-         <message-destination-ref id="mdb2MessageDestinationRef2-id">
-            <description>en-mdb2MessageDestinationRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</description>
-            <description xml:lang="de">de-mdb2MessageDestinationRef2-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef2Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
-         <message-destination-ref id="mdb2MessageDestinationRef3-id">
-            <description>en-mdb2MessageDestinationRef3-desc</description>
-            <description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</description>
-            <description xml:lang="de">de-mdb2MessageDestinationRef3-desc</description>
+         <message-destination-ref>
             <message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef3Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2MessageDestinationRef3Injection2Class</injection-target-class>
-               <injection-target-name>mdb2MessageDestinationRef3Injection2Name</injection-target-name>
-            </injection-target>
             <jndi-name>mdb2MessageDestinationRef3JndiName</jndi-name>
          </message-destination-ref>
 
-         <method-attributes id="mdb2MethodAttributes-id">
-            <method id="mdb2MethodAttributesMethod1-id">
-               <method-name>get*</method-name>
-               <read-only>true</read-only>
-               <idempotent>true</idempotent>
-               <transaction-timeout>5000</transaction-timeout>
-            </method>
-            <method id="mdb2MethodAttributesMethod2-id">
-               <method-name>*</method-name>
-            </method>
-         </method-attributes>
-         
-         <security-identity id="mdb2SecurityIdentity-id">
-            <description>en-mdb2SecurityIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
-            <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
-            <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
-         </security-identity>
-
          <depends>mdb2Depends1</depends>
          <depends>mdb2Depends2</depends>
          
-         <ior-security-config id="mdb2IorSecurityConfig-id">
-            <description>en-mdb2IorSecurityConfig-desc</description>
-            <description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</description>
-            <description xml:lang="de">de-mdb2IorSecurityConfig-desc</description>
-            <transport-config id="mdb2TransportConfig-id">
-               <description>en-mdb2TransportConfig-desc</description>
-               <description xml:lang="fr">fr-mdb2TransportConfig-desc</description>
-               <description xml:lang="de">de-mdb2TransportConfig-desc</description>
+         <ior-security-config>
+            <transport-config>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2447,243 +792,88 @@
                <detect-misordering>NONE</detect-misordering>
                <detect-replay>NONE</detect-replay>
             </transport-config>
-            <as-context id="mdb2ASContext-id">
-               <description>en-mdb2ASContext-desc</description>
-               <description xml:lang="fr">fr-mdb2ASContext-desc</description>
-               <description xml:lang="de">de-mdb2ASContext-desc</description>
+            <as-context>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>mdb2ASContextRealm</realm>
                <required>false</required>
             </as-context>
-            <sas-context id="mdb2SASContext-id">
-               <description>en-mdb2SASContext-desc</description>
-               <description xml:lang="fr">fr-mdb2SASContext-desc</description>
-               <description xml:lang="de">de-mdb2SASContext-desc</description>
+            <sas-context>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
-         <ejb-timeout-identity id="mdb2EjbTimeoutIdentity-id">
-            <description>en-mdb2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</description>
-            <description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</description>
+         <ejb-timeout-identity>
             <run-as-principal>mdb2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
-         
-         <annotation id="mdb2Annotation1-id">
-            <description>en-mdb2Annotation1-desc</description>
-            <description xml:lang="fr">fr-mdb2Annotation1-desc</description>
-            <description xml:lang="de">de-mdb2Annotation1-desc</description>
-            
-            <annotation-class>mdb2Annotation1Class</annotation-class>
-            <annotation-implementation-class>mdb2Annotation1Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb2Annotation1InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb2Annotation1InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb2Annotation1Property1-id">
-               <description>en-mdb2Annotation1Property1-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation1Property1-desc</description>
-               <description xml:lang="de">de-mdb2Annotation1Property1-desc</description>
-               <property-name>mdb2Annotation1Property1Name</property-name>
-               <property-value>mdb2Annotation1Property1Value</property-value>
-            </property>
-            <property id="mdb2Annotation1Property2-id">
-               <description>en-mdb2Annotation1Property2-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation1Property2-desc</description>
-               <description xml:lang="de">de-mdb2Annotation1Property2-desc</description>
-               <property-name>mdb2Annotation1Property2Name</property-name>
-               <property-value>mdb2Annotation1Property2Value</property-value>
-            </property>
-         </annotation>
-         <annotation id="mdb2Annotation2-id">
-            <description>en-mdb2Annotation2-desc</description>
-            <description xml:lang="fr">fr-mdb2Annotation2-desc</description>
-            <description xml:lang="de">de-mdb2Annotation2-desc</description>
-            
-            <annotation-class>mdb2Annotation2Class</annotation-class>
-            <annotation-implementation-class>mdb2Annotation2Impl</annotation-implementation-class>
-            <injection-target>
-               <injection-target-class>mdb2Annotation2InjectionTargetClass</injection-target-class>
-               <injection-target-name>mdb2Annotation2InjectionTargetName</injection-target-name>
-            </injection-target>
-            <property id="mdb2Annotation2Property1-id">
-               <description>en-mdb2Annotation2Property1-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation2Property1-desc</description>
-               <description xml:lang="de">de-mdb2Annotation2Property1-desc</description>
-               <property-name>mdb2Annotation2Property1Name</property-name>
-               <property-value>mdb2Annotation2Property1Value</property-value>
-            </property>
-            <property id="mdb2Annotation2Property2-id">
-               <description>en-mdb2Annotation2Property2-desc</description>
-               <description xml:lang="fr">fr-mdb2Annotation2Property2-desc</description>
-               <description xml:lang="de">de-mdb2Annotation2Property2-desc</description>
-               <property-name>mdb2Annotation2Property2Name</property-name>
-               <property-value>mdb2Annotation2Property2Value</property-value>
-            </property>
-         </annotation>
-
-         <ignore-dependency id="mdb2IgnoreDependency-id">
-            <description>en-mdb2IgnoreDependency-desc</description>
-            <description xml:lang="fr">fr-mdb2IgnoreDependency-desc</description>
-            <description xml:lang="de">de-mdb2IgnoreDependency-desc</description>
-            <injection-target>
-               <injection-target-class>mdb2IgnoreDependencyInjection1Class</injection-target-class>
-               <injection-target-name>mdb2IgnoreDependencyInjection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2IgnoreDependencyInjection2Class</injection-target-class>
-               <injection-target-name>mdb2IgnoreDependencyInjection2Name</injection-target-name>
-            </injection-target>
-         </ignore-dependency>
-
-         <aop-domain-name>mdb2AOPDomain</aop-domain-name>         
-         
-         <!-- TODO pool config -->
-
-         <jndi-ref id="mdb2JndiRef1-id">
-            <description>en-mdb2JndiRef1-desc</description>
-            <description xml:lang="fr">fr-mdb2JndiRef1-desc</description>
-            <description xml:lang="de">de-mdb2JndiRef1-desc</description>
-            <jndi-ref-name>mdb2JndiRef1Name</jndi-ref-name>
-            <mapped-name>mdb2JndiRef1MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef1Injection1Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef1Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef1Injection2Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef1Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         <jndi-ref id="mdb2JndiRef2-id">
-            <description>en-mdb2JndiRef2-desc</description>
-            <description xml:lang="fr">fr-mdb2JndiRef2-desc</description>
-            <description xml:lang="de">de-mdb2JndiRef2-desc</description>
-            <jndi-ref-name>mdb2JndiRef2Name</jndi-ref-name>
-            <mapped-name>mdb2JndiRef2MappedName</mapped-name>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef2Injection1Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef2Injection1Name</injection-target-name>
-            </injection-target>
-            <injection-target>
-               <injection-target-class>mdb2JndiRef2Injection2Class</injection-target-class>
-               <injection-target-name>mdb2JndiRef2Injection2Name</injection-target-name>
-            </injection-target>
-         </jndi-ref>
-         
-         <default-activation-config id="mdb2DefaultActivationConfig-id">
-            <activation-config-property id="mdb2DefaultActivationConfigProperty1-id">
-               <activation-config-property-name>mdb2DefaultActivationConfigProperty1Name</activation-config-property-name>
-               <activation-config-property-value>mdb2DefaultActivationConfigProperty1Value</activation-config-property-value>
-            </activation-config-property>
-            <activation-config-property id="mdb2DefaultActivationConfigProperty2-id">
-               <activation-config-property-name>mdb2DefaultActivationConfigProperty2Name</activation-config-property-name>
-               <activation-config-property-value>mdb2DefaultActivationConfigProperty2Value</activation-config-property-value>
-            </activation-config-property>
-         </default-activation-config>
-
       </message-driven>
 
    </enterprise-beans>
 
-   <assembly-descriptor id="assembly-descriptor-id">
+   <assembly-descriptor>
 
-      <security-role id="securityRole1-id">
-         <description>en-securityRole1-desc</description>
-         <description xml:lang="fr">fr-securityRole1-desc</description>
-         <description xml:lang="de">de-securityRole1-desc</description>
+      <security-role>
          <role-name>securityRole1RoleName</role-name>
          <principal-name>securityRole1Principal1</principal-name>
          <principal-name>securityRole1Principal2</principal-name>
       </security-role>
-      <security-role id="securityRole2-id">
-         <description>en-securityRole2-desc</description>
-         <description xml:lang="fr">fr-securityRole2-desc</description>
-         <description xml:lang="de">de-securityRole2-desc</description>
+      <security-role>
          <role-name>securityRole2RoleName</role-name>
          <principal-name>securityRole2Principal1</principal-name>
          <principal-name>securityRole2Principal2</principal-name>
       </security-role>
 
-      <message-destination id="messageDestination1-id">
-         <description>en-messageDestination1-desc</description>
-         <description xml:lang="fr">fr-messageDestination1-desc</description>
-         <description xml:lang="de">de-messageDestination1-desc</description>
-         <display-name>en-messageDestination1-disp</display-name>
-         <display-name xml:lang="fr">fr-messageDestination1-disp</display-name>
-         <display-name xml:lang="de">de-messageDestination1-disp</display-name>
-         <icon id="en-messageDestination1-icon-id">
-            <small-icon>en-messageDestination1-small-icon</small-icon>
-            <large-icon>en-messageDestination1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-messageDestination1-icon-id">
-            <small-icon>fr-messageDestination1-small-icon</small-icon>
-            <large-icon>fr-messageDestination1-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-messageDestination1-icon-id">
-            <small-icon>de-messageDestination1-small-icon</small-icon>
-            <large-icon>de-messageDestination1-large-icon</large-icon>
-         </icon>
+      <message-destination>
          <message-destination-name>messageDestination1Name</message-destination-name>
          <jndi-name>messageDestination1JndiName</jndi-name>
       </message-destination>
-      <message-destination id="messageDestination2-id">
-         <description>en-messageDestination2-desc</description>
-         <description xml:lang="fr">fr-messageDestination2-desc</description>
-         <description xml:lang="de">de-messageDestination2-desc</description>
-         <display-name>en-messageDestination2-disp</display-name>
-         <display-name xml:lang="fr">fr-messageDestination2-disp</display-name>
-         <display-name xml:lang="de">de-messageDestination2-disp</display-name>
-         <icon id="en-messageDestination2-icon-id">
-            <small-icon>en-messageDestination2-small-icon</small-icon>
-            <large-icon>en-messageDestination2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="fr" id="fr-messageDestination2-icon-id">
-            <small-icon>fr-messageDestination2-small-icon</small-icon>
-            <large-icon>fr-messageDestination2-large-icon</large-icon>
-         </icon>
-         <icon xml:lang="de" id="de-messageDestination2-icon-id">
-            <small-icon>de-messageDestination2-small-icon</small-icon>
-            <large-icon>de-messageDestination2-large-icon</large-icon>
-         </icon>
+      <message-destination>
          <message-destination-name>messageDestination2Name</message-destination-name>
          <jndi-name>messageDestination2JndiName</jndi-name>
       </message-destination>
 
    </assembly-descriptor>
 
-   <resource-managers id="resource-managers-id">
-      <description>en-resource-managers-desc</description>
-      <description xml:lang="fr">fr-resource-managers-desc</description>
-      <description xml:lang="de">de-resource-managers-desc</description>
-      <resource-manager id="resourceManager1-id" res-class="resourceManager1Class">
-         <description>en-resourceManager1-desc</description>
-         <description xml:lang="fr">fr-resourceManager1-desc</description>
-         <description xml:lang="de">de-resourceManager1-desc</description>
+   <resource-managers>
+      <resource-manager>
          <res-name>resourceManager1Name</res-name>
          <res-jndi-name>resourceManager1JndiName</res-jndi-name>
       </resource-manager>
-      <resource-manager id="resourceManager2-id" res-class="resourceManager2Class">
-         <description>en-resourceManager2-desc</description>
-         <description xml:lang="fr">fr-resourceManager2-desc</description>
-         <description xml:lang="de">de-resourceManager2-desc</description>
+      <resource-manager>
          <res-name>resourceManager2Name</res-name>
          <res-url>resourceManager2URL</res-url>
       </resource-manager>
    </resource-managers>
    
-   <invoker-proxy-bindings id="invoker-proxy-bindings-id">
-      <description>en-invoker-proxy-bindings-desc</description>
-      <description xml:lang="fr">fr-invoker-proxy-bindings-desc</description>
-      <description xml:lang="de">de-invoker-proxy-bindings-desc</description>
-      <invoker-proxy-binding id="invokerProxyBinding1-id-override">
-         <invoker-proxy-binding-name>invokerProxyBinding1Name-override</invoker-proxy-binding-name>
+   <invoker-proxy-bindings>
+      <invoker-proxy-binding>
+         <name>invokerProxyBinding1Name-override</name>
          <invoker-mbean>invokerProxyBinding1InvokerMBean-override</invoker-mbean>
          <proxy-factory>invokerProxyBinding1ProxyFactory-override</proxy-factory>
+         <proxy-factory-config>
+            <client-interceptors>
+               <home>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.HomeInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.HomeInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.HomeInterceptorcbvt4.1</interceptor>
+               </home>
+               <bean>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.BeanInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.BeanInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.BeanInterceptorcbvt4.1</interceptor>
+               </bean>
+               <list-entity>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor1.1</interceptor>
+                  <interceptor>org.jboss.proxy.ejb.EntityInterceptor2.1</interceptor>
+                  <interceptor call-by-value="false">org.jboss.proxy.ejb.EntityInterceptorcbvf3.1</interceptor>
+                  <interceptor call-by-value="true">org.jboss.proxy.ejb.EntityInterceptorcbvt4.1</interceptor>
+               </list-entity>
+            </client-interceptors>
+         </proxy-factory-config>
       </invoker-proxy-binding>
-      <invoker-proxy-binding id="invokerProxyBinding2-id">
-         <invoker-proxy-binding-name>invokerProxyBinding2Name-override</invoker-proxy-binding-name>
+      <invoker-proxy-binding>
+         <name>invokerProxyBinding2Name-override</name>
          <invoker-mbean>invokerProxyBinding2InvokerMBean-override</invoker-mbean>
          <proxy-factory>invokerProxyBinding2ProxyFactory-override</proxy-factory>
          <proxy-factory-config>
@@ -2709,16 +899,15 @@
             </client-interceptors>
          </proxy-factory-config>
          <!-- Unknown element to test duplicate wildcards -->
-         <wildcard />
       </invoker-proxy-binding>
    </invoker-proxy-bindings>   
    
-   <container-configurations id="container-configurations-id-override">
+   <container-configurations>
       <container-configuration>
          <!-- This replaces the testEverything entry -->
          <container-name>Standard Stateless SessionBean</container-name>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1-override</invoker-proxy-binding-name>
-         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name> -->
          <container-interceptors>
             <interceptor>containerConfiguration1.Interceptor1-override</interceptor>
             <interceptor>containerConfiguration1.Interceptor2-override</interceptor>
@@ -2748,14 +937,14 @@
                <cache-load-factor>0.75</cache-load-factor>
             </cache-policy-conf>
          </container-cache-conf>
-         <container-pool-conf id="containerConfiguration1-pool-conf">
+         <container-pool-conf>
             <MaximumSize>100</MaximumSize>
          </container-pool-conf>
          
          <commit-option>C</commit-option>
          <optiond-refresh-rate>101</optiond-refresh-rate>
          <security-domain>containerConfiguration1SecurityDomain-override</security-domain>
-         <cluster-config id="containerConfiguration1ClusterConfig-id-override">
+         <cluster-config>
             <partition-name>containerConfiguration1ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>containerConfiguration1ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>containerConfiguration1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
@@ -2768,23 +957,20 @@
       <container-configuration extends="Standard Stateless SessionBean">
          <container-name>session2ConfigurationName</container-name>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1-override1</invoker-proxy-binding-name>
-         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override1</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override1</invoker-proxy-binding-name> -->
       </container-configuration>
       <!-- This extends a config from the overriden jboss.xml  -->
       <container-configuration extends="containerConfiguration1Name">
          <container-name>containerConfiguration1Name-override</container-name>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1-override</invoker-proxy-binding-name>
-         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name> -->
       </container-configuration>
 
-      <container-configuration id="containerConfiguration2-id" extends="containerConfiguration2Extends">
-         <description>en-containerConfiguration2-desc</description>
-         <description xml:lang="fr">fr-containerConfiguration2-desc</description>
-         <description xml:lang="de">de-containerConfiguration2-desc</description>
+      <container-configuration extends="containerConfiguration2Extends">
          <container-name>containerConfiguration2Name</container-name>
          <call-logging>false</call-logging>
          <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
-         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name>
+<!--         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name> -->
          <sync-on-commit-only>false</sync-on-commit-only>
          <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
          <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
@@ -2818,16 +1004,13 @@
                <cache-load-factor>0.75</cache-load-factor>
             </cache-policy-conf>
          </container-cache-conf>
-         <container-pool-conf id="containerConfiguration2-pool-conf">
+         <container-pool-conf>
             <MaximumSize>100</MaximumSize>
          </container-pool-conf>
          <commit-option>D</commit-option>
          <optiond-refresh-rate>10</optiond-refresh-rate>
          <security-domain>containerConfiguration2SecurityDomain</security-domain>
-         <cluster-config id="containerConfiguration2ClusterConfig-id">
-            <description>en-containerConfiguration2ClusterConfig-desc</description>
-            <description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</description>
-            <description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</description>
+         <cluster-config>
             <partition-name>containerConfiguration2ClusterConfigPartitionName</partition-name>
             <home-load-balance-policy>containerConfiguration2ClusterConfigHomeLoadBalancePolicy</home-load-balance-policy>
             <bean-load-balance-policy>containerConfiguration2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml	2008-11-13 21:52:00 UTC (rev 80963)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml	2008-11-13 22:55:05 UTC (rev 80964)
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- A sample jboss5 standardjboss.xml -->
+  <!DOCTYPE jboss PUBLIC
+      "-//JBoss//DTD JBOSS 5.0//EN"
+      "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<!-- A sample jboss5 standardjboss.xml
 <jboss xmlns="http://www.jboss.com/xml/ns/javaee"
        xmlns:jee="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
        version="3.0"
        id="jboss-id">
-         
+-->
+<jboss>
+
   <!--
    The missing-method-permissions-excluded-mode is a boolean
    that allows the deployer to globally indicate that all methods without a




More information about the jboss-cvs-commits mailing list