[jboss-svn-commits] JBoss Common SVN: r2483 - in jbossxb-builder/trunk/src/test: java/org/jboss/javaee/metadata/spec and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Aug 13 06:48:09 EDT 2007


Author: alex.loubyansky at jboss.com
Date: 2007-08-13 06:48:08 -0400 (Mon, 13 Aug 2007)
New Revision: 2483

Added:
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java
Modified:
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/JavaEEMetaDataConstants.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/AbstractEJBEverythingTest.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EJBMetaDataTestSuite.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar21EverythingUnitTestCase.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java
   jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar21Everything_testEverything.xml
   jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3xEverything_testEverything.xml
   jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml
Log:
made the ejb3, ejb21 and jboss descriptors more consistent, introduced jboss-specific namespace for jboss descriptors, basic merge test

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -36,13 +36,13 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at XmlRootElement(name="jboss", namespace="http://www.jboss.com/xml/ns/javaee")
+ at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JBOSS_NS)
 @JBossXmlSchema(
       xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
       ignoreUnresolvedFieldOrClass=false,
-      namespace="http://www.jboss.com/xml/ns/javaee",
+      namespace=JavaEEMetaDataConstants.JBOSS_NS,
       elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jbossType", namespace="http://www.jboss.com/xml/ns/javaee")
+ at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
 /*@XmlTypeImpls
 ({
    @XmlTypeImpl(name="true-falseType", startElementCreatesObject=false),

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/JavaEEMetaDataConstants.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/JavaEEMetaDataConstants.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/JavaEEMetaDataConstants.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -34,4 +34,7 @@
    
    /** The j2ee namespace */
    String J2EE_NS = "http://java.sun.com/xml/ns/j2ee";
+   
+   /** The jboss namespace*/
+   String JBOSS_NS = "http://www.jboss.com/xml/ns/javaee";
 }

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/AbstractEJBEverythingTest.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/AbstractEJBEverythingTest.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/AbstractEJBEverythingTest.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -103,11 +103,11 @@
       assertNullSession("session0", enterpriseBeansMetaData);
       assertFullSession("session1", enterpriseBeansMetaData);
       assertFullSession("session2", enterpriseBeansMetaData);
-      SessionBeanMetaData session = assertSession("session3", enterpriseBeansMetaData);
+      SessionBeanMetaData session = assertSession("session3EjbName", enterpriseBeansMetaData);
       assertEquals(SessionType.Stateful, session.getSessionType());
-      session = assertSession("session4", enterpriseBeansMetaData);
+      session = assertSession("session4EjbName", enterpriseBeansMetaData);
       assertEquals(TransactionType.Bean, session.getTransactionType());
-      session = assertSession("session5", enterpriseBeansMetaData);
+      session = assertSession("session5EjbName", enterpriseBeansMetaData);
       SecurityIdentityMetaData securityIdentityMetaData = session.getSecurityIdentity();
       assertNotNull(securityIdentityMetaData);
       assertFalse(securityIdentityMetaData.isUseCallerId());
@@ -115,11 +115,11 @@
       assertNullEntity("entity0", enterpriseBeansMetaData);
       assertFullEntity("entity1", enterpriseBeansMetaData);
       assertFullEntity("entity2", enterpriseBeansMetaData);
-      EntityBeanMetaData entity = assertEntity("entity3", enterpriseBeansMetaData);
+      EntityBeanMetaData entity = assertEntity("entity3EjbName", enterpriseBeansMetaData);
       assertEquals(PersistenceType.Bean, entity.getPersistenceType());
-      entity = assertEntity("entity4", enterpriseBeansMetaData);
+      entity = assertEntity("entity4EjbName", enterpriseBeansMetaData);
       assertFalse(entity.isReentrant());
-      entity = assertEntity("entity5", enterpriseBeansMetaData);
+      entity = assertEntity("entity5EjbName", enterpriseBeansMetaData);
       assertEquals("1.x", entity.getCmpVersion());
       assertTrue(entity.isCMP1x());
       
@@ -178,7 +178,7 @@
    
    private SessionBeanMetaData assertNullSession(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      SessionBeanMetaData session = assertSession(ejbName, enterpriseBeansMetaData);
+      SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
       assertNull(session.getId());
       assertNull(session.getMappedName());
       assertNull(session.getHome());
@@ -276,7 +276,7 @@
 
    private EntityBeanMetaData assertNullEntity(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      EntityBeanMetaData entity = assertEntity(ejbName, enterpriseBeansMetaData);
+      EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
       assertNull(entity.getId());
       assertNull(entity.getMappedName());
       assertNull(entity.getHome());
@@ -434,7 +434,7 @@
 
    private MessageDrivenBeanMetaData assertNullMDB(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      MessageDrivenBeanMetaData mdb = assertMDB(ejbName, enterpriseBeansMetaData);
+      MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
 
       assertNull(mdb.getId());
       assertNull(mdb.getMappedName());
@@ -616,7 +616,7 @@
       assertNotNull(relationRoleSourceMetaData);
       assertId(prefix, relationRoleSourceMetaData);
       assertDescriptions(prefix, relationRoleSourceMetaData.getDescriptions());
-      assertEquals(prefix + "Name", relationRoleSourceMetaData.getEjbName());
+      assertEquals(prefix + "Name" + "EjbName", relationRoleSourceMetaData.getEjbName());
    }
    
    private void assertCmrField(String prefix, CMRFieldMetaData cmrFieldMetaData)
@@ -857,7 +857,7 @@
          if (ejbName == null)
             assertEquals(prefix + count + "EjbName", methodMetaData.getEjbName());
          else
-            assertEquals(ejbName, methodMetaData.getEjbName());
+            assertEquals(ejbName + "EjbName", methodMetaData.getEjbName());
          if (count == 1)
             assertEquals(MethodInterfaceType.Home, methodMetaData.getMethodIntf());
          else if (count == 2)

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EJBMetaDataTestSuite.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EJBMetaDataTestSuite.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EJBMetaDataTestSuite.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -47,6 +47,7 @@
       suite.addTest(EjbJar3xEverythingUnitTestCase.suite());
       suite.addTest(EjbJar21EverythingUnitTestCase.suite());
       suite.addTest(JBoss5xEverythingUnitTestCase.suite());
+      suite.addTest(EjbJarJBossMergeEverythingUnitTestCase.suite());
       
       return suite;
    }

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar21EverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar21EverythingUnitTestCase.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar21EverythingUnitTestCase.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -82,6 +82,11 @@
       //enableTrace("org.jboss.xb");
       //enableTrace("org.jboss.xb.builder");
       EjbJar2xMetaData ejbJarMetaData = unmarshal();
+      assertEverything(ejbJarMetaData);
+   }
+
+   public void assertEverything(EjbJar2xMetaData ejbJarMetaData)
+   {
       //ApplicationMetaData applicationMetaData = new ApplicationMetaData(ejbJarMetaData); 
       assertVersion(ejbJarMetaData);
       //assertVersion(applicationMetaData);
@@ -116,7 +121,13 @@
 */
    protected SessionBeanMetaData assertFullSession(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      SessionBeanMetaData session = assertSession(ejbName, enterpriseBeansMetaData);
+      SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
+      assertFullSessionBean(ejbName, session);      
+      return session;
+   }
+
+   public void assertFullSessionBean(String ejbName, SessionBeanMetaData session)
+   {
       assertId(ejbName, session);
       assertClass(ejbName, "Home", session.getHome());
       assertClass(ejbName, "Remote", session.getRemote());
@@ -132,13 +143,11 @@
       assertExcludeList(ejbName, 5, 5, session.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
       assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
-      
-      return session;
    }
    
    protected EntityBeanMetaData assertFullEntity(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      EntityBeanMetaData entity = assertEntity(ejbName, enterpriseBeansMetaData);
+      EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
       assertId(ejbName, entity);
       assertClass(ejbName, "Home", entity.getHome());
       assertClass(ejbName, "Remote", entity.getRemote());
@@ -206,7 +215,7 @@
    
    protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      MessageDrivenBeanMetaData mdb = assertMDB(ejbName, enterpriseBeansMetaData);
+      MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
       assertId(ejbName, mdb);
       assertEquals(ejbName + "MessagingType", mdb.getMessagingType());
       assertEquals(TransactionType.Container, mdb.getTransactionType());

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -141,7 +141,13 @@
    
    protected SessionBeanMetaData assertFullSession(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      SessionBeanMetaData session = assertSession(ejbName, enterpriseBeansMetaData);
+      SessionBeanMetaData session = assertSession(ejbName + "EjbName", enterpriseBeansMetaData);
+      assertFullSessionBean(ejbName, session);      
+      return session;
+   }
+
+   public void assertFullSessionBean(String ejbName, SessionBeanMetaData session)
+   {
       assertId(ejbName, session);
       assertMappedName(ejbName, session.getMappedName());
       assertClass(ejbName, "Home", session.getHome());
@@ -166,8 +172,6 @@
       assertExcludeList(ejbName, 5, 5, session.getExcludeList());
       assertSecurityRoleRefs(ejbName, 2, session.getSecurityRoleRefs());
       assertSecurityIdentity(ejbName, "SecurityIdentity", session.getSecurityIdentity(), true);
-      
-      return session;
    }
 
    private void assertInitMethods(String ejbName, int size, InitMethodsMetaData initMethodsMetaData)
@@ -203,7 +207,7 @@
    
    protected EntityBeanMetaData assertFullEntity(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      EntityBeanMetaData entity = assertEntity(ejbName, enterpriseBeansMetaData);
+      EntityBeanMetaData entity = assertEntity(ejbName + "EjbName", enterpriseBeansMetaData);
       assertId(ejbName, entity);
       assertMappedName(ejbName, entity.getMappedName());
       assertClass(ejbName, "Home", entity.getHome());
@@ -272,7 +276,7 @@
    
    protected MessageDrivenBeanMetaData assertFullMDB(String ejbName, EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
-      MessageDrivenBeanMetaData mdb = assertMDB(ejbName, enterpriseBeansMetaData);
+      MessageDrivenBeanMetaData mdb = assertMDB(ejbName + "EjbName", enterpriseBeansMetaData);
       assertId(ejbName, mdb);
       assertMappedName(ejbName, mdb.getMappedName());
       assertEquals(ejbName + "MessagingType", mdb.getMessagingType());

Added: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java	                        (rev 0)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -0,0 +1,138 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ejb.metadata.test;
+
+import junit.framework.Test;
+
+import org.jboss.ejb.metadata.jboss.JBoss50MetaData;
+import org.jboss.ejb.metadata.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.ejb.metadata.spec.EjbJar21MetaData;
+import org.jboss.ejb.metadata.spec.EjbJar30MetaData;
+import org.jboss.ejb.metadata.spec.EjbJar3xMetaData;
+import org.jboss.ejb.metadata.spec.SessionBeanMetaData;
+import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
+import org.jboss.test.ejb.AbstractEJBEverythingTest;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.builder.JBossXBBuilder;
+import org.w3c.dom.ls.LSInput;
+
+/**
+ * 
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class EjbJarJBossMergeEverythingUnitTestCase
+   extends AbstractEJBEverythingTest
+{
+   public static Test suite()
+   {
+      return suite(EjbJarJBossMergeEverythingUnitTestCase.class);
+   }
+
+   public static SchemaBindingResolver initResolver()
+   {
+      return new SchemaBindingResolver()
+      {
+         public String getBaseURI()
+         {
+            return null;
+         }
+
+         public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
+         {
+            SchemaBinding schema;
+            if(JavaEEMetaDataConstants.JAVAEE_NS.equals(nsUri))
+            {
+               schema = JBossXBBuilder.build(EjbJar30MetaData.class);
+            }
+            else if(JavaEEMetaDataConstants.J2EE_NS.equals(nsUri))
+            {
+               schema = JBossXBBuilder.build(EjbJar21MetaData.class);
+            }
+            else if(JavaEEMetaDataConstants.JBOSS_NS.equals(nsUri))
+            {
+               schema = JBossXBBuilder.build(JBoss50MetaData.class);
+            }
+            else
+            {
+               throw new IllegalStateException("Unexpected namespace: " + nsUri);
+            }
+            return schema;
+         }
+
+         public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
+         {
+            return null;
+         }
+
+         public void setBaseURI(String baseURI)
+         {
+         }
+      };
+   }
+   
+   public EjbJarJBossMergeEverythingUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   /**
+    * Very basic merge test
+    */
+   public void testEJB3xEverything() throws Exception
+   {
+      EjbJar3xMetaData ejbJarMetaData = unmarshal("EjbJar3xEverything_testEverything.xml", EjbJar30MetaData.class, null);
+      EjbJar3xEverythingUnitTestCase ejbJar = new EjbJar3xEverythingUnitTestCase("ejb-jar");
+      ejbJar.assertEverything(ejbJarMetaData);
+
+      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
+      jboss.assertEverything(jbossMetaData);
+      
+      jbossMetaData.setOverridenMetaData(ejbJarMetaData);
+      
+      JBossEnterpriseBeanMetaData ejb = jbossMetaData.getMergedEnterpriseBean("session1EjbName");      
+      assertNotNull(ejb);
+      ejbJar.assertFullSessionBean("session1", (SessionBeanMetaData) ejb.getOverridenMetaData());
+   }
+
+   /**
+    * Very basic merge test
+    */
+   public void testEJB21Everything() throws Exception
+   {
+      EjbJar21MetaData ejbJarMetaData = unmarshal("EjbJar21Everything_testEverything.xml", EjbJar21MetaData.class, null);
+      EjbJar21EverythingUnitTestCase ejbJar = new EjbJar21EverythingUnitTestCase("ejb-jar");
+      ejbJar.assertEverything(ejbJarMetaData);
+
+      JBoss50MetaData jbossMetaData = unmarshal("JBoss5xEverything_testEverything.xml", JBoss50MetaData.class, null);
+      JBoss5xEverythingUnitTestCase jboss = new JBoss5xEverythingUnitTestCase("jboss");
+      jboss.assertEverything(jbossMetaData);
+
+      jbossMetaData.setOverridenMetaData(ejbJarMetaData);
+
+      JBossEnterpriseBeanMetaData ejb = jbossMetaData.getMergedEnterpriseBean("session1EjbName");      
+      assertNotNull(ejb);
+      ejbJar.assertFullSessionBean("session1", (SessionBeanMetaData) ejb.getOverridenMetaData());
+   }
+}

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/AbstractJavaEEEverythingTest.java	2007-08-13 10:48:08 UTC (rev 2483)
@@ -21,8 +21,6 @@
 */
 package org.jboss.test.javaee;
 
-import java.util.Iterator;
-import java.util.Map;
 import java.util.Set;
 
 import org.jboss.javaee.annotation.Description;

Modified: jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar21Everything_testEverything.xml
===================================================================
--- jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar21Everything_testEverything.xml	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar21Everything_testEverything.xml	2007-08-13 10:48:08 UTC (rev 2483)
@@ -28,7 +28,7 @@
    <enterprise-beans id="enterprise-beans-id">
 
       <session>
-         <ejb-name>session0</ejb-name>
+         <ejb-name>session0EjbName</ejb-name>
       </session>
 
       <session id="session1-id">
@@ -52,7 +52,7 @@
             <large-icon>de-session1-large-icon</large-icon>
          </icon>
 
-         <ejb-name>session1</ejb-name>
+         <ejb-name>session1EjbName</ejb-name>
 
          <home>session1Home</home>
          <remote>session1Remote</remote>
@@ -231,7 +231,7 @@
             <large-icon>de-session2-large-icon</large-icon>
          </icon>
 
-         <ejb-name>session2</ejb-name>
+         <ejb-name>session2EjbName</ejb-name>
 
          <home>session2Home</home>
          <remote>session2Remote</remote>
@@ -390,20 +390,20 @@
       </session>
 
       <session>
-         <ejb-name>session3</ejb-name>
+         <ejb-name>session3EjbName</ejb-name>
          <ejb-class>session3EjbClass</ejb-class>
          <session-type>Stateful</session-type>
       </session>
 
       <session>
-         <ejb-name>session4</ejb-name>
+         <ejb-name>session4EjbName</ejb-name>
          <ejb-class>session4EjbClass</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Bean</transaction-type>
       </session>
 
       <session>
-         <ejb-name>session5</ejb-name>
+         <ejb-name>session5EjbName</ejb-name>
          <ejb-class>session5EjbClass</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Container</transaction-type>
@@ -411,7 +411,7 @@
       </session>
 
       <entity>
-         <ejb-name>entity0</ejb-name>
+         <ejb-name>entity0EjbName</ejb-name>
       </entity>
 
       <entity id="entity1-id">
@@ -435,7 +435,7 @@
             <large-icon>de-entity1-large-icon</large-icon>
          </icon>
 
-         <ejb-name>entity1</ejb-name>
+         <ejb-name>entity1EjbName</ejb-name>
 
          <home>entity1Home</home>
          <remote>entity1Remote</remote>
@@ -648,7 +648,7 @@
             <large-icon>de-entity2-large-icon</large-icon>
          </icon>
 
-         <ejb-name>entity2</ejb-name>
+         <ejb-name>entity2EjbName</ejb-name>
 
          <home>entity2Home</home>
          <remote>entity2Remote</remote>
@@ -841,13 +841,13 @@
       </entity>
 
       <entity>
-         <ejb-name>entity3</ejb-name>
+         <ejb-name>entity3EjbName</ejb-name>
          <ejb-class>entity3Class</ejb-class>
          <persistence-type>Bean</persistence-type>
       </entity>
 
       <entity>
-         <ejb-name>entity4</ejb-name>
+         <ejb-name>entity4EjbName</ejb-name>
          <ejb-class>entity4Class</ejb-class>
          <persistence-type>Container</persistence-type>
          <prim-key-class>java.lang.Object</prim-key-class>
@@ -855,7 +855,7 @@
       </entity>
 
       <entity>
-         <ejb-name>entity5</ejb-name>
+         <ejb-name>entity5EjbName</ejb-name>
          <ejb-class>entity5Class</ejb-class>
          <persistence-type>Container</persistence-type>
          <prim-key-class>java.lang.Object</prim-key-class>
@@ -864,7 +864,7 @@
       </entity>
 
       <message-driven>
-         <ejb-name>mdb0</ejb-name>
+         <ejb-name>mdb0EjbName</ejb-name>
       </message-driven>
 
       <message-driven id="mdb1-id">
@@ -888,7 +888,7 @@
             <large-icon>de-mdb1-large-icon</large-icon>
          </icon>
 
-         <ejb-name>mdb1</ejb-name>
+         <ejb-name>mdb1EjbName</ejb-name>
 
          <ejb-class>mdb1EjbClass</ejb-class>
          <messaging-type>mdb1MessagingType</messaging-type>
@@ -1061,7 +1061,7 @@
             <large-icon>de-mdb2-large-icon</large-icon>
          </icon>
 
-         <ejb-name>mdb2</ejb-name>
+         <ejb-name>mdb2EjbName</ejb-name>
 
          <ejb-class>mdb2EjbClass</ejb-class>
          <messaging-type>mdb2MessagingType</messaging-type>
@@ -1235,7 +1235,7 @@
                <description>en-relation1Role1RoleSource-desc</description>
                <description xml:lang="fr">fr-relation1Role1RoleSource-desc</description>
                <description xml:lang="de">de-relation1Role1RoleSource-desc</description>
-               <ejb-name>relation1Role1RoleSourceName</ejb-name>
+               <ejb-name>relation1Role1RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation1Role1CmrField-id">
                <description>en-relation1Role1CmrField-desc</description>
@@ -1256,7 +1256,7 @@
                <description>en-relation1Role2RoleSource-desc</description>
                <description xml:lang="fr">fr-relation1Role2RoleSource-desc</description>
                <description xml:lang="de">de-relation1Role2RoleSource-desc</description>
-               <ejb-name>relation1Role2RoleSourceName</ejb-name>
+               <ejb-name>relation1Role2RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation1Role2CmrField-id">
                <description>en-relation1Role2CmrField-desc</description>
@@ -1283,7 +1283,7 @@
                <description>en-relation2Role1RoleSource-desc</description>
                <description xml:lang="fr">fr-relation2Role1RoleSource-desc</description>
                <description xml:lang="de">de-relation2Role1RoleSource-desc</description>
-               <ejb-name>relation2Role1RoleSourceName</ejb-name>
+               <ejb-name>relation2Role1RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation2Role1CmrField-id">
                <description>en-relation2Role1CmrField-desc</description>
@@ -1304,7 +1304,7 @@
                <description>en-relation2Role2RoleSource-desc</description>
                <description xml:lang="fr">fr-relation2Role2RoleSource-desc</description>
                <description xml:lang="de">de-relation2Role2RoleSource-desc</description>
-               <ejb-name>relation2Role2RoleSourceName</ejb-name>
+               <ejb-name>relation2Role2RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation2Role2CmrField-id">
                <description>en-relation2Role2CmrField-desc</description>
@@ -1430,7 +1430,7 @@
             <description>en-session1MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -1442,7 +1442,7 @@
             <description>en-session1MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method2-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session1MethodPermission1Method2MethodName</method-name>
          </method>
@@ -1450,7 +1450,7 @@
             <description>en-session1MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method3-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session1MethodPermission1Method3MethodName</method-name>
          </method>
@@ -1458,7 +1458,7 @@
             <description>en-session1MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method4-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session1MethodPermission1Method4MethodName</method-name>
          </method>
@@ -1466,7 +1466,7 @@
             <description>en-session1MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method5-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session1MethodPermission1Method5MethodName</method-name>
          </method>
@@ -1481,7 +1481,7 @@
             <description>en-session1MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-session1MethodPermission2Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -1500,7 +1500,7 @@
             <description>en-session1MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-session1MethodPermission3Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -1519,7 +1519,7 @@
             <description>en-session2MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -1531,7 +1531,7 @@
             <description>en-session2MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method2-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session2MethodPermission1Method2MethodName</method-name>
          </method>
@@ -1539,7 +1539,7 @@
             <description>en-session2MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method3-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session2MethodPermission1Method3MethodName</method-name>
          </method>
@@ -1547,7 +1547,7 @@
             <description>en-session2MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method4-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session2MethodPermission1Method4MethodName</method-name>
          </method>
@@ -1555,7 +1555,7 @@
             <description>en-session2MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method5-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session2MethodPermission1Method5MethodName</method-name>
          </method>
@@ -1570,7 +1570,7 @@
             <description>en-session2MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-session2MethodPermission2Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -1589,7 +1589,7 @@
             <description>en-session2MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-session2MethodPermission3Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -1608,7 +1608,7 @@
             <description>en-entity1MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -1620,7 +1620,7 @@
             <description>en-entity1MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method2-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity1MethodPermission1Method2MethodName</method-name>
          </method>
@@ -1628,7 +1628,7 @@
             <description>en-entity1MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method3-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity1MethodPermission1Method3MethodName</method-name>
          </method>
@@ -1636,7 +1636,7 @@
             <description>en-entity1MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method4-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity1MethodPermission1Method4MethodName</method-name>
          </method>
@@ -1644,7 +1644,7 @@
             <description>en-entity1MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method5-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity1MethodPermission1Method5MethodName</method-name>
          </method>
@@ -1659,7 +1659,7 @@
             <description>en-entity1MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-entity1MethodPermission2Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -1678,7 +1678,7 @@
             <description>en-entity1MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-entity1MethodPermission3Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -1697,7 +1697,7 @@
             <description>en-entity2MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -1709,7 +1709,7 @@
             <description>en-entity2MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method2-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity2MethodPermission1Method2MethodName</method-name>
          </method>
@@ -1717,7 +1717,7 @@
             <description>en-entity2MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method3-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity2MethodPermission1Method3MethodName</method-name>
          </method>
@@ -1725,7 +1725,7 @@
             <description>en-entity2MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method4-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity2MethodPermission1Method4MethodName</method-name>
          </method>
@@ -1733,7 +1733,7 @@
             <description>en-entity2MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method5-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity2MethodPermission1Method5MethodName</method-name>
          </method>
@@ -1748,7 +1748,7 @@
             <description>en-entity2MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-entity2MethodPermission2Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -1767,7 +1767,7 @@
             <description>en-entity2MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-entity2MethodPermission3Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -1786,7 +1786,7 @@
             <description>en-mdb1MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -1798,7 +1798,7 @@
             <description>en-mdb1MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method2-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb1MethodPermission1Method2MethodName</method-name>
          </method>
@@ -1806,7 +1806,7 @@
             <description>en-mdb1MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method3-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb1MethodPermission1Method3MethodName</method-name>
          </method>
@@ -1814,7 +1814,7 @@
             <description>en-mdb1MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method4-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb1MethodPermission1Method4MethodName</method-name>
          </method>
@@ -1822,7 +1822,7 @@
             <description>en-mdb1MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method5-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb1MethodPermission1Method5MethodName</method-name>
          </method>
@@ -1837,7 +1837,7 @@
             <description>en-mdb1MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission2Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -1856,7 +1856,7 @@
             <description>en-mdb1MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission3Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -1875,7 +1875,7 @@
             <description>en-mdb2MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -1887,7 +1887,7 @@
             <description>en-mdb2MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method2-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb2MethodPermission1Method2MethodName</method-name>
          </method>
@@ -1895,7 +1895,7 @@
             <description>en-mdb2MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method3-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb2MethodPermission1Method3MethodName</method-name>
          </method>
@@ -1903,7 +1903,7 @@
             <description>en-mdb2MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method4-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb2MethodPermission1Method4MethodName</method-name>
          </method>
@@ -1911,7 +1911,7 @@
             <description>en-mdb2MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method5-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb2MethodPermission1Method5MethodName</method-name>
          </method>
@@ -1926,7 +1926,7 @@
             <description>en-mdb2MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission2Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -1945,7 +1945,7 @@
             <description>en-mdb2MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission3Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -2104,7 +2104,7 @@
             <description>en-session1ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -2116,7 +2116,7 @@
             <description>en-session1ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method2-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session1ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -2124,7 +2124,7 @@
             <description>en-session1ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method3-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session1ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -2132,7 +2132,7 @@
             <description>en-session1ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method4-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session1ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -2140,7 +2140,7 @@
             <description>en-session1ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method5-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session1ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -2154,7 +2154,7 @@
             <description>en-session1ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction2Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -2172,7 +2172,7 @@
             <description>en-session1ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction3Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -2190,7 +2190,7 @@
             <description>en-session1ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction4Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -2208,7 +2208,7 @@
             <description>en-session1ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction5Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -2226,7 +2226,7 @@
             <description>en-session1ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction6Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -2245,7 +2245,7 @@
             <description>en-session2ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -2257,7 +2257,7 @@
             <description>en-session2ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method2-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session2ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -2265,7 +2265,7 @@
             <description>en-session2ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method3-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session2ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -2273,7 +2273,7 @@
             <description>en-session2ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method4-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session2ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -2281,7 +2281,7 @@
             <description>en-session2ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method5-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session2ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -2295,7 +2295,7 @@
             <description>en-session2ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction2Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -2313,7 +2313,7 @@
             <description>en-session2ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction3Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -2331,7 +2331,7 @@
             <description>en-session2ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction4Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -2349,7 +2349,7 @@
             <description>en-session2ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction5Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -2367,7 +2367,7 @@
             <description>en-session2ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction6Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -2386,7 +2386,7 @@
             <description>en-entity1ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -2398,7 +2398,7 @@
             <description>en-entity1ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method2-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity1ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -2406,7 +2406,7 @@
             <description>en-entity1ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method3-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity1ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -2414,7 +2414,7 @@
             <description>en-entity1ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method4-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity1ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -2422,7 +2422,7 @@
             <description>en-entity1ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method5-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity1ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -2436,7 +2436,7 @@
             <description>en-entity1ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction2Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -2454,7 +2454,7 @@
             <description>en-entity1ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction3Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -2472,7 +2472,7 @@
             <description>en-entity1ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction4Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -2490,7 +2490,7 @@
             <description>en-entity1ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction5Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -2508,7 +2508,7 @@
             <description>en-entity1ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction6Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -2527,7 +2527,7 @@
             <description>en-entity2ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -2539,7 +2539,7 @@
             <description>en-entity2ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method2-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity2ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -2547,7 +2547,7 @@
             <description>en-entity2ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method3-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity2ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -2555,7 +2555,7 @@
             <description>en-entity2ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method4-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity2ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -2563,7 +2563,7 @@
             <description>en-entity2ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method5-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity2ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -2577,7 +2577,7 @@
             <description>en-entity2ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction2Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -2595,7 +2595,7 @@
             <description>en-entity2ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction3Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -2613,7 +2613,7 @@
             <description>en-entity2ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction4Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -2631,7 +2631,7 @@
             <description>en-entity2ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction5Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -2649,7 +2649,7 @@
             <description>en-entity2ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction6Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -2668,7 +2668,7 @@
             <description>en-mdb1ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -2680,7 +2680,7 @@
             <description>en-mdb1ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method2-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb1ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -2688,7 +2688,7 @@
             <description>en-mdb1ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method3-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb1ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -2696,7 +2696,7 @@
             <description>en-mdb1ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method4-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb1ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -2704,7 +2704,7 @@
             <description>en-mdb1ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method5-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb1ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -2718,7 +2718,7 @@
             <description>en-mdb1ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction2Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -2736,7 +2736,7 @@
             <description>en-mdb1ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction3Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -2754,7 +2754,7 @@
             <description>en-mdb1ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction4Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -2772,7 +2772,7 @@
             <description>en-mdb1ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction5Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -2790,7 +2790,7 @@
             <description>en-mdb1ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction6Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -2809,7 +2809,7 @@
             <description>en-mdb2ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -2821,7 +2821,7 @@
             <description>en-mdb2ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method2-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb2ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -2829,7 +2829,7 @@
             <description>en-mdb2ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method3-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb2ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -2837,7 +2837,7 @@
             <description>en-mdb2ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method4-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb2ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -2845,7 +2845,7 @@
             <description>en-mdb2ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method5-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb2ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -2859,7 +2859,7 @@
             <description>en-mdb2ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction2Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -2877,7 +2877,7 @@
             <description>en-mdb2ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction3Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -2895,7 +2895,7 @@
             <description>en-mdb2ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction4Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -2913,7 +2913,7 @@
             <description>en-mdb2ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction5Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -2931,7 +2931,7 @@
             <description>en-mdb2ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction6Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -3038,7 +3038,7 @@
             <description>en-session1ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -3050,7 +3050,7 @@
             <description>en-session1ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod2-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session1ExcludeListMethod2MethodName</method-name>
          </method>
@@ -3058,7 +3058,7 @@
             <description>en-session1ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod3-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session1ExcludeListMethod3MethodName</method-name>
          </method>
@@ -3066,7 +3066,7 @@
             <description>en-session1ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod4-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session1ExcludeListMethod4MethodName</method-name>
          </method>
@@ -3074,7 +3074,7 @@
             <description>en-session1ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod5-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session1ExcludeListMethod5MethodName</method-name>
          </method>
@@ -3083,7 +3083,7 @@
             <description>en-session2ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -3095,7 +3095,7 @@
             <description>en-session2ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod2-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session2ExcludeListMethod2MethodName</method-name>
          </method>
@@ -3103,7 +3103,7 @@
             <description>en-session2ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod3-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session2ExcludeListMethod3MethodName</method-name>
          </method>
@@ -3111,7 +3111,7 @@
             <description>en-session2ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod4-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session2ExcludeListMethod4MethodName</method-name>
          </method>
@@ -3119,7 +3119,7 @@
             <description>en-session2ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod5-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session2ExcludeListMethod5MethodName</method-name>
          </method>
@@ -3128,7 +3128,7 @@
             <description>en-entity1ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -3140,7 +3140,7 @@
             <description>en-entity1ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod2-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity1ExcludeListMethod2MethodName</method-name>
          </method>
@@ -3148,7 +3148,7 @@
             <description>en-entity1ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod3-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity1ExcludeListMethod3MethodName</method-name>
          </method>
@@ -3156,7 +3156,7 @@
             <description>en-entity1ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod4-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity1ExcludeListMethod4MethodName</method-name>
          </method>
@@ -3164,7 +3164,7 @@
             <description>en-entity1ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod5-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity1ExcludeListMethod5MethodName</method-name>
          </method>
@@ -3173,7 +3173,7 @@
             <description>en-entity2ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -3185,7 +3185,7 @@
             <description>en-entity2ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod2-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity2ExcludeListMethod2MethodName</method-name>
          </method>
@@ -3193,7 +3193,7 @@
             <description>en-entity2ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod3-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity2ExcludeListMethod3MethodName</method-name>
          </method>
@@ -3201,7 +3201,7 @@
             <description>en-entity2ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod4-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity2ExcludeListMethod4MethodName</method-name>
          </method>
@@ -3209,7 +3209,7 @@
             <description>en-entity2ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod5-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity2ExcludeListMethod5MethodName</method-name>
          </method>
@@ -3218,7 +3218,7 @@
             <description>en-mdb1ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -3230,7 +3230,7 @@
             <description>en-mdb1ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod2-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb1ExcludeListMethod2MethodName</method-name>
          </method>
@@ -3238,7 +3238,7 @@
             <description>en-mdb1ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod3-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb1ExcludeListMethod3MethodName</method-name>
          </method>
@@ -3246,7 +3246,7 @@
             <description>en-mdb1ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod4-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb1ExcludeListMethod4MethodName</method-name>
          </method>
@@ -3254,7 +3254,7 @@
             <description>en-mdb1ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod5-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb1ExcludeListMethod5MethodName</method-name>
          </method>
@@ -3263,7 +3263,7 @@
             <description>en-mdb2ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -3275,7 +3275,7 @@
             <description>en-mdb2ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod2-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb2ExcludeListMethod2MethodName</method-name>
          </method>
@@ -3283,7 +3283,7 @@
             <description>en-mdb2ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod3-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb2ExcludeListMethod3MethodName</method-name>
          </method>
@@ -3291,7 +3291,7 @@
             <description>en-mdb2ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod4-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb2ExcludeListMethod4MethodName</method-name>
          </method>
@@ -3299,7 +3299,7 @@
             <description>en-mdb2ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod5-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb2ExcludeListMethod5MethodName</method-name>
          </method>

Modified: jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3xEverything_testEverything.xml
===================================================================
--- jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3xEverything_testEverything.xml	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/EjbJar3xEverything_testEverything.xml	2007-08-13 10:48:08 UTC (rev 2483)
@@ -29,7 +29,7 @@
    <enterprise-beans id="enterprise-beans-id">
 
       <session>
-         <ejb-name>session0</ejb-name>
+         <ejb-name>session0EjbName</ejb-name>
       </session>
 
       <session id="session1-id">
@@ -53,7 +53,7 @@
             <large-icon>de-session1-large-icon</large-icon>
          </icon>
 
-         <ejb-name>session1</ejb-name>
+         <ejb-name>session1EjbName</ejb-name>
 
          <mapped-name>session1-mapped-name</mapped-name>
          <home>session1Home</home>
@@ -517,7 +517,7 @@
             <large-icon>de-session2-large-icon</large-icon>
          </icon>
 
-         <ejb-name>session2</ejb-name>
+         <ejb-name>session2EjbName</ejb-name>
 
          <mapped-name>session2-mapped-name</mapped-name>
          <home>session2Home</home>
@@ -961,22 +961,22 @@
       </session>
 
       <session>
-         <ejb-name>session3</ejb-name>
+         <ejb-name>session3EjbName</ejb-name>
          <session-type>Stateful</session-type>
       </session>
 
       <session>
-         <ejb-name>session4</ejb-name>
+         <ejb-name>session4EjbName</ejb-name>
          <transaction-type>Bean</transaction-type>
       </session>
 
       <session>
-         <ejb-name>session5</ejb-name>
+         <ejb-name>session5EjbName</ejb-name>
          <security-identity/>
       </session>
 
       <entity>
-         <ejb-name>entity0</ejb-name>
+         <ejb-name>entity0EjbName</ejb-name>
       </entity>
 
       <entity id="entity1-id">
@@ -1000,7 +1000,7 @@
             <large-icon>de-entity1-large-icon</large-icon>
          </icon>
 
-         <ejb-name>entity1</ejb-name>
+         <ejb-name>entity1EjbName</ejb-name>
 
          <mapped-name>entity1-mapped-name</mapped-name>
          <home>entity1Home</home>
@@ -1429,7 +1429,7 @@
             <large-icon>de-entity2-large-icon</large-icon>
          </icon>
 
-         <ejb-name>entity2</ejb-name>
+         <ejb-name>entity2EjbName</ejb-name>
 
          <mapped-name>entity2-mapped-name</mapped-name>
          <home>entity2Home</home>
@@ -1838,13 +1838,13 @@
       </entity>
 
       <entity>
-         <ejb-name>entity3</ejb-name>
+         <ejb-name>entity3EjbName</ejb-name>
          <ejb-class>entity3Class</ejb-class>
          <persistence-type>Bean</persistence-type>
       </entity>
 
       <entity>
-         <ejb-name>entity4</ejb-name>
+         <ejb-name>entity4EjbName</ejb-name>
          <ejb-class>entity4Class</ejb-class>
          <persistence-type>Container</persistence-type>
          <prim-key-class>java.lang.Object</prim-key-class>
@@ -1852,7 +1852,7 @@
       </entity>
 
       <entity>
-         <ejb-name>entity5</ejb-name>
+         <ejb-name>entity5EjbName</ejb-name>
          <ejb-class>entity5Class</ejb-class>
          <persistence-type>Container</persistence-type>
          <prim-key-class>java.lang.Object</prim-key-class>
@@ -1861,7 +1861,7 @@
       </entity>
 
       <message-driven>
-         <ejb-name>mdb0</ejb-name>
+         <ejb-name>mdb0EjbName</ejb-name>
       </message-driven>
 
       <message-driven id="mdb1-id">
@@ -1885,7 +1885,7 @@
             <large-icon>de-mdb1-large-icon</large-icon>
          </icon>
 
-         <ejb-name>mdb1</ejb-name>
+         <ejb-name>mdb1EjbName</ejb-name>
 
          <mapped-name>mdb1-mapped-name</mapped-name>
          <ejb-class>mdb1EjbClass</ejb-class>
@@ -2290,7 +2290,7 @@
             <large-icon>de-mdb2-large-icon</large-icon>
          </icon>
 
-         <ejb-name>mdb2</ejb-name>
+         <ejb-name>mdb2EjbName</ejb-name>
 
          <mapped-name>mdb2-mapped-name</mapped-name>
          <ejb-class>mdb2EjbClass</ejb-class>
@@ -3432,7 +3432,7 @@
                <description>en-relation1Role1RoleSource-desc</description>
                <description xml:lang="fr">fr-relation1Role1RoleSource-desc</description>
                <description xml:lang="de">de-relation1Role1RoleSource-desc</description>
-               <ejb-name>relation1Role1RoleSourceName</ejb-name>
+               <ejb-name>relation1Role1RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation1Role1CmrField-id">
                <description>en-relation1Role1CmrField-desc</description>
@@ -3453,7 +3453,7 @@
                <description>en-relation1Role2RoleSource-desc</description>
                <description xml:lang="fr">fr-relation1Role2RoleSource-desc</description>
                <description xml:lang="de">de-relation1Role2RoleSource-desc</description>
-               <ejb-name>relation1Role2RoleSourceName</ejb-name>
+               <ejb-name>relation1Role2RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation1Role2CmrField-id">
                <description>en-relation1Role2CmrField-desc</description>
@@ -3480,7 +3480,7 @@
                <description>en-relation2Role1RoleSource-desc</description>
                <description xml:lang="fr">fr-relation2Role1RoleSource-desc</description>
                <description xml:lang="de">de-relation2Role1RoleSource-desc</description>
-               <ejb-name>relation2Role1RoleSourceName</ejb-name>
+               <ejb-name>relation2Role1RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation2Role1CmrField-id">
                <description>en-relation2Role1CmrField-desc</description>
@@ -3501,7 +3501,7 @@
                <description>en-relation2Role2RoleSource-desc</description>
                <description xml:lang="fr">fr-relation2Role2RoleSource-desc</description>
                <description xml:lang="de">de-relation2Role2RoleSource-desc</description>
-               <ejb-name>relation2Role2RoleSourceName</ejb-name>
+               <ejb-name>relation2Role2RoleSourceNameEjbName</ejb-name>
             </relationship-role-source>
             <cmr-field id="relation2Role2CmrField-id">
                <description>en-relation2Role2CmrField-desc</description>
@@ -3627,7 +3627,7 @@
             <description>en-session1MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -3639,7 +3639,7 @@
             <description>en-session1MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method2-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session1MethodPermission1Method2MethodName</method-name>
          </method>
@@ -3647,7 +3647,7 @@
             <description>en-session1MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method3-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session1MethodPermission1Method3MethodName</method-name>
          </method>
@@ -3655,7 +3655,7 @@
             <description>en-session1MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method4-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session1MethodPermission1Method4MethodName</method-name>
          </method>
@@ -3663,7 +3663,7 @@
             <description>en-session1MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-session1MethodPermission1Method5-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session1MethodPermission1Method5MethodName</method-name>
          </method>
@@ -3678,7 +3678,7 @@
             <description>en-session1MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-session1MethodPermission2Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -3697,7 +3697,7 @@
             <description>en-session1MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-session1MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-session1MethodPermission3Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -3716,7 +3716,7 @@
             <description>en-session2MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -3728,7 +3728,7 @@
             <description>en-session2MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method2-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session2MethodPermission1Method2MethodName</method-name>
          </method>
@@ -3736,7 +3736,7 @@
             <description>en-session2MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method3-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session2MethodPermission1Method3MethodName</method-name>
          </method>
@@ -3744,7 +3744,7 @@
             <description>en-session2MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method4-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session2MethodPermission1Method4MethodName</method-name>
          </method>
@@ -3752,7 +3752,7 @@
             <description>en-session2MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-session2MethodPermission1Method5-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session2MethodPermission1Method5MethodName</method-name>
          </method>
@@ -3767,7 +3767,7 @@
             <description>en-session2MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-session2MethodPermission2Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -3786,7 +3786,7 @@
             <description>en-session2MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-session2MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-session2MethodPermission3Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -3805,7 +3805,7 @@
             <description>en-entity1MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -3817,7 +3817,7 @@
             <description>en-entity1MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method2-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity1MethodPermission1Method2MethodName</method-name>
          </method>
@@ -3825,7 +3825,7 @@
             <description>en-entity1MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method3-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity1MethodPermission1Method3MethodName</method-name>
          </method>
@@ -3833,7 +3833,7 @@
             <description>en-entity1MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method4-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity1MethodPermission1Method4MethodName</method-name>
          </method>
@@ -3841,7 +3841,7 @@
             <description>en-entity1MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-entity1MethodPermission1Method5-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity1MethodPermission1Method5MethodName</method-name>
          </method>
@@ -3856,7 +3856,7 @@
             <description>en-entity1MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-entity1MethodPermission2Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -3875,7 +3875,7 @@
             <description>en-entity1MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-entity1MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-entity1MethodPermission3Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -3894,7 +3894,7 @@
             <description>en-entity2MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -3906,7 +3906,7 @@
             <description>en-entity2MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method2-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity2MethodPermission1Method2MethodName</method-name>
          </method>
@@ -3914,7 +3914,7 @@
             <description>en-entity2MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method3-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity2MethodPermission1Method3MethodName</method-name>
          </method>
@@ -3922,7 +3922,7 @@
             <description>en-entity2MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method4-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity2MethodPermission1Method4MethodName</method-name>
          </method>
@@ -3930,7 +3930,7 @@
             <description>en-entity2MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-entity2MethodPermission1Method5-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity2MethodPermission1Method5MethodName</method-name>
          </method>
@@ -3945,7 +3945,7 @@
             <description>en-entity2MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-entity2MethodPermission2Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -3964,7 +3964,7 @@
             <description>en-entity2MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-entity2MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-entity2MethodPermission3Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -3983,7 +3983,7 @@
             <description>en-mdb1MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -3995,7 +3995,7 @@
             <description>en-mdb1MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method2-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb1MethodPermission1Method2MethodName</method-name>
          </method>
@@ -4003,7 +4003,7 @@
             <description>en-mdb1MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method3-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb1MethodPermission1Method3MethodName</method-name>
          </method>
@@ -4011,7 +4011,7 @@
             <description>en-mdb1MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method4-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb1MethodPermission1Method4MethodName</method-name>
          </method>
@@ -4019,7 +4019,7 @@
             <description>en-mdb1MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission1Method5-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb1MethodPermission1Method5MethodName</method-name>
          </method>
@@ -4034,7 +4034,7 @@
             <description>en-mdb1MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission2Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -4053,7 +4053,7 @@
             <description>en-mdb1MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-mdb1MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-mdb1MethodPermission3Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -4072,7 +4072,7 @@
             <description>en-mdb2MethodPermission1Method1-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method1-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2MethodPermission1Method1MethodName</method-name>
             <method-params>
@@ -4084,7 +4084,7 @@
             <description>en-mdb2MethodPermission1Method2-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method2-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method2-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb2MethodPermission1Method2MethodName</method-name>
          </method>
@@ -4092,7 +4092,7 @@
             <description>en-mdb2MethodPermission1Method3-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method3-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method3-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb2MethodPermission1Method3MethodName</method-name>
          </method>
@@ -4100,7 +4100,7 @@
             <description>en-mdb2MethodPermission1Method4-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method4-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method4-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb2MethodPermission1Method4MethodName</method-name>
          </method>
@@ -4108,7 +4108,7 @@
             <description>en-mdb2MethodPermission1Method5-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission1Method5-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission1Method5-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb2MethodPermission1Method5MethodName</method-name>
          </method>
@@ -4123,7 +4123,7 @@
             <description>en-mdb2MethodPermission2Method1-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission2Method1-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission2Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2MethodPermission2Method1MethodName</method-name>
             <method-params>
@@ -4142,7 +4142,7 @@
             <description>en-mdb2MethodPermission3Method1-desc</description>
             <description xml:lang="fr">fr-mdb2MethodPermission3Method1-desc</description>
             <description xml:lang="de">de-mdb2MethodPermission3Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2MethodPermission3Method1MethodName</method-name>
             <method-params>
@@ -4301,7 +4301,7 @@
             <description>en-session1ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -4313,7 +4313,7 @@
             <description>en-session1ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method2-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session1ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -4321,7 +4321,7 @@
             <description>en-session1ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method3-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session1ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -4329,7 +4329,7 @@
             <description>en-session1ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method4-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session1ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -4337,7 +4337,7 @@
             <description>en-session1ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction1Method5-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session1ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -4351,7 +4351,7 @@
             <description>en-session1ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction2Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -4369,7 +4369,7 @@
             <description>en-session1ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction3Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -4387,7 +4387,7 @@
             <description>en-session1ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction4Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -4405,7 +4405,7 @@
             <description>en-session1ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction5Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -4423,7 +4423,7 @@
             <description>en-session1ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-session1ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-session1ContainerTransaction6Method1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -4442,7 +4442,7 @@
             <description>en-session2ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -4454,7 +4454,7 @@
             <description>en-session2ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method2-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session2ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -4462,7 +4462,7 @@
             <description>en-session2ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method3-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session2ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -4470,7 +4470,7 @@
             <description>en-session2ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method4-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session2ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -4478,7 +4478,7 @@
             <description>en-session2ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction1Method5-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session2ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -4492,7 +4492,7 @@
             <description>en-session2ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction2Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -4510,7 +4510,7 @@
             <description>en-session2ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction3Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -4528,7 +4528,7 @@
             <description>en-session2ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction4Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -4546,7 +4546,7 @@
             <description>en-session2ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction5Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -4564,7 +4564,7 @@
             <description>en-session2ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-session2ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-session2ContainerTransaction6Method1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -4583,7 +4583,7 @@
             <description>en-entity1ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -4595,7 +4595,7 @@
             <description>en-entity1ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method2-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity1ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -4603,7 +4603,7 @@
             <description>en-entity1ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method3-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity1ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -4611,7 +4611,7 @@
             <description>en-entity1ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method4-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity1ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -4619,7 +4619,7 @@
             <description>en-entity1ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction1Method5-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity1ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -4633,7 +4633,7 @@
             <description>en-entity1ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction2Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -4651,7 +4651,7 @@
             <description>en-entity1ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction3Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -4669,7 +4669,7 @@
             <description>en-entity1ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction4Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -4687,7 +4687,7 @@
             <description>en-entity1ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction5Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -4705,7 +4705,7 @@
             <description>en-entity1ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-entity1ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-entity1ContainerTransaction6Method1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -4724,7 +4724,7 @@
             <description>en-entity2ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -4736,7 +4736,7 @@
             <description>en-entity2ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method2-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity2ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -4744,7 +4744,7 @@
             <description>en-entity2ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method3-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity2ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -4752,7 +4752,7 @@
             <description>en-entity2ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method4-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity2ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -4760,7 +4760,7 @@
             <description>en-entity2ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction1Method5-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity2ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -4774,7 +4774,7 @@
             <description>en-entity2ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction2Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -4792,7 +4792,7 @@
             <description>en-entity2ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction3Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -4810,7 +4810,7 @@
             <description>en-entity2ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction4Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -4828,7 +4828,7 @@
             <description>en-entity2ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction5Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -4846,7 +4846,7 @@
             <description>en-entity2ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-entity2ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-entity2ContainerTransaction6Method1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -4865,7 +4865,7 @@
             <description>en-mdb1ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -4877,7 +4877,7 @@
             <description>en-mdb1ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method2-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb1ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -4885,7 +4885,7 @@
             <description>en-mdb1ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method3-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb1ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -4893,7 +4893,7 @@
             <description>en-mdb1ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method4-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb1ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -4901,7 +4901,7 @@
             <description>en-mdb1ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction1Method5-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb1ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -4915,7 +4915,7 @@
             <description>en-mdb1ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction2Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -4933,7 +4933,7 @@
             <description>en-mdb1ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction3Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -4951,7 +4951,7 @@
             <description>en-mdb1ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction4Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -4969,7 +4969,7 @@
             <description>en-mdb1ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction5Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -4987,7 +4987,7 @@
             <description>en-mdb1ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-mdb1ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-mdb1ContainerTransaction6Method1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -5006,7 +5006,7 @@
             <description>en-mdb2ContainerTransaction1Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction1Method1MethodName</method-name>
             <method-params>
@@ -5018,7 +5018,7 @@
             <description>en-mdb2ContainerTransaction1Method2-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method2-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method2-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb2ContainerTransaction1Method2MethodName</method-name>
          </method>
@@ -5026,7 +5026,7 @@
             <description>en-mdb2ContainerTransaction1Method3-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method3-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method3-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb2ContainerTransaction1Method3MethodName</method-name>
          </method>
@@ -5034,7 +5034,7 @@
             <description>en-mdb2ContainerTransaction1Method4-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method4-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method4-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb2ContainerTransaction1Method4MethodName</method-name>
          </method>
@@ -5042,7 +5042,7 @@
             <description>en-mdb2ContainerTransaction1Method5-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction1Method5-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction1Method5-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb2ContainerTransaction1Method5MethodName</method-name>
          </method>
@@ -5056,7 +5056,7 @@
             <description>en-mdb2ContainerTransaction2Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction2Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction2Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction2Method1MethodName</method-name>
             <method-params>
@@ -5074,7 +5074,7 @@
             <description>en-mdb2ContainerTransaction3Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction3Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction3Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction3Method1MethodName</method-name>
             <method-params>
@@ -5092,7 +5092,7 @@
             <description>en-mdb2ContainerTransaction4Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction4Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction4Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction4Method1MethodName</method-name>
             <method-params>
@@ -5110,7 +5110,7 @@
             <description>en-mdb2ContainerTransaction5Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction5Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction5Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction5Method1MethodName</method-name>
             <method-params>
@@ -5128,7 +5128,7 @@
             <description>en-mdb2ContainerTransaction6Method1-desc</description>
             <description xml:lang="fr">fr-mdb2ContainerTransaction6Method1-desc</description>
             <description xml:lang="de">de-mdb2ContainerTransaction6Method1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ContainerTransaction6Method1MethodName</method-name>
             <method-params>
@@ -5274,7 +5274,7 @@
             <description>en-session1ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod1-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session1ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -5286,7 +5286,7 @@
             <description>en-session1ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod2-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session1ExcludeListMethod2MethodName</method-name>
          </method>
@@ -5294,7 +5294,7 @@
             <description>en-session1ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod3-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session1ExcludeListMethod3MethodName</method-name>
          </method>
@@ -5302,7 +5302,7 @@
             <description>en-session1ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod4-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session1ExcludeListMethod4MethodName</method-name>
          </method>
@@ -5310,7 +5310,7 @@
             <description>en-session1ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-session1ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-session1ExcludeListMethod5-desc</description>
-            <ejb-name>session1</ejb-name>
+            <ejb-name>session1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session1ExcludeListMethod5MethodName</method-name>
          </method>
@@ -5319,7 +5319,7 @@
             <description>en-session2ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod1-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>session2ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -5331,7 +5331,7 @@
             <description>en-session2ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod2-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>session2ExcludeListMethod2MethodName</method-name>
          </method>
@@ -5339,7 +5339,7 @@
             <description>en-session2ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod3-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>session2ExcludeListMethod3MethodName</method-name>
          </method>
@@ -5347,7 +5347,7 @@
             <description>en-session2ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod4-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>session2ExcludeListMethod4MethodName</method-name>
          </method>
@@ -5355,7 +5355,7 @@
             <description>en-session2ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-session2ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-session2ExcludeListMethod5-desc</description>
-            <ejb-name>session2</ejb-name>
+            <ejb-name>session2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>session2ExcludeListMethod5MethodName</method-name>
          </method>
@@ -5364,7 +5364,7 @@
             <description>en-entity1ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod1-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity1ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -5376,7 +5376,7 @@
             <description>en-entity1ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod2-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity1ExcludeListMethod2MethodName</method-name>
          </method>
@@ -5384,7 +5384,7 @@
             <description>en-entity1ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod3-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity1ExcludeListMethod3MethodName</method-name>
          </method>
@@ -5392,7 +5392,7 @@
             <description>en-entity1ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod4-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity1ExcludeListMethod4MethodName</method-name>
          </method>
@@ -5400,7 +5400,7 @@
             <description>en-entity1ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-entity1ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-entity1ExcludeListMethod5-desc</description>
-            <ejb-name>entity1</ejb-name>
+            <ejb-name>entity1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity1ExcludeListMethod5MethodName</method-name>
          </method>
@@ -5409,7 +5409,7 @@
             <description>en-entity2ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod1-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>entity2ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -5421,7 +5421,7 @@
             <description>en-entity2ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod2-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>entity2ExcludeListMethod2MethodName</method-name>
          </method>
@@ -5429,7 +5429,7 @@
             <description>en-entity2ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod3-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>entity2ExcludeListMethod3MethodName</method-name>
          </method>
@@ -5437,7 +5437,7 @@
             <description>en-entity2ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod4-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>entity2ExcludeListMethod4MethodName</method-name>
          </method>
@@ -5445,7 +5445,7 @@
             <description>en-entity2ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-entity2ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-entity2ExcludeListMethod5-desc</description>
-            <ejb-name>entity2</ejb-name>
+            <ejb-name>entity2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>entity2ExcludeListMethod5MethodName</method-name>
          </method>
@@ -5454,7 +5454,7 @@
             <description>en-mdb1ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod1-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb1ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -5466,7 +5466,7 @@
             <description>en-mdb1ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod2-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb1ExcludeListMethod2MethodName</method-name>
          </method>
@@ -5474,7 +5474,7 @@
             <description>en-mdb1ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod3-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb1ExcludeListMethod3MethodName</method-name>
          </method>
@@ -5482,7 +5482,7 @@
             <description>en-mdb1ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod4-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb1ExcludeListMethod4MethodName</method-name>
          </method>
@@ -5490,7 +5490,7 @@
             <description>en-mdb1ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-mdb1ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-mdb1ExcludeListMethod5-desc</description>
-            <ejb-name>mdb1</ejb-name>
+            <ejb-name>mdb1EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb1ExcludeListMethod5MethodName</method-name>
          </method>
@@ -5499,7 +5499,7 @@
             <description>en-mdb2ExcludeListMethod1-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod1-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod1-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Home</method-intf>
             <method-name>mdb2ExcludeListMethod1MethodName</method-name>
             <method-params>
@@ -5511,7 +5511,7 @@
             <description>en-mdb2ExcludeListMethod2-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod2-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod2-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Remote</method-intf>
             <method-name>mdb2ExcludeListMethod2MethodName</method-name>
          </method>
@@ -5519,7 +5519,7 @@
             <description>en-mdb2ExcludeListMethod3-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod3-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod3-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>LocalHome</method-intf>
             <method-name>mdb2ExcludeListMethod3MethodName</method-name>
          </method>
@@ -5527,7 +5527,7 @@
             <description>en-mdb2ExcludeListMethod4-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod4-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod4-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>Local</method-intf>
             <method-name>mdb2ExcludeListMethod4MethodName</method-name>
          </method>
@@ -5535,7 +5535,7 @@
             <description>en-mdb2ExcludeListMethod5-desc</description>
             <description xml:lang="fr">fr-mdb2ExcludeListMethod5-desc</description>
             <description xml:lang="de">de-mdb2ExcludeListMethod5-desc</description>
-            <ejb-name>mdb2</ejb-name>
+            <ejb-name>mdb2EjbName</ejb-name>
             <method-intf>ServiceEndpoint</method-intf>
             <method-name>mdb2ExcludeListMethod5MethodName</method-name>
          </method>

Modified: jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml
===================================================================
--- jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml	2007-08-10 16:09:11 UTC (rev 2482)
+++ jbossxb-builder/trunk/src/test/resources/org/jboss/test/ejb/metadata/test/JBoss5xEverything_testEverything.xml	2007-08-13 10:48:08 UTC (rev 2483)
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<jboss xmlns="http://java.sun.com/xml/ns/javaee"
+<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://java.sun.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>
+   <jee:description>en-jboss-desc</jee:description>
+   <jee:description xml:lang="fr">fr-jboss-desc</jee:description>
+   <jee:description xml:lang="de">de-jboss-desc</jee:description>
+   <jee:display-name>en-jboss-disp</jee:display-name>
+   <jee:display-name xml:lang="fr">fr-jboss-disp</jee:display-name>
+   <jee:display-name xml:lang="de">de-jboss-disp</jee:display-name>
+   <jee:icon id="en-jboss-icon-id">
+      <jee:small-icon>en-jboss-small-icon</jee:small-icon>
+      <jee:large-icon>en-jboss-large-icon</jee:large-icon>
+   </jee:icon>
+   <jee:icon xml:lang="fr" id="fr-jboss-icon-id">
+      <jee:small-icon>fr-jboss-small-icon</jee:small-icon>
+      <jee:large-icon>fr-jboss-large-icon</jee:large-icon>
+   </jee:icon>
+   <jee:icon xml:lang="de" id="de-jboss-icon-id">
+      <jee:small-icon>de-jboss-small-icon</jee:small-icon>
+      <jee:large-icon>de-jboss-large-icon</jee:large-icon>
+   </jee:icon>
    
    <loader-repository id="loaderRepository-id" loaderRepositoryClass="loaderRepositoryClass">
       loaderRepositoryName
@@ -65,31 +66,31 @@
       </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>
+         <jee:description>en-session1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-session1-desc</jee:description>
+         <jee:description xml:lang="de">de-session1-desc</jee:description>
+         <jee:display-name>en-session1-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-session1-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-session1-disp</jee:display-name>
+         <jee:icon id="en-session1-icon-id">
+            <jee:small-icon>en-session1-small-icon</jee:small-icon>
+            <jee:large-icon>en-session1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-session1-icon-id">
+            <jee:small-icon>fr-session1-small-icon</jee:small-icon>
+            <jee:large-icon>fr-session1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-session1-icon-id">
+            <jee:small-icon>de-session1-small-icon</jee:small-icon>
+            <jee:large-icon>de-session1-large-icon</jee:large-icon>
+         </jee: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>
+            <jee:description>en-session1RemoteBinding-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1RemoteBinding-desc</jee:description>
+            <jee:description xml:lang="de">de-session1RemoteBinding-desc</jee:description>
             <jndi-name>session1RemoteBindingJndiName</jndi-name>
             <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
             <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
@@ -104,23 +105,23 @@
          <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>
+            <jee:description>en-session1InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="de">de-session1InvokerBindings-desc</jee: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>
+               <jee:description>en-session1Invoker1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1Invoker1-desc</jee:description>
+               <jee:description xml:lang="de">de-session1Invoker1-desc</jee:description>
                
                <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>
+               <jee:description>en-session1Invoker2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1Invoker2-desc</jee:description>
+               <jee:description xml:lang="de">de-session1Invoker2-desc</jee:description>
                
                <invoker-proxy-binding-name>session1Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker2JndiName</jndi-name>
@@ -131,9 +132,9 @@
          <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>
+            <jee:description>en-session1EjbRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1EjbRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1EjbRef1-desc</jee:description>
 
             <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -148,9 +149,9 @@
             <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>
+            <jee:description>en-session1EjbRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1EjbRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1EjbRef2-desc</jee:description>
 
             <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -165,9 +166,9 @@
          </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>
+            <jee:description>en-session1EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1EjbLocalRef1-desc</jee:description>
 
             <ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -182,9 +183,9 @@
             <ignore-dependency/>
          </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>
+            <jee:description>en-session1EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1EjbLocalRef2-desc</jee:description>
 
             <ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -201,16 +202,16 @@
          <!-- TODO service-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>
+            <jee:description>en-session1SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-session1SecurityIdentity-desc</jee:description>
             <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>
+            <jee:description>en-session1ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1ResourceRef1-desc</jee:description>
             <res-ref-name>session1ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
@@ -224,9 +225,9 @@
             <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>
+            <jee:description>en-session1ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1ResourceRef2-desc</jee:description>
             <res-ref-name>session1ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
@@ -239,9 +240,9 @@
             <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>
+            <jee:description>en-session1ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1ResourceEnvRef1-desc</jee:description>
             <resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -255,9 +256,9 @@
             <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>
+            <jee:description>en-session1ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1ResourceEnvRef2-desc</jee:description>
             <resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -270,9 +271,9 @@
             <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>
+            <jee:description>en-session1MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1MessageDestinationRef1-desc</jee:description>
             <message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -286,9 +287,9 @@
             <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>
+            <jee:description>en-session1MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1MessageDestinationRef2-desc</jee:description>
             <message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -301,9 +302,9 @@
             <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>
+            <jee:description>en-session1MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="de">de-session1MessageDestinationRef3-desc</jee:description>
             <message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -319,9 +320,9 @@
          <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>
+            <jee:description>en-session1ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-session1ClusterConfig-desc</jee:description>
             <partition-name>session1ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>session1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>session1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -346,13 +347,13 @@
          <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>
+            <jee:description>en-session1IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-session1IorSecurityConfig-desc</jee: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>
+               <jee:description>en-session1TransportConfig-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1TransportConfig-desc</jee:description>
+               <jee:description xml:lang="de">de-session1TransportConfig-desc</jee:description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -361,17 +362,17 @@
                <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>
+               <jee:description>en-session1ASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1ASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-session1ASContext-desc</jee:description>
                <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>
+               <jee:description>en-session1SASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1SASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-session1SASContext-desc</jee:description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
@@ -379,16 +380,16 @@
          <!-- TODO 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>
+            <jee:description>en-session1EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-session1EjbTimeoutIdentity-desc</jee:description>
             <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>
+            <jee:description>en-session1Annotation1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1Annotation1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1Annotation1-desc</jee:description>
             
             <annotation-class>session1Annotation1Class</annotation-class>
             <annotation-implementation-class>session1Annotation1Impl</annotation-implementation-class>
@@ -397,24 +398,24 @@
                <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>
+               <jee:description>en-session1Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-session1Annotation1Property1-desc</jee: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>
+               <jee:description>en-session1Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-session1Annotation1Property2-desc</jee: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>
+            <jee:description>en-session1Annotation2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1Annotation2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1Annotation2-desc</jee:description>
             
             <annotation-class>session1Annotation2Class</annotation-class>
             <annotation-implementation-class>session1Annotation2Impl</annotation-implementation-class>
@@ -423,25 +424,25 @@
                <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>
+               <jee:description>en-session1Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-session1Annotation2Property1-desc</jee: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>
+               <jee:description>en-session1Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session1Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-session1Annotation2Property2-desc</jee: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>
+            <jee:description>en-session1IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="de">de-session1IgnoreDependency-desc</jee:description>
             <injection-target>
                <injection-target-class>session1IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>session1IgnoreDependencyInjection1Name</injection-target-name>
@@ -462,9 +463,9 @@
          
          <!-- 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>
+            <jee:description>en-session1JndiRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1JndiRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session1JndiRef1-desc</jee:description>
             <jndi-ref-name>session1JndiRef1Name</jndi-ref-name>
             <mapped-name>session1JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -477,9 +478,9 @@
             </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>
+            <jee:description>en-session1JndiRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session1JndiRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session1JndiRef2-desc</jee:description>
             <jndi-ref-name>session1JndiRef2Name</jndi-ref-name>
             <mapped-name>session1JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -495,31 +496,31 @@
       </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>
+         <jee:description>en-session2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-session2-desc</jee:description>
+         <jee:description xml:lang="de">de-session2-desc</jee:description>
+         <jee:display-name>en-session2-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-session2-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-session2-disp</jee:display-name>
+         <jee:icon id="en-session2-icon-id">
+            <jee:small-icon>en-session2-small-icon</jee:small-icon>
+            <jee:large-icon>en-session2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-session2-icon-id">
+            <jee:small-icon>fr-session2-small-icon</jee:small-icon>
+            <jee:large-icon>fr-session2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-session2-icon-id">
+            <jee:small-icon>de-session2-small-icon</jee:small-icon>
+            <jee:large-icon>de-session2-large-icon</jee:large-icon>
+         </jee: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>
+            <jee:description>en-session2RemoteBinding-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2RemoteBinding-desc</jee:description>
+            <jee:description xml:lang="de">de-session2RemoteBinding-desc</jee:description>
             <jndi-name>session2RemoteBindingJndiName</jndi-name>
             <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
             <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
@@ -534,23 +535,23 @@
          <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>
+            <jee:description>en-session2InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="de">de-session2InvokerBindings-desc</jee: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>
+               <jee:description>en-session2Invoker1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2Invoker1-desc</jee:description>
+               <jee:description xml:lang="de">de-session2Invoker1-desc</jee:description>
                
                <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>
+               <jee:description>en-session2Invoker2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2Invoker2-desc</jee:description>
+               <jee:description xml:lang="de">de-session2Invoker2-desc</jee:description>
                
                <invoker-proxy-binding-name>session2Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker2JndiName</jndi-name>
@@ -561,9 +562,9 @@
          <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>
+            <jee:description>en-session2EjbRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2EjbRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2EjbRef1-desc</jee:description>
 
             <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -578,9 +579,9 @@
             <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>
+            <jee:description>en-session2EjbRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2EjbRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2EjbRef2-desc</jee:description>
 
             <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -595,9 +596,9 @@
          </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>
+            <jee:description>en-session2EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2EjbLocalRef1-desc</jee:description>
 
             <ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -612,9 +613,9 @@
             <ignore-dependency/>
          </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>
+            <jee:description>en-session2EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2EjbLocalRef2-desc</jee:description>
 
             <ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -631,16 +632,16 @@
          <!-- TODO service-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>
+            <jee:description>en-session2SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-session2SecurityIdentity-desc</jee:description>
             <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>
+            <jee:description>en-session2ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2ResourceRef1-desc</jee:description>
             <res-ref-name>session2ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
@@ -654,9 +655,9 @@
             <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>
+            <jee:description>en-session2ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2ResourceRef2-desc</jee:description>
             <res-ref-name>session2ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
@@ -669,9 +670,9 @@
             <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>
+            <jee:description>en-session2ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2ResourceEnvRef1-desc</jee:description>
             <resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -685,9 +686,9 @@
             <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>
+            <jee:description>en-session2ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2ResourceEnvRef2-desc</jee:description>
             <resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -700,9 +701,9 @@
             <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>
+            <jee:description>en-session2MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2MessageDestinationRef1-desc</jee:description>
             <message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -716,9 +717,9 @@
             <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>
+            <jee:description>en-session2MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2MessageDestinationRef2-desc</jee:description>
             <message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -731,9 +732,9 @@
             <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>
+            <jee:description>en-session2MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="de">de-session2MessageDestinationRef3-desc</jee:description>
             <message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -749,9 +750,9 @@
          <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>
+            <jee:description>en-session2ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-session2ClusterConfig-desc</jee:description>
             <partition-name>session2ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>session2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>session2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -776,13 +777,13 @@
          <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>
+            <jee:description>en-session2IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-session2IorSecurityConfig-desc</jee: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>
+               <jee:description>en-session2TransportConfig-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2TransportConfig-desc</jee:description>
+               <jee:description xml:lang="de">de-session2TransportConfig-desc</jee:description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -791,17 +792,17 @@
                <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>
+               <jee:description>en-session2ASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2ASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-session2ASContext-desc</jee:description>
                <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>
+               <jee:description>en-session2SASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2SASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-session2SASContext-desc</jee:description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
@@ -809,16 +810,16 @@
          <!-- TODO 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>
+            <jee:description>en-session2EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-session2EjbTimeoutIdentity-desc</jee:description>
             <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>
+            <jee:description>en-session2Annotation1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2Annotation1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2Annotation1-desc</jee:description>
             
             <annotation-class>session2Annotation1Class</annotation-class>
             <annotation-implementation-class>session2Annotation1Impl</annotation-implementation-class>
@@ -827,24 +828,24 @@
                <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>
+               <jee:description>en-session2Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-session2Annotation1Property1-desc</jee: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>
+               <jee:description>en-session2Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-session2Annotation1Property2-desc</jee: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>
+            <jee:description>en-session2Annotation2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2Annotation2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2Annotation2-desc</jee:description>
             
             <annotation-class>session2Annotation2Class</annotation-class>
             <annotation-implementation-class>session2Annotation2Impl</annotation-implementation-class>
@@ -853,25 +854,25 @@
                <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>
+               <jee:description>en-session2Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-session2Annotation2Property1-desc</jee: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>
+               <jee:description>en-session2Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-session2Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-session2Annotation2Property2-desc</jee: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>
+            <jee:description>en-session2IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="de">de-session2IgnoreDependency-desc</jee:description>
             <injection-target>
                <injection-target-class>session2IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>session2IgnoreDependencyInjection1Name</injection-target-name>
@@ -891,9 +892,9 @@
          <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>
+            <jee:description>en-session2JndiRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2JndiRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-session2JndiRef1-desc</jee:description>
             <jndi-ref-name>session2JndiRef1Name</jndi-ref-name>
             <mapped-name>session2JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -906,9 +907,9 @@
             </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>
+            <jee:description>en-session2JndiRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-session2JndiRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-session2JndiRef2-desc</jee:description>
             <jndi-ref-name>session2JndiRef2Name</jndi-ref-name>
             <mapped-name>session2JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -928,24 +929,24 @@
       </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>
+         <jee:description>en-entity1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-entity1-desc</jee:description>
+         <jee:description xml:lang="de">de-entity1-desc</jee:description>
+         <jee:display-name>en-entity1-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-entity1-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-entity1-disp</jee:display-name>
+         <jee:icon id="en-entity1-icon-id">
+            <jee:small-icon>en-entity1-small-icon</jee:small-icon>
+            <jee:large-icon>en-entity1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-entity1-icon-id">
+            <jee:small-icon>fr-entity1-small-icon</jee:small-icon>
+            <jee:large-icon>fr-entity1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-entity1-icon-id">
+            <jee:small-icon>de-entity1-small-icon</jee:small-icon>
+            <jee:large-icon>de-entity1-large-icon</jee:large-icon>
+         </jee:icon>
 
          <ejb-name>entity1EjbName</ejb-name>
 
@@ -958,23 +959,23 @@
          <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>
+            <jee:description>en-entity1InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1InvokerBindings-desc</jee: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>
+               <jee:description>en-entity1Invoker1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1Invoker1-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1Invoker1-desc</jee:description>
                
                <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>
+               <jee:description>en-entity1Invoker2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1Invoker2-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1Invoker2-desc</jee:description>
                
                <invoker-proxy-binding-name>entity1Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker2JndiName</jndi-name>
@@ -985,9 +986,9 @@
          <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>
+            <jee:description>en-entity1EjbRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1EjbRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1EjbRef1-desc</jee:description>
 
             <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -1002,9 +1003,9 @@
             <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>
+            <jee:description>en-entity1EjbRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1EjbRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1EjbRef2-desc</jee:description>
 
             <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -1019,9 +1020,9 @@
          </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>
+            <jee:description>en-entity1EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1EjbLocalRef1-desc</jee:description>
 
             <ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -1036,9 +1037,9 @@
             <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>
+            <jee:description>en-entity1EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1EjbLocalRef2-desc</jee:description>
 
             <ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -1055,16 +1056,16 @@
          <!-- TODO service-ref -->
 
          <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>
+            <jee:description>en-entity1SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1SecurityIdentity-desc</jee:description>
             <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>
+            <jee:description>en-entity1ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1ResourceRef1-desc</jee:description>
             <res-ref-name>entity1ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
@@ -1078,9 +1079,9 @@
             <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>
+            <jee:description>en-entity1ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1ResourceRef2-desc</jee:description>
             <res-ref-name>entity1ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
@@ -1093,9 +1094,9 @@
             <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>
+            <jee:description>en-entity1ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1ResourceEnvRef1-desc</jee:description>
             <resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1109,9 +1110,9 @@
             <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>
+            <jee:description>en-entity1ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1ResourceEnvRef2-desc</jee:description>
             <resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1124,9 +1125,9 @@
             <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>
+            <jee:description>en-entity1MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1MessageDestinationRef1-desc</jee:description>
             <message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1140,9 +1141,9 @@
             <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>
+            <jee:description>en-entity1MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1MessageDestinationRef2-desc</jee:description>
             <message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1155,9 +1156,9 @@
             <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>
+            <jee:description>en-entity1MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1MessageDestinationRef3-desc</jee:description>
             <message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -1185,9 +1186,9 @@
          <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>
+            <jee:description>en-entity1ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1ClusterConfig-desc</jee:description>
             <partition-name>entity1ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>entity1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>entity1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -1197,9 +1198,9 @@
          
          <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>
+            <jee:description>en-entity1CacheInvalidationConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1CacheInvalidationConfig-desc</jee:description>
             <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1208,13 +1209,13 @@
          <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>
+            <jee:description>en-entity1IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1IorSecurityConfig-desc</jee: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>
+               <jee:description>en-entity1TransportConfig-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1TransportConfig-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1TransportConfig-desc</jee:description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1223,25 +1224,25 @@
                <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>
+               <jee:description>en-entity1ASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1ASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1ASContext-desc</jee: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>
+               <jee:description>en-entity1SASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1SASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1SASContext-desc</jee: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>
+            <jee:description>en-entity1Annotation1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1Annotation1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1Annotation1-desc</jee:description>
             
             <annotation-class>entity1Annotation1Class</annotation-class>
             <annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
@@ -1250,24 +1251,24 @@
                <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>
+               <jee:description>en-entity1Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1Annotation1Property1-desc</jee: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>
+               <jee:description>en-entity1Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1Annotation1Property2-desc</jee: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>
+            <jee:description>en-entity1Annotation2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1Annotation2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1Annotation2-desc</jee:description>
             
             <annotation-class>entity1Annotation2Class</annotation-class>
             <annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
@@ -1276,25 +1277,25 @@
                <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>
+               <jee:description>en-entity1Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1Annotation2Property1-desc</jee: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>
+               <jee:description>en-entity1Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity1Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-entity1Annotation2Property2-desc</jee: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>
+            <jee:description>en-entity1IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1IgnoreDependency-desc</jee:description>
             <injection-target>
                <injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
@@ -1312,9 +1313,9 @@
          <!-- 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>
+            <jee:description>en-entity1JndiRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1JndiRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1JndiRef1-desc</jee:description>
             <jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
             <mapped-name>entity1JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -1327,9 +1328,9 @@
             </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>
+            <jee:description>en-entity1JndiRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity1JndiRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity1JndiRef2-desc</jee:description>
             <jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
             <mapped-name>entity1JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -1345,24 +1346,24 @@
       </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>
+         <jee:description>en-entity2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-entity2-desc</jee:description>
+         <jee:description xml:lang="de">de-entity2-desc</jee:description>
+         <jee:display-name>en-entity2-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-entity2-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-entity2-disp</jee:display-name>
+         <jee:icon id="en-entity2-icon-id">
+            <jee:small-icon>en-entity2-small-icon</jee:small-icon>
+            <jee:large-icon>en-entity2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-entity2-icon-id">
+            <jee:small-icon>fr-entity2-small-icon</jee:small-icon>
+            <jee:large-icon>fr-entity2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-entity2-icon-id">
+            <jee:small-icon>de-entity2-small-icon</jee:small-icon>
+            <jee:large-icon>de-entity2-large-icon</jee:large-icon>
+         </jee:icon>
 
          <ejb-name>entity2EjbName</ejb-name>
 
@@ -1375,23 +1376,23 @@
          <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>
+            <jee:description>en-entity2InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2InvokerBindings-desc</jee: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>
+               <jee:description>en-entity2Invoker1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2Invoker1-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2Invoker1-desc</jee:description>
                
                <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>
+               <jee:description>en-entity2Invoker2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2Invoker2-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2Invoker2-desc</jee:description>
                
                <invoker-proxy-binding-name>entity2Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker2JndiName</jndi-name>
@@ -1402,9 +1403,9 @@
          <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>
+            <jee:description>en-entity2EjbRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2EjbRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2EjbRef1-desc</jee:description>
 
             <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -1419,9 +1420,9 @@
             <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>
+            <jee:description>en-entity2EjbRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2EjbRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2EjbRef2-desc</jee:description>
 
             <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -1436,9 +1437,9 @@
          </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>
+            <jee:description>en-entity2EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2EjbLocalRef1-desc</jee:description>
 
             <ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -1453,9 +1454,9 @@
             <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>
+            <jee:description>en-entity2EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2EjbLocalRef2-desc</jee:description>
 
             <ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -1472,16 +1473,16 @@
          <!-- TODO service-ref -->
 
          <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>
+            <jee:description>en-entity2SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2SecurityIdentity-desc</jee:description>
             <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>
+            <jee:description>en-entity2ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2ResourceRef1-desc</jee:description>
             <res-ref-name>entity2ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
@@ -1495,9 +1496,9 @@
             <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>
+            <jee:description>en-entity2ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2ResourceRef2-desc</jee:description>
             <res-ref-name>entity2ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
@@ -1510,9 +1511,9 @@
             <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>
+            <jee:description>en-entity2ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2ResourceEnvRef1-desc</jee:description>
             <resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1526,9 +1527,9 @@
             <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>
+            <jee:description>en-entity2ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2ResourceEnvRef2-desc</jee:description>
             <resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1541,9 +1542,9 @@
             <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>
+            <jee:description>en-entity2MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2MessageDestinationRef1-desc</jee:description>
             <message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1557,9 +1558,9 @@
             <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>
+            <jee:description>en-entity2MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2MessageDestinationRef2-desc</jee:description>
             <message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1572,9 +1573,9 @@
             <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>
+            <jee:description>en-entity2MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2MessageDestinationRef3-desc</jee:description>
             <message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -1602,9 +1603,9 @@
          <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>
+            <jee:description>en-entity2ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2ClusterConfig-desc</jee:description>
             <partition-name>entity2ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>entity2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>entity2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -1614,9 +1615,9 @@
 
          <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>
+            <jee:description>en-entity2CacheInvalidationConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2CacheInvalidationConfig-desc</jee:description>
             <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1625,13 +1626,13 @@
          <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>
+            <jee:description>en-entity2IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2IorSecurityConfig-desc</jee: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>
+               <jee:description>en-entity2TransportConfig-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2TransportConfig-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2TransportConfig-desc</jee:description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1640,25 +1641,25 @@
                <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>
+               <jee:description>en-entity2ASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2ASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2ASContext-desc</jee: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>
+               <jee:description>en-entity2SASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2SASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2SASContext-desc</jee: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>
+            <jee:description>en-entity2Annotation1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2Annotation1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2Annotation1-desc</jee:description>
             
             <annotation-class>entity2Annotation1Class</annotation-class>
             <annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
@@ -1667,24 +1668,24 @@
                <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>
+               <jee:description>en-entity2Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2Annotation1Property1-desc</jee: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>
+               <jee:description>en-entity2Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2Annotation1Property2-desc</jee: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>
+            <jee:description>en-entity2Annotation2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2Annotation2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2Annotation2-desc</jee:description>
             
             <annotation-class>entity2Annotation2Class</annotation-class>
             <annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
@@ -1693,25 +1694,25 @@
                <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>
+               <jee:description>en-entity2Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2Annotation2Property1-desc</jee: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>
+               <jee:description>en-entity2Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-entity2Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-entity2Annotation2Property2-desc</jee: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>
+            <jee:description>en-entity2IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2IgnoreDependency-desc</jee:description>
             <injection-target>
                <injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
@@ -1729,9 +1730,9 @@
          <!-- 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>
+            <jee:description>en-entity2JndiRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2JndiRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2JndiRef1-desc</jee:description>
             <jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
             <mapped-name>entity2JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -1744,9 +1745,9 @@
             </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>
+            <jee:description>en-entity2JndiRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-entity2JndiRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-entity2JndiRef2-desc</jee:description>
             <jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
             <mapped-name>entity2JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -1766,24 +1767,24 @@
       </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>
+         <jee:description>en-mdb1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-mdb1-desc</jee:description>
+         <jee:description xml:lang="de">de-mdb1-desc</jee:description>
+         <jee:display-name>en-mdb1-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-mdb1-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-mdb1-disp</jee:display-name>
+         <jee:icon id="en-mdb1-icon-id">
+            <jee:small-icon>en-mdb1-small-icon</jee:small-icon>
+            <jee:large-icon>en-mdb1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-mdb1-icon-id">
+            <jee:small-icon>fr-mdb1-small-icon</jee:small-icon>
+            <jee:large-icon>fr-mdb1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-mdb1-icon-id">
+            <jee:small-icon>de-mdb1-small-icon</jee:small-icon>
+            <jee:large-icon>de-mdb1-large-icon</jee:large-icon>
+         </jee:icon>
 
          <ejb-name>mdb1EjbName</ejb-name>
 
@@ -1799,23 +1800,23 @@
          <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>
+            <jee:description>en-mdb1InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1InvokerBindings-desc</jee: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>
+               <jee:description>en-mdb1Invoker1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1Invoker1-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1Invoker1-desc</jee:description>
                
                <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>
+               <jee:description>en-mdb1Invoker2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1Invoker2-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1Invoker2-desc</jee:description>
                
                <invoker-proxy-binding-name>mdb1Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker2JndiName</jndi-name>
@@ -1826,9 +1827,9 @@
          <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>
+            <jee:description>en-mdb1EjbRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1EjbRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1EjbRef1-desc</jee:description>
 
             <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -1843,9 +1844,9 @@
             <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>
+            <jee:description>en-mdb1EjbRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1EjbRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1EjbRef2-desc</jee:description>
 
             <ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -1860,9 +1861,9 @@
          </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>
+            <jee:description>en-mdb1EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1EjbLocalRef1-desc</jee:description>
 
             <ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -1877,9 +1878,9 @@
             <ignore-dependency/>
          </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>
+            <jee:description>en-mdb1EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1EjbLocalRef2-desc</jee:description>
 
             <ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -1896,16 +1897,16 @@
          <!-- TODO service-ref -->
 
          <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>
+            <jee:description>en-mdb1SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1SecurityIdentity-desc</jee:description>
             <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>
+            <jee:description>en-mdb1ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1ResourceRef1-desc</jee:description>
             <res-ref-name>mdb1ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
@@ -1919,9 +1920,9 @@
             <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>
+            <jee:description>en-mdb1ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1ResourceRef2-desc</jee:description>
             <res-ref-name>mdb1ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
@@ -1934,9 +1935,9 @@
             <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>
+            <jee:description>en-mdb1ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1ResourceEnvRef1-desc</jee:description>
             <resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1950,9 +1951,9 @@
             <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>
+            <jee:description>en-mdb1ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1ResourceEnvRef2-desc</jee:description>
             <resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1965,9 +1966,9 @@
             <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>
+            <jee:description>en-mdb1MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1MessageDestinationRef1-desc</jee:description>
             <message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1981,9 +1982,9 @@
             <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>
+            <jee:description>en-mdb1MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1MessageDestinationRef2-desc</jee:description>
             <message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1996,9 +1997,9 @@
             <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>
+            <jee:description>en-mdb1MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1MessageDestinationRef3-desc</jee:description>
             <message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -2027,13 +2028,13 @@
          <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>
+            <jee:description>en-mdb1IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1IorSecurityConfig-desc</jee: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>
+               <jee:description>en-mdb1TransportConfig-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1TransportConfig-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1TransportConfig-desc</jee:description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2042,32 +2043,32 @@
                <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>
+               <jee:description>en-mdb1ASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1ASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1ASContext-desc</jee:description>
                <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>
+               <jee:description>en-mdb1SASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1SASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1SASContext-desc</jee:description>
                <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>
+            <jee:description>en-mdb1EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</jee:description>
             <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>
+            <jee:description>en-mdb1Annotation1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1Annotation1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1Annotation1-desc</jee:description>
             
             <annotation-class>mdb1Annotation1Class</annotation-class>
             <annotation-implementation-class>mdb1Annotation1Impl</annotation-implementation-class>
@@ -2076,24 +2077,24 @@
                <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>
+               <jee:description>en-mdb1Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1Annotation1Property1-desc</jee: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>
+               <jee:description>en-mdb1Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1Annotation1Property2-desc</jee: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>
+            <jee:description>en-mdb1Annotation2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1Annotation2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1Annotation2-desc</jee:description>
             
             <annotation-class>mdb1Annotation2Class</annotation-class>
             <annotation-implementation-class>mdb1Annotation2Impl</annotation-implementation-class>
@@ -2102,25 +2103,25 @@
                <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>
+               <jee:description>en-mdb1Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1Annotation2Property1-desc</jee: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>
+               <jee:description>en-mdb1Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb1Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb1Annotation2Property2-desc</jee: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>
+            <jee:description>en-mdb1IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1IgnoreDependency-desc</jee:description>
             <injection-target>
                <injection-target-class>mdb1IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>mdb1IgnoreDependencyInjection1Name</injection-target-name>
@@ -2136,9 +2137,9 @@
          <!-- 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>
+            <jee:description>en-mdb1JndiRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1JndiRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1JndiRef1-desc</jee:description>
             <jndi-ref-name>mdb1JndiRef1Name</jndi-ref-name>
             <mapped-name>mdb1JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -2151,9 +2152,9 @@
             </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>
+            <jee:description>en-mdb1JndiRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb1JndiRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb1JndiRef2-desc</jee:description>
             <jndi-ref-name>mdb1JndiRef2Name</jndi-ref-name>
             <mapped-name>mdb1JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -2180,24 +2181,24 @@
       </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>
+         <jee:description>en-mdb2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-mdb2-desc</jee:description>
+         <jee:description xml:lang="de">de-mdb2-desc</jee:description>
+         <jee:display-name>en-mdb2-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-mdb2-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-mdb2-disp</jee:display-name>
+         <jee:icon id="en-mdb2-icon-id">
+            <jee:small-icon>en-mdb2-small-icon</jee:small-icon>
+            <jee:large-icon>en-mdb2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-mdb2-icon-id">
+            <jee:small-icon>fr-mdb2-small-icon</jee:small-icon>
+            <jee:large-icon>fr-mdb2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-mdb2-icon-id">
+            <jee:small-icon>de-mdb2-small-icon</jee:small-icon>
+            <jee:large-icon>de-mdb2-large-icon</jee:large-icon>
+         </jee:icon>
 
          <ejb-name>mdb2EjbName</ejb-name>
 
@@ -2213,23 +2214,23 @@
          <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>
+            <jee:description>en-mdb2InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2InvokerBindings-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2InvokerBindings-desc</jee: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>
+               <jee:description>en-mdb2Invoker1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2Invoker1-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2Invoker1-desc</jee:description>
                
                <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>
+               <jee:description>en-mdb2Invoker2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2Invoker2-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2Invoker2-desc</jee:description>
                
                <invoker-proxy-binding-name>mdb2Invoker2Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker2JndiName</jndi-name>
@@ -2240,9 +2241,9 @@
          <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>
+            <jee:description>en-mdb2EjbRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2EjbRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2EjbRef1-desc</jee:description>
 
             <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -2257,9 +2258,9 @@
             <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>
+            <jee:description>en-mdb2EjbRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2EjbRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2EjbRef2-desc</jee:description>
 
             <ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -2274,9 +2275,9 @@
          </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>
+            <jee:description>en-mdb2EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2EjbLocalRef1-desc</jee:description>
 
             <ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -2291,9 +2292,9 @@
             <ignore-dependency/>
          </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>
+            <jee:description>en-mdb2EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2EjbLocalRef2-desc</jee:description>
 
             <ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -2310,16 +2311,16 @@
          <!-- TODO service-ref -->
 
          <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>
+            <jee:description>en-mdb2SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2SecurityIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2SecurityIdentity-desc</jee:description>
             <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>
+            <jee:description>en-mdb2ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2ResourceRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2ResourceRef1-desc</jee:description>
             <res-ref-name>mdb2ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
@@ -2333,9 +2334,9 @@
             <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>
+            <jee:description>en-mdb2ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2ResourceRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2ResourceRef2-desc</jee:description>
             <res-ref-name>mdb2ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
@@ -2348,9 +2349,9 @@
             <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>
+            <jee:description>en-mdb2ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2ResourceEnvRef1-desc</jee:description>
             <resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -2364,9 +2365,9 @@
             <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>
+            <jee:description>en-mdb2ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2ResourceEnvRef2-desc</jee:description>
             <resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -2379,9 +2380,9 @@
             <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>
+            <jee:description>en-mdb2MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2MessageDestinationRef1-desc</jee:description>
             <message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -2395,9 +2396,9 @@
             <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>
+            <jee:description>en-mdb2MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2MessageDestinationRef2-desc</jee:description>
             <message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -2410,9 +2411,9 @@
             <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>
+            <jee:description>en-mdb2MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2MessageDestinationRef3-desc</jee:description>
             <message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -2441,13 +2442,13 @@
          <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>
+            <jee:description>en-mdb2IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2IorSecurityConfig-desc</jee: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>
+               <jee:description>en-mdb2TransportConfig-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2TransportConfig-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2TransportConfig-desc</jee:description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2456,32 +2457,32 @@
                <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>
+               <jee:description>en-mdb2ASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2ASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2ASContext-desc</jee:description>
                <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>
+               <jee:description>en-mdb2SASContext-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2SASContext-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2SASContext-desc</jee:description>
                <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>
+            <jee:description>en-mdb2EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</jee:description>
             <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>
+            <jee:description>en-mdb2Annotation1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2Annotation1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2Annotation1-desc</jee:description>
             
             <annotation-class>mdb2Annotation1Class</annotation-class>
             <annotation-implementation-class>mdb2Annotation1Impl</annotation-implementation-class>
@@ -2490,24 +2491,24 @@
                <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>
+               <jee:description>en-mdb2Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2Annotation1Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2Annotation1Property1-desc</jee: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>
+               <jee:description>en-mdb2Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2Annotation1Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2Annotation1Property2-desc</jee: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>
+            <jee:description>en-mdb2Annotation2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2Annotation2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2Annotation2-desc</jee:description>
             
             <annotation-class>mdb2Annotation2Class</annotation-class>
             <annotation-implementation-class>mdb2Annotation2Impl</annotation-implementation-class>
@@ -2516,25 +2517,25 @@
                <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>
+               <jee:description>en-mdb2Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2Annotation2Property1-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2Annotation2Property1-desc</jee: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>
+               <jee:description>en-mdb2Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="fr">fr-mdb2Annotation2Property2-desc</jee:description>
+               <jee:description xml:lang="de">de-mdb2Annotation2Property2-desc</jee: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>
+            <jee:description>en-mdb2IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2IgnoreDependency-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2IgnoreDependency-desc</jee:description>
             <injection-target>
                <injection-target-class>mdb2IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>mdb2IgnoreDependencyInjection1Name</injection-target-name>
@@ -2550,9 +2551,9 @@
          <!-- 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>
+            <jee:description>en-mdb2JndiRef1-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2JndiRef1-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2JndiRef1-desc</jee:description>
             <jndi-ref-name>mdb2JndiRef1Name</jndi-ref-name>
             <mapped-name>mdb2JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -2565,9 +2566,9 @@
             </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>
+            <jee:description>en-mdb2JndiRef2-desc</jee:description>
+            <jee:description xml:lang="fr">fr-mdb2JndiRef2-desc</jee:description>
+            <jee:description xml:lang="de">de-mdb2JndiRef2-desc</jee:description>
             <jndi-ref-name>mdb2JndiRef2Name</jndi-ref-name>
             <mapped-name>mdb2JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -2598,63 +2599,63 @@
    <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>
+         <jee:description>en-securityRole1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-securityRole1-desc</jee:description>
+         <jee:description xml:lang="de">de-securityRole1-desc</jee:description>
          <role-name>securityRole1RoleName</role-name>
          <principal>securityRole1Principal1</principal>
          <principal>securityRole1Principal2</principal>
       </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>
+         <jee:description>en-securityRole2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-securityRole2-desc</jee:description>
+         <jee:description xml:lang="de">de-securityRole2-desc</jee:description>
          <role-name>securityRole2RoleName</role-name>
          <principal>securityRole2Principal1</principal>
          <principal>securityRole2Principal2</principal>
       </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>
+         <jee:description>en-messageDestination1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-messageDestination1-desc</jee:description>
+         <jee:description xml:lang="de">de-messageDestination1-desc</jee:description>
+         <jee:display-name>en-messageDestination1-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-messageDestination1-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-messageDestination1-disp</jee:display-name>
+         <jee:icon id="en-messageDestination1-icon-id">
+            <jee:small-icon>en-messageDestination1-small-icon</jee:small-icon>
+            <jee:large-icon>en-messageDestination1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-messageDestination1-icon-id">
+            <jee:small-icon>fr-messageDestination1-small-icon</jee:small-icon>
+            <jee:large-icon>fr-messageDestination1-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-messageDestination1-icon-id">
+            <jee:small-icon>de-messageDestination1-small-icon</jee:small-icon>
+            <jee:large-icon>de-messageDestination1-large-icon</jee:large-icon>
+         </jee:icon>
          <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>
+         <jee:description>en-messageDestination2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-messageDestination2-desc</jee:description>
+         <jee:description xml:lang="de">de-messageDestination2-desc</jee:description>
+         <jee:display-name>en-messageDestination2-disp</jee:display-name>
+         <jee:display-name xml:lang="fr">fr-messageDestination2-disp</jee:display-name>
+         <jee:display-name xml:lang="de">de-messageDestination2-disp</jee:display-name>
+         <jee:icon id="en-messageDestination2-icon-id">
+            <jee:small-icon>en-messageDestination2-small-icon</jee:small-icon>
+            <jee:large-icon>en-messageDestination2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="fr" id="fr-messageDestination2-icon-id">
+            <jee:small-icon>fr-messageDestination2-small-icon</jee:small-icon>
+            <jee:large-icon>fr-messageDestination2-large-icon</jee:large-icon>
+         </jee:icon>
+         <jee:icon xml:lang="de" id="de-messageDestination2-icon-id">
+            <jee:small-icon>de-messageDestination2-small-icon</jee:small-icon>
+            <jee:large-icon>de-messageDestination2-large-icon</jee:large-icon>
+         </jee:icon>
          <message-destination-name>messageDestination2Name</message-destination-name>
          <jndi-name>messageDestination2JndiName</jndi-name>
       </message-destination>
@@ -2662,41 +2663,41 @@
    </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>
+      <jee:description>en-resource-managers-desc</jee:description>
+      <jee:description xml:lang="fr">fr-resource-managers-desc</jee:description>
+      <jee:description xml:lang="de">de-resource-managers-desc</jee: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>
+         <jee:description>en-resourceManager1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-resourceManager1-desc</jee:description>
+         <jee:description xml:lang="de">de-resourceManager1-desc</jee:description>
          <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>
+         <jee:description>en-resourceManager2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-resourceManager2-desc</jee:description>
+         <jee:description xml:lang="de">de-resourceManager2-desc</jee:description>
          <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>
+      <jee:description>en-invoker-proxy-bindings-desc</jee:description>
+      <jee:description xml:lang="fr">fr-invoker-proxy-bindings-desc</jee:description>
+      <jee:description xml:lang="de">de-invoker-proxy-bindings-desc</jee: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>
+         <jee:description>en-invokerProxyBinding1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-invokerProxyBinding1-desc</jee:description>
+         <jee:description xml:lang="de">de-invokerProxyBinding1-desc</jee:description>
          <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
          <invoker-mbean>invokerProxyBinding1InvokerMBean</invoker-mbean>
          <proxy-factory>invokerProxyBinding1ProxyFactory</proxy-factory>
       </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>
+         <jee:description>en-invokerProxyBinding2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-invokerProxyBinding2-desc</jee:description>
+         <jee:description xml:lang="de">de-invokerProxyBinding2-desc</jee:description>
          <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
          <invoker-mbean>invokerProxyBinding2InvokerMBean</invoker-mbean>
          <proxy-factory>invokerProxyBinding2ProxyFactory</proxy-factory>
@@ -2704,16 +2705,16 @@
    </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>
+      <jee:description>en-container-configurations-desc</jee:description>
+      <jee:description xml:lang="fr">fr-container-configurations-desc</jee:description>
+      <jee:description xml:lang="de">de-container-configurations-desc</jee:description>
       <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>
+         <jee:description>en-containerConfiguration1-desc</jee:description>
+         <jee:description xml:lang="fr">fr-containerConfiguration1-desc</jee:description>
+         <jee:description xml:lang="de">de-containerConfiguration1-desc</jee:description>
          <container-name>containerConfiguration1Name</container-name>
          <call-logging>true</call-logging>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1</invoker-proxy-binding-name>
@@ -2734,9 +2735,9 @@
          <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>
+            <jee:description>en-containerConfiguration1ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-containerConfiguration1ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-containerConfiguration1ClusterConfig-desc</jee:description>
             <partition-name>containerConfiguration1ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>containerConfiguration1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>containerConfiguration1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -2746,9 +2747,9 @@
          <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>
+         <jee:description>en-containerConfiguration2-desc</jee:description>
+         <jee:description xml:lang="fr">fr-containerConfiguration2-desc</jee:description>
+         <jee:description xml:lang="de">de-containerConfiguration2-desc</jee:description>
          <container-name>containerConfiguration2Name</container-name>
          <call-logging>false</call-logging>
          <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
@@ -2769,9 +2770,9 @@
          <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>
+            <jee:description>en-containerConfiguration2ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</jee:description>
+            <jee:description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</jee:description>
             <partition-name>containerConfiguration2ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>containerConfiguration2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>containerConfiguration2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>




More information about the jboss-svn-commits mailing list