[jboss-cvs] JBossAS SVN: r66288 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/javaee/spec and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 19 11:15:40 EDT 2007


Author: wolfc
Date: 2007-10-19 11:15:40 -0400 (Fri, 19 Oct 2007)
New Revision: 66288

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionGroupMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionImpl.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptions.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java
   projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
Log:
EJBTHREE-1067: valid xsd for service bean

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/EmbeddedSessionBeanMetaData.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -21,13 +21,7 @@
  */
 package org.jboss.metadata.ejb.jboss;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlAdaptedType;
 import org.jboss.xb.annotations.JBossXmlModelGroup;
 
 /**
@@ -36,9 +30,15 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
- at JBossXmlModelGroup(name="embeddedSessionBean",
-      propOrder={"descriptionGroup", "ejbClass", "businessLocals", "businessRemotes", "jndiEnvironmentRefsGroup"})
+ at JBossXmlModelGroup(name="embedded",
+      propOrder={"descriptionGroup", "businessLocals", "businessRemotes", "ejbClass", "jndiEnvironmentRefsGroup", "securityIdentity"})
 public class EmbeddedSessionBeanMetaData extends SessionBeanMetaData
 {
    private static final long serialVersionUID = 1L;
+   
+   public EmbeddedSessionBeanMetaData()
+   {
+      System.err.println(this);
+      new Exception().printStackTrace();
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -788,6 +788,7 @@
     * 
     * @return the security identity
     */
+   @XmlTransient
    public SecurityIdentityMetaData getSecurityIdentity()
    {
       // This is hacky because of the stupid way security identity is included in the environment

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -21,13 +21,11 @@
  */
 package org.jboss.metadata.ejb.jboss;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
 
+import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.xb.annotations.JBossXmlModelGroup;
 
 /**
  * An EJB 3 service bean.
@@ -104,5 +102,31 @@
    public void setEmbedded(EmbeddedSessionBeanMetaData embedded)
    {
       this.embedded = embedded;
+      
+      // puke
+      embedded.setEjbName(getEjbName());
    }
+   
+   // 
+   
+   @Override
+   @XmlTransient
+   public JBossEnvironmentRefsGroupMetaData getMergedEnvironment()
+   {
+      return getJbossJndiEnvironmentRefsGroup();
+   }
+   
+   @Override
+   @XmlTransient
+   public SessionBeanMetaData getOverridenMetaData()
+   {
+      return getEmbedded();
+   }
+   
+   @Override
+   @XmlTransient
+   public EnterpriseBeanMetaData getOverridenMetaDataWithCheck()
+   {
+      return getEmbedded();
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionGroupMetaData.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionGroupMetaData.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -32,7 +32,6 @@
 import org.jboss.annotation.javaee.DisplayNames;
 import org.jboss.annotation.javaee.Icons;
 import org.jboss.xb.annotations.JBossXmlModelGroup;
-import org.jboss.xb.annotations.JBossXmlNsPrefix;
 
 /**
  * DescriptionGroupMetaData.
@@ -81,7 +80,6 @@
     * @throws IllegalArgumentException for a null descriptions
     */
    @XmlElement(name="description", type=DescriptionsImpl.class)
-   @JBossXmlNsPrefix(prefix="jee")
    public void setDescriptions(Descriptions descriptions)
    {
       if (descriptions == null)
@@ -126,7 +124,6 @@
     * @throws IllegalArgumentException for a null displayNames
     */
    @XmlElement(name="display-name", type=DisplayNamesImpl.class)
-   @JBossXmlNsPrefix(prefix="jee")
    public void setDisplayNames(DisplayNames displayNames)
    {
       if (displayNames == null)
@@ -171,7 +168,6 @@
     * @throws IllegalArgumentException for a null icons
     */
    @XmlElement(name="icon", type=IconsImpl.class)
-   @JBossXmlNsPrefix(prefix="jee")
    public void setIcons(Icons icons)
    {
       if (icons == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionImpl.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionImpl.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/DescriptionImpl.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -33,7 +33,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at XmlType(name="descriptionType", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at XmlType(name="descriptionType")
 public class DescriptionImpl extends LanguageMetaData implements Description
 {
    /** The serialVersionUID */

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/IconImpl.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -25,7 +25,6 @@
 
 import org.jboss.annotation.javaee.Icon;
 import org.jboss.metadata.javaee.support.LanguageMetaData;
-import org.jboss.xb.annotations.JBossXmlNsPrefix;
 
 /**
  * IconImpl.
@@ -79,7 +78,6 @@
     * @param largeIcon the largeIcon.
     * @throws IllegalArgumentException for a null largeIcon
     */
-   @JBossXmlNsPrefix(prefix="jee", schemaTargetIfNotMapped=true)
    public void setLargeIcon(String largeIcon)
    {
       if (largeIcon == null)
@@ -103,7 +101,6 @@
     * @param smallIcon the smallIcon.
     * @throws IllegalArgumentException for a null smallIcon
     */
-   @JBossXmlNsPrefix(prefix="jee", schemaTargetIfNotMapped=true)
    public void setSmallIcon(String smallIcon)
    {
       if (smallIcon == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImplWithDescriptions.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -25,7 +25,6 @@
 
 import org.jboss.annotation.javaee.Descriptions;
 import org.jboss.metadata.javaee.spec.DescriptionsImpl;
-import org.jboss.xb.annotations.JBossXmlNsPrefix;
 
 /**
  * IdMetaDataImplWithDescriptions.
@@ -66,7 +65,6 @@
     * @throws IllegalArgumentException for a null descriptions
     */
    @XmlElement(name="description", type=DescriptionsImpl.class)
-   @JBossXmlNsPrefix(prefix="jee")
    public void setDescriptions(Descriptions descriptions)
    {
       if (descriptions == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptions.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptions.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaDataWithDescriptions.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -25,7 +25,6 @@
 
 import org.jboss.annotation.javaee.Descriptions;
 import org.jboss.metadata.javaee.spec.DescriptionsImpl;
-import org.jboss.xb.annotations.JBossXmlNsPrefix;
 
 /**
  * NamedMetaData.
@@ -58,7 +57,6 @@
     * @throws IllegalArgumentException for a null descriptions
     */
    @XmlElement(name="description", type=DescriptionsImpl.class)
-   @JBossXmlNsPrefix(prefix="jee")
    public void setDescriptions(Descriptions descriptions)
    {
       if (descriptions == null)

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -26,7 +26,6 @@
 import org.jboss.annotation.javaee.Descriptions;
 import org.jboss.metadata.javaee.spec.DescriptionsImpl;
 import org.jboss.metadata.javaee.spec.ResourceInjectionMetaData;
-import org.jboss.xb.annotations.JBossXmlNsPrefix;
 
 /**
  * ResourceInjectionMetaData.
@@ -59,7 +58,6 @@
     * @throws IllegalArgumentException for a null descriptions
     */
    @XmlElement(name="description", type=DescriptionsImpl.class)
-   @JBossXmlNsPrefix(prefix="jee")
    public void setDescriptions(Descriptions descriptions)
    {
       if (descriptions == null)

Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd	2007-10-19 15:15:40 UTC (rev 66288)
@@ -135,7 +135,7 @@
       </xsd:annotation>
 
       <xsd:sequence>
-         <xsd:element name="security-role" type="jboss:jboss-security-roleType" minOccurs="0"
+         <xsd:element name="security-role" type="jboss:security-roleType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="message-destination" type="jboss:jboss-message-destinationType"
                       minOccurs="0" maxOccurs="unbounded"/>
@@ -173,7 +173,7 @@
 
    <!-- **************************************************** -->
 
-   <xsd:complexType name="jboss-security-roleType">
+   <xsd:complexType name="security-roleType">
       <xsd:annotation>
          <xsd:documentation> The security-role element contains the definition of a security role.
             The definition consists of an the security role name and principal name element(s). </xsd:documentation>
@@ -410,18 +410,18 @@
          <xsd:element name="mdb-subscription-id" type="jboss:mdb-subscription-idType" minOccurs="0"/>
          <xsd:element name="resource-adapter-name" type="jboss:resource-adapter-nameType"
                       minOccurs="0"/>
-         <xsd:element name="ejb-ref" type="jboss:jboss-ejb-refType" minOccurs="0"
+         <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="ejb-local-ref" type="jboss:jboss-ejb-local-refType" minOccurs="0"
+         <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="service-ref" type="javaee:service-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
-         <xsd:element name="resource-ref" type="jboss:jboss-resource-refType" minOccurs="0"
+         <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="resource-env-ref" type="jboss:jboss-resource-env-refType" minOccurs="0"
+         <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="message-destination-ref" type="jboss:jboss-message-destination-refType"
+         <xsd:element name="message-destination-ref" type="jboss:message-destination-refType"
                       minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="depends" type="jboss:dependsType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="annotation" type="jboss:annotationType" minOccurs="0" maxOccurs="unbounded"/>
@@ -701,7 +701,28 @@
       </xsd:annotation>
 
       <xsd:sequence>
-         <xsd:element name="run-as-principal" type="javaee:role-nameType" minOccurs="0"/>
+         <!-- ejb-jar_3_0 -->
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:choice>
+            <xsd:element name="use-caller-identity"
+               type="javaee:emptyType">
+               <xsd:annotation>
+                  <xsd:documentation>
+   
+                     The use-caller-identity element specifies that the
+                     caller's security identity be used as the security
+                     identity for the execution of the enterprise bean's
+                     methods.
+   
+                  </xsd:documentation>
+               </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="run-as" type="jboss:run-asType" />
+         </xsd:choice>
+         <!-- jboss -->
+         <xsd:element name="run-as-principal" type="javaee:role-nameType"
+            minOccurs="0" />
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
    </xsd:complexType>
@@ -728,16 +749,16 @@
          <xsd:element name="remote-binding" type="jboss:remote-bindingType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
          <xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
-         <xsd:element name="ejb-ref" type="jboss:jboss-ejb-refType" minOccurs="0"
+         <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="ejb-local-ref" type="jboss:jboss-ejb-local-refType" minOccurs="0"
+         <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="security-identity" type="javaee:security-identityType" minOccurs="0"/>
-         <xsd:element name="resource-ref" type="jboss:jboss-resource-refType" minOccurs="0"
+         <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="resource-env-ref" type="jboss:jboss-resource-env-refType" minOccurs="0"
+         <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="message-destination-ref" type="jboss:jboss-message-destination-refType"
+         <xsd:element name="message-destination-ref" type="jboss:message-destination-refType"
                       minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
          <xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
@@ -772,7 +793,7 @@
       </xsd:annotation>
 
       <xsd:sequence>
-         <xsd:group ref="javaee:descriptionGroup"/>
+         <xsd:group ref="jboss:descriptionGroup"/>
          <xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
          <xsd:element name="mapped-name" type="javaee:xsdStringType" minOccurs="0"/>
          <!-- A service bean can't have an EJB 2.1 view -->
@@ -792,7 +813,7 @@
          <!-- no post-activate -->
          <!-- no pre-passivate -->
          <!-- TODO: security-role-ref -->
-         <xsd:element name="security-identity" type="javaee:security-identityType" minOccurs="0"/>
+         <xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
          
          <!-- JBoss extensions -->
          <xsd:element name="object-name" type="jboss:jmx-nameType" minOccurs="0"/>
@@ -900,19 +921,19 @@
          <xsd:element name="call-by-value" type="xsd:boolean" minOccurs="0"/>
          <xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
          <xsd:element name="local-home-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
-         <xsd:element name="ejb-ref" type="jboss:jboss-ejb-refType" minOccurs="0"
+         <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="ejb-local-ref" type="jboss:jboss-ejb-local-refType" minOccurs="0"
+         <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="service-ref" type="jboss:jboss-service-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="ior-security-config" type="jboss:ior-security-config-type" minOccurs="0"/>
          <xsd:element name="security-identity" type="javaee:security-identityType" minOccurs="0"/>
-         <xsd:element name="resource-ref" type="jboss:jboss-resource-refType" minOccurs="0"
+         <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="resource-env-ref" type="jboss:jboss-resource-env-refType" minOccurs="0"
+         <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="message-destination-ref" type="jboss:jboss-message-destination-refType"
+         <xsd:element name="message-destination-ref" type="jboss:message-destination-refType"
                       minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="clustered" type="jboss:clusteredType" minOccurs="0"/>
          <xsd:element name="cluster-config" type="jboss:cluster-configType" minOccurs="0"/>
@@ -1221,7 +1242,7 @@
 
    <!-- **************************************************** -->
 
-   <xsd:complexType name="jboss-ejb-refType">
+   <xsd:complexType name="ejb-refType">
       <xsd:annotation>
          <xsd:documentation> The ejb-ref element is used to give the jndi-name of an external ejb
             reference. In the case of an external ejb reference, you don't provide a ejb-link element in
@@ -1257,7 +1278,7 @@
 
    <!-- **************************************************** -->
 
-   <xsd:complexType name="jboss-ejb-local-refType">
+   <xsd:complexType name="ejb-local-refType">
       <xsd:annotation>
          <xsd:documentation> The ejb-local-ref element is used to give the jndi-name of an external ejb
             reference. In the case of an external ejb reference, you don't provide a ejb-link element in
@@ -1295,87 +1316,8 @@
    </xsd:complexType>
 
    <!-- **************************************************** -->
-
-   <xsd:complexType name="jboss-message-destination-refType">
+   <xsd:complexType name="resource-refType">
       <xsd:annotation>
-         <xsd:documentation> The message-destination-ref element is used to configure the jndi-name for
-            a message-destination-ref in ejb-jar.xml </xsd:documentation>
-      </xsd:annotation>
-
-      <xsd:sequence>
-         <xsd:element name="message-destination-ref-name" type="javaee:jndi-nameType">
-            <xsd:annotation>
-               <xsd:documentation> The message-destination-ref-name element specifies the name of a
-                  message destination reference; its value is the environment entry name used in
-                  Deployment Component code. The name is a JNDI name relative to the java:comp/env context
-                  and must be unique within an ejb-jar (for enterprise beans) or a Deployment File (for
-                  others). </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-         <xsd:element name="message-destination-type" type="javaee:message-destination-typeType"
-                      minOccurs="0"/>
-         <xsd:element name="message-destination-usage" type="javaee:message-destination-usageType"
-                      minOccurs="0"/>
-         <xsd:element name="message-destination-link" type="javaee:message-destination-linkType"
-                      minOccurs="0"/>
-
-         <xsd:group ref="javaee:resourceGroup"/>
-
-         <xsd:element name="jndi-name" type="javaee:xsdStringType" minOccurs="0"/>
-      </xsd:sequence>
-      <xsd:attribute name="id" type="xsd:ID"/>
-   </xsd:complexType>
-
-   <!-- **************************************************** -->
-
-   <xsd:complexType name="jboss-resource-env-refType">
-      <xsd:annotation>
-         <xsd:documentation> The resource-env-ref element gives a mapping between the "code name" of a
-            env resource (res-ref-name, provided by the Bean Developer) and its deployed JNDI name.
-         </xsd:documentation>
-      </xsd:annotation>
-
-<!-- 
-      <xsd:sequence>
-         <xsd:element name="description" type="javaee:descriptionType" minOccurs="0"
-                      maxOccurs="unbounded"/>
-         <xsd:element name="resource-env-ref-name" type="javaee:jndi-nameType" minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation> The resource-env-ref-name element specifies the name of a resource
-                  environment reference; its value is the environment entry name used in the Deployment
-                  Component code. The name is a JNDI name relative to the java:comp/env context and must
-                  be unique within a Deployment Component. </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="resource-env-ref-type" type="javaee:fully-qualified-classType"
-                      minOccurs="0">
-            <xsd:annotation>
-               <xsd:documentation> The resource-env-ref-type element specifies the type of a resource
-                  environment reference. It is the fully qualified name of a Java language class or
-                  interface. </xsd:documentation>
-            </xsd:annotation>
-         </xsd:element>
-
-         <xsd:element name="jndi-name" type="javaee:jndi-nameType"/>
-
-         <xsd:group ref="javaee:resourceGroup"/>
-      </xsd:sequence>
-
-      <xsd:attribute name="id" type="xsd:ID"/>
--->
-      <xsd:complexContent>
-         <xsd:extension base="javaee:resource-env-refType">
-            <xsd:sequence>
-               <xsd:element name="jndi-name" type="javaee:jndi-nameType"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-
-   <!-- **************************************************** -->
-   <xsd:complexType name="jboss-resource-refType">
-      <xsd:annotation>
          <xsd:documentation> The resource-ref element gives a mapping between the "code name" of a
             resource (res-ref-name, provided by the Bean Developer) and its "xml name" (resource-name,
             provided by the Application Assembler). If no resource-ref is provided, jboss will assume
@@ -1405,6 +1347,7 @@
 
          <xsd:element name="res-sharing-scope" type="javaee:res-sharing-scopeType" minOccurs="0"/>
 
+         <!-- We redefine part of the resourceGroup here, so we can't ref it -->
          <xsd:choice>
             <xsd:element name="resource-name" type="javaee:xsdStringType"/>
             <xsd:element name="jndi-name" type="javaee:xsdStringType"/>
@@ -1412,8 +1355,10 @@
             <xsd:element name="res-url" type="javaee:xsdStringType"/>
          </xsd:choice>
 
-         <xsd:group ref="javaee:resourceGroup"/>
-
+         <xsd:element name="injection-target"
+            type="jboss:injection-targetType" minOccurs="0"
+            maxOccurs="unbounded" />
+         
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
    </xsd:complexType>
@@ -1798,22 +1743,42 @@
       <xsd:sequence>
          <xsd:group ref="javaee:descriptionGroup"/>
          <xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
+         <xsd:group ref="jboss:jndiEnvironmentRefsGroup"/>
+         <xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
          <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
-         <xsd:element name="ejb-ref" type="jboss:jboss-ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element name="ejb-local-ref" type="jboss:jboss-ejb-local-refType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element name="service-ref" type="jboss:jboss-service-refType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
-         <xsd:element name="resource-ref" type="jboss:jboss-resource-refType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element name="resource-env-ref" type="jboss:jboss-resource-env-refType" minOccurs="0" maxOccurs="unbounded"/>
-         <xsd:element name="message-destination-ref" type="jboss:jboss-message-destination-refType" minOccurs="0" maxOccurs="unbounded"/>
          <xsd:element name="port-component" type="jboss:port-component-type" minOccurs="0" maxOccurs="1"/>
-         <!-- TODO: should we have a jndiEnvironmentRefsGroup in here? -->
-         <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
       </xsd:sequence>
    </xsd:complexType>
    
    <!-- **************************************************** -->
 
+   <!-- Bring descriptionGroup into jboss namespace -->
+   <xsd:group name="descriptionGroup">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="display-name" type="javaee:display-nameType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="icon" type="javaee:iconType" minOccurs="0"
+            maxOccurs="unbounded" />
+      </xsd:sequence>
+   </xsd:group>
+
+   <!-- Bring env-entryType into jboss namespace -->
+   <xsd:complexType name="env-entryType">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="env-entry-name" type="javaee:jndi-nameType" />
+         <xsd:element name="env-entry-type"
+            type="javaee:env-entry-type-valuesType" minOccurs="0" />
+         <xsd:element name="env-entry-value" type="javaee:xsdStringType"
+            minOccurs="0" />
+         <xsd:group ref="jboss:resourceGroup" />
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:ID" />
+   </xsd:complexType>
+
    <!-- Bring injection-targetType into jboss namespace -->
    <xsd:complexType name="injection-targetType">
       <xsd:sequence>
@@ -1827,45 +1792,149 @@
    <!-- Bring jndiEnvirnmentRefsGroup info jboss namespace -->
    <xsd:group name="jndiEnvironmentRefsGroup">
       <xsd:sequence>
-         <xsd:element name="env-entry" type="javaee:env-entryType"
+         <xsd:element name="env-entry" type="jboss:env-entryType"
             minOccurs="0" maxOccurs="unbounded" />
-         <xsd:element name="ejb-ref" type="jboss:jboss-ejb-refType"
+         <xsd:element name="ejb-ref" type="jboss:ejb-refType"
             minOccurs="0" maxOccurs="unbounded" />
          <xsd:element name="ejb-local-ref"
-            type="jboss:jboss-ejb-local-refType" minOccurs="0"
+            type="jboss:ejb-local-refType" minOccurs="0"
             maxOccurs="unbounded" />
-         <xsd:group ref="javaee:service-refGroup" />
-         <xsd:element name="resource-ref" type="javaee:resource-refType"
+         <xsd:group ref="jboss:service-refGroup" />
+         <xsd:element name="resource-ref" type="jboss:resource-refType"
             minOccurs="0" maxOccurs="unbounded" />
          <xsd:element name="resource-env-ref"
-            type="javaee:resource-env-refType" minOccurs="0"
+            type="jboss:resource-env-refType" minOccurs="0"
             maxOccurs="unbounded" />
          <xsd:element name="message-destination-ref"
-            type="javaee:message-destination-refType" minOccurs="0"
+            type="jboss:message-destination-refType" minOccurs="0"
             maxOccurs="unbounded" />
          <xsd:element name="persistence-context-ref"
-            type="javaee:persistence-context-refType" minOccurs="0"
+            type="jboss:persistence-context-refType" minOccurs="0"
             maxOccurs="unbounded" />
          <xsd:element name="persistence-unit-ref"
-            type="javaee:persistence-unit-refType" minOccurs="0"
+            type="jboss:persistence-unit-refType" minOccurs="0"
             maxOccurs="unbounded" />
          <xsd:element name="post-construct"
-            type="javaee:lifecycle-callbackType" minOccurs="0"
+            type="jboss:lifecycle-callbackType" minOccurs="0"
             maxOccurs="unbounded" />
          <xsd:element name="pre-destroy"
-            type="javaee:lifecycle-callbackType" minOccurs="0"
+            type="jboss:lifecycle-callbackType" minOccurs="0"
             maxOccurs="unbounded" />
       </xsd:sequence>
    </xsd:group>
 
+   <!-- Bring lifecycle-callbackType info jboss namespace -->
+   <xsd:complexType name="lifecycle-callbackType">
+      <xsd:sequence>
+         <xsd:element name="lifecycle-callback-class"
+            type="javaee:fully-qualified-classType" minOccurs="0" />
+         <xsd:element name="lifecycle-callback-method"
+            type="javaee:java-identifierType" />
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <!-- Bring message-destination-refType info jboss namespace -->
+   <xsd:complexType name="message-destination-refType">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="message-destination-ref-name"
+            type="javaee:jndi-nameType"/>
+         <xsd:element name="message-destination-type"
+            type="javaee:message-destination-typeType" minOccurs="0" />
+         <xsd:element name="message-destination-usage"
+            type="javaee:message-destination-usageType" minOccurs="0" />
+         <xsd:element name="message-destination-link"
+            type="javaee:message-destination-linkType" minOccurs="0" />
+         <xsd:group ref="jboss:resourceGroup" />
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:ID" />
+   </xsd:complexType>
+
+   <!-- Bring persistence-context-refType info jboss namespace -->
+   <xsd:complexType name="persistence-context-refType">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="persistence-context-ref-name"
+            type="javaee:jndi-nameType" />
+         <xsd:element name="persistence-unit-name" type="javaee:string"
+            minOccurs="0" />
+         <xsd:element name="persistence-context-type"
+            type="javaee:persistence-context-typeType" minOccurs="0" />
+         <xsd:element name="persistence-property"
+            type="javaee:propertyType" minOccurs="0"
+            maxOccurs="unbounded" />
+         <xsd:group ref="jboss:resourceGroup" />
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:ID" />
+   </xsd:complexType>
+
+   <!-- Bring persistence-unit-refType info jboss namespace -->
+   <xsd:complexType name="persistence-unit-refType">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="persistence-unit-ref-name"
+            type="javaee:jndi-nameType" />
+         <xsd:element name="persistence-unit-name" type="javaee:string"
+            minOccurs="0" />
+         <xsd:group ref="jboss:resourceGroup" />
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:ID" />
+   </xsd:complexType>
+
    <!-- Bring resourceGroup into jboss namespace -->
+   <xsd:complexType name="resource-env-refType">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="resource-env-ref-name"
+            type="javaee:jndi-nameType" />
+         <xsd:element name="resource-env-ref-type"
+            type="javaee:fully-qualified-classType" minOccurs="0" />
+         <xsd:group ref="jboss:resourceGroup" />
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:ID" />
+   </xsd:complexType>
+
+   <!-- Bring resourceGroup into jboss namespace -->
    <xsd:group name="resourceGroup">
       <xsd:sequence>
-         <xsd:element name="mapped-name" type="javaee:xsdStringType"
-            minOccurs="0" />
+         <!-- In jboss xml we allow the use of jndi-name instead of mapped-name -->
+         <xsd:choice>
+            <xsd:element name="jndi-name" type="javaee:jndi-nameType"
+               minOccurs="0" />
+            <xsd:element name="mapped-name" type="javaee:xsdStringType"
+               minOccurs="0" />
+         </xsd:choice>
          <xsd:element name="injection-target"
             type="jboss:injection-targetType" minOccurs="0"
             maxOccurs="unbounded" />
       </xsd:sequence>
    </xsd:group>
+
+   <!-- Bring run-asType into jboss namespace -->
+   <xsd:complexType name="run-asType">
+      <xsd:sequence>
+         <xsd:element name="description" type="javaee:descriptionType"
+            minOccurs="0" maxOccurs="unbounded" />
+         <xsd:element name="role-name" type="javaee:role-nameType" />
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:ID" />
+   </xsd:complexType>
+
+   <!-- Bring service-refGroup into jboss namespace from javaee_web_services_client_1_2 -->
+   <xsd:group name="service-refGroup">
+      <xsd:sequence>
+         <xsd:element name="service-ref" type="javaee:service-refType"
+            minOccurs="0" maxOccurs="unbounded">
+            <xsd:key name="service-ref_handler-name-key">
+               <xsd:selector xpath="javaee:handler" />
+               <xsd:field xpath="javaee:handler-name" />
+            </xsd:key>
+         </xsd:element>
+      </xsd:sequence>
+   </xsd:group>
+
 </xsd:schema>

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java	2007-10-19 15:15:40 UTC (rev 66288)
@@ -43,6 +43,7 @@
 import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
+import org.jboss.metadata.ejb.jboss.JBossServiceBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.jboss.ResourceManagerMetaData;
 import org.jboss.metadata.ejb.jboss.ResourceManagersMetaData;
@@ -51,9 +52,9 @@
 import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
+import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.SubscriptionDurability;
 import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
@@ -61,6 +62,7 @@
 import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
 import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RunAsMetaData;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
 import org.jboss.test.metadata.javaee.JBossXBTestDelegate;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
@@ -201,6 +203,31 @@
 //      xbdelegate.setValidateSchema(false);
       
       JBossMetaData result = unmarshal();
+      
+      JBossServiceBeanMetaData bean = (JBossServiceBeanMetaData) result.getEnterpriseBean("ServiceSix");
+      assertNotNull(bean);
+      assertEquals("ServiceSix", bean.getEjbName());
+      
+      // The bean must have a 'copy' inside the overriden metadata
+      SessionBeanMetaData overriden = bean.getOverridenMetaData();
+      assertNotNull(overriden);
+      assertEquals("ServiceSix", overriden.getEjbName());
+      
+      System.out.println(bean.getDescriptionGroup().getDescription());
+      
+      assertEquals(1, overriden.getBusinessLocals().size());
+      assertTrue(overriden.getBusinessLocals().contains("org.jboss.ejb3.test.service.ServiceSixLocal"));
+      
+      // TODO: I shouldn't have to reference via embedded
+      SecurityIdentityMetaData securityIdentity = bean.getEmbedded().getSecurityIdentity();
+      assertNotNull(securityIdentity);
+      RunAsMetaData runAs = securityIdentity.getRunAs();
+      assertNotNull(runAs);
+      assertEquals("role name", runAs.getRoleName());
+      assertEquals("run as principal", securityIdentity.getRunAsPrincipal());
+      
+      // TODO: see above
+      assertNotNull(bean.getSecurityIdentity());
    }
    
    /**

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testService.xml	2007-10-19 15:15:40 UTC (rev 66288)
@@ -8,12 +8,13 @@
         version="3.0">
    <enterprise-beans>
       <service>
+         <description>test</description>
          <ejb-name>ServiceSix</ejb-name>
          <business-local>org.jboss.ejb3.test.service.ServiceSixLocal</business-local>
          <business-remote>org.jboss.ejb3.test.service.ServiceSixRemote</business-remote>
          <ejb-class>org.jboss.ejb3.test.service.ServiceSix</ejb-class>
          <ejb-ref>
-            <jee:description>test</jee:description>
+            <description>test</description>
             <ejb-ref-name>ejb/StatelessBean</ejb-ref-name>
             <ejb-ref-type>Session</ejb-ref-type>
             <remote>org.jboss.ejb3.test.service.StatelessRemote</remote>
@@ -35,33 +36,33 @@
             </injection-target>
             <jndi-name>StatelessBean/local</jndi-name>
          </ejb-local-ref>
-         <security-identity>
-            <run-as>
-               <role-name>role name</role-name>
-            </run-as>
-            <run-as-principal>run as principal</run-as-principal>
-         </security-identity>
          <resource-ref>
             <res-ref-name>testDatasource</res-ref-name>
             <res-type>javax.sql.DataSource</res-type>
             <res-auth>Container</res-auth>
             <res-sharing-scope>Shareable</res-sharing-scope>
             <mapped-name>java:/DefaultDS</mapped-name>
-            <jee:injection-target>
-               <jee:injection-target-class>org.jboss.ejb3.test.service.ServiceSix</jee:injection-target-class>
-               <jee:injection-target-name>testDatasource</jee:injection-target-name>
-            </jee:injection-target>
+            <injection-target>
+               <injection-target-class>org.jboss.ejb3.test.service.ServiceSix</injection-target-class>
+               <injection-target-name>testDatasource</injection-target-name>
+            </injection-target>
          </resource-ref>
          <resource-env-ref>
-            <jee:description>A test of the resource-env-ref tag</jee:description>
-            <jee:resource-env-ref-name>res/aQueue</jee:resource-env-ref-name>
-            <jee:resource-env-ref-type>javax.jms.Queue</jee:resource-env-ref-type>
+            <description>A test of the resource-env-ref tag</description>
+            <resource-env-ref-name>res/aQueue</resource-env-ref-name>
+            <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
             <jndi-name>queue/mdbtest</jndi-name>
          </resource-env-ref>
          <message-destination-ref>
             <message-destination-ref-name>messageDestinationRef</message-destination-ref-name>
-            <jee:mapped-name>mappedName</jee:mapped-name>
+            <mapped-name>mappedName</mapped-name>
          </message-destination-ref>
+         <security-identity>
+            <run-as>
+               <role-name>role name</role-name>
+            </run-as>
+            <run-as-principal>run as principal</run-as-principal>
+         </security-identity>
          <object-name>object name</object-name>
          <management>org.jboss.ejb3.test.service.ServiceSixManagement</management>
          <xmbean>xmbean</xmbean>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml	2007-10-19 15:07:02 UTC (rev 66287)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml	2007-10-19 15:15:40 UTC (rev 66288)
@@ -7,24 +7,24 @@
        version="5.0"
        id="jboss-id">
          
-   <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>
+   <description>en-jboss-desc</description>
+   <description xml:lang="fr">fr-jboss-desc</description>
+   <description xml:lang="de">de-jboss-desc</description>
+   <display-name>en-jboss-disp</display-name>
+   <display-name xml:lang="fr">fr-jboss-disp</display-name>
+   <display-name xml:lang="de">de-jboss-disp</display-name>
+   <icon id="en-jboss-icon-id">
+      <small-icon>en-jboss-small-icon</small-icon>
+      <large-icon>en-jboss-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="fr" id="fr-jboss-icon-id">
+      <small-icon>fr-jboss-small-icon</small-icon>
+      <large-icon>fr-jboss-large-icon</large-icon>
+   </icon>
+   <icon xml:lang="de" id="de-jboss-icon-id">
+      <small-icon>de-jboss-small-icon</small-icon>
+      <large-icon>de-jboss-large-icon</large-icon>
+   </icon>
    
    <loader-repository id="loaderRepository-id" loaderRepositoryClass="loaderRepositoryClass">
       loaderRepositoryName
@@ -66,31 +66,31 @@
       </session>
 
       <session id="session1-id">
-         <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>
+         <description>en-session1-desc</description>
+         <description xml:lang="fr">fr-session1-desc</description>
+         <description xml:lang="de">de-session1-desc</description>
+         <display-name>en-session1-disp</display-name>
+         <display-name xml:lang="fr">fr-session1-disp</display-name>
+         <display-name xml:lang="de">de-session1-disp</display-name>
+         <icon id="en-session1-icon-id">
+            <small-icon>en-session1-small-icon</small-icon>
+            <large-icon>en-session1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-session1-icon-id">
+            <small-icon>fr-session1-small-icon</small-icon>
+            <large-icon>fr-session1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-session1-icon-id">
+            <small-icon>de-session1-small-icon</small-icon>
+            <large-icon>de-session1-large-icon</large-icon>
+         </icon>
 
          <ejb-name>session1EjbName</ejb-name>
          
          <remote-binding id="session1RemoteBinding-id">
-            <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>
+            <description>en-session1RemoteBinding-desc</description>
+            <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
+            <description xml:lang="de">de-session1RemoteBinding-desc</description>
             <jndi-name>session1RemoteBindingJndiName</jndi-name>
             <client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
             <interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
@@ -105,23 +105,23 @@
          <configuration-name>session1ConfigurationName</configuration-name>
          
          <invoker-bindings id="session1InvokerBindings-id">
-            <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>
+            <description>en-session1InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
+            <description xml:lang="de">de-session1InvokerBindings-desc</description>
 
             <invoker id="session1Invoker1-id">
-               <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>
+               <description>en-session1Invoker1-desc</description>
+               <description xml:lang="fr">fr-session1Invoker1-desc</description>
+               <description xml:lang="de">de-session1Invoker1-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
             <invoker id="session1Invoker2-id">
-               <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>
+               <description>en-session1Invoker2-desc</description>
+               <description xml:lang="fr">fr-session1Invoker2-desc</description>
+               <description xml:lang="de">de-session1Invoker2-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>session1Invoker2JndiName</jndi-name>
@@ -132,9 +132,9 @@
          <security-proxy>session1SecurityProxy</security-proxy>
          
          <ejb-ref id="session1EjbRef1-id">
-            <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>
+            <description>en-session1EjbRef1-desc</description>
+            <description xml:lang="fr">fr-session1EjbRef1-desc</description>
+            <description xml:lang="de">de-session1EjbRef1-desc</description>
 
             <ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -149,9 +149,9 @@
             <ignore-dependency/>
          </ejb-ref>
          <ejb-ref id="session1EjbRef2-id">
-            <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>
+            <description>en-session1EjbRef2-desc</description>
+            <description xml:lang="fr">fr-session1EjbRef2-desc</description>
+            <description xml:lang="de">de-session1EjbRef2-desc</description>
 
             <ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -166,9 +166,9 @@
          </ejb-ref>
 
          <ejb-local-ref id="session1EjbLocalRef1-id">
-            <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>
+            <description>en-session1EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-session1EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-session1EjbLocalRef1-desc</description>
 
             <ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -183,9 +183,9 @@
             <ignore-dependency/>
          </ejb-local-ref>
          <ejb-local-ref id="session1EjbLocalRef2-id">
-            <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>
+            <description>en-session1EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-session1EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-session1EjbLocalRef2-desc</description>
 
             <ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -202,16 +202,16 @@
          <!-- TODO service-ref -->
 
          <security-identity id="session1SecurityIdentity-id">
-            <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>
+            <description>en-session1SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
+            <description xml:lang="de">de-session1SecurityIdentity-desc</description>
             <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
          </security-identity>
 
          <resource-ref id="session1ResourceRef1-id">
-            <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>
+            <description>en-session1ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-session1ResourceRef1-desc</description>
+            <description xml:lang="de">de-session1ResourceRef1-desc</description>
             <res-ref-name>session1ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
@@ -225,9 +225,9 @@
             <ignore-dependency/>
          </resource-ref>
          <resource-ref id="session1ResourceRef2-id">
-            <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>
+            <description>en-session1ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-session1ResourceRef2-desc</description>
+            <description xml:lang="de">de-session1ResourceRef2-desc</description>
             <res-ref-name>session1ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
@@ -240,9 +240,9 @@
             <jndi-name>session1ResourceRef2JndiName</jndi-name>
          </resource-ref>
          <resource-env-ref id="session1ResourceEnvRef1-id">
-            <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>
+            <description>en-session1ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-session1ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-session1ResourceEnvRef1-desc</description>
             <resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -256,9 +256,9 @@
             <ignore-dependency/>
          </resource-env-ref>
          <resource-env-ref id="session1ResourceEnvRef2-id">
-            <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>
+            <description>en-session1ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-session1ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-session1ResourceEnvRef2-desc</description>
             <resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -271,9 +271,9 @@
             <jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
          <message-destination-ref id="session1MessageDestinationRef1-id">
-            <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>
+            <description>en-session1MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-session1MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-session1MessageDestinationRef1-desc</description>
             <message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -287,9 +287,9 @@
             <ignore-dependency/>
          </message-destination-ref>
          <message-destination-ref id="session1MessageDestinationRef2-id">
-            <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>
+            <description>en-session1MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-session1MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-session1MessageDestinationRef2-desc</description>
             <message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -302,9 +302,9 @@
             <jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
          <message-destination-ref id="session1MessageDestinationRef3-id">
-            <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>
+            <description>en-session1MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-session1MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-session1MessageDestinationRef3-desc</description>
             <message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -320,9 +320,9 @@
          <clustered>true</clustered>
          
          <cluster-config id="session1ClusterConfig-id">
-            <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>
+            <description>en-session1ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-session1ClusterConfig-desc</description>
+            <description xml:lang="de">de-session1ClusterConfig-desc</description>
             <partition-name>session1ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>session1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>session1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -347,13 +347,13 @@
          <depends>session1Depends2</depends>
          
          <ior-security-config id="session1IorSecurityConfig-id">
-            <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>
+            <description>en-session1IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
             <transport-config id="session1TransportConfig-id">
-               <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>
+               <description>en-session1TransportConfig-desc</description>
+               <description xml:lang="fr">fr-session1TransportConfig-desc</description>
+               <description xml:lang="de">de-session1TransportConfig-desc</description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -362,17 +362,17 @@
                <detect-replay>NONE</detect-replay>
             </transport-config>
             <as-context id="session1ASContext-id">
-               <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>
+               <description>en-session1ASContext-desc</description>
+               <description xml:lang="fr">fr-session1ASContext-desc</description>
+               <description xml:lang="de">de-session1ASContext-desc</description>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>session1ASContextRealm</realm>
                <required>false</required>
             </as-context>
             <sas-context id="session1SASContext-id">
-               <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>
+               <description>en-session1SASContext-desc</description>
+               <description xml:lang="fr">fr-session1SASContext-desc</description>
+               <description xml:lang="de">de-session1SASContext-desc</description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
@@ -386,16 +386,16 @@
          </port-component>
          
          <ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
-            <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>
+            <description>en-session1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
             <run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
          
          <annotation id="session1Annotation1-id">
-            <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>
+            <description>en-session1Annotation1-desc</description>
+            <description xml:lang="fr">fr-session1Annotation1-desc</description>
+            <description xml:lang="de">de-session1Annotation1-desc</description>
             
             <annotation-class>session1Annotation1Class</annotation-class>
             <annotation-implementation-class>session1Annotation1Impl</annotation-implementation-class>
@@ -404,24 +404,24 @@
                <injection-target-name>session1Annotation1InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="session1Annotation1Property1-id">
-               <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>
+               <description>en-session1Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-session1Annotation1Property1-desc</description>
+               <description xml:lang="de">de-session1Annotation1Property1-desc</description>
                <property-name>session1Annotation1Property1Name</property-name>
                <property-value>session1Annotation1Property1Value</property-value>
             </property>
             <property id="session1Annotation1Property2-id">
-               <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>
+               <description>en-session1Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-session1Annotation1Property2-desc</description>
+               <description xml:lang="de">de-session1Annotation1Property2-desc</description>
                <property-name>session1Annotation1Property2Name</property-name>
                <property-value>session1Annotation1Property2Value</property-value>
             </property>
          </annotation>
          <annotation id="session1Annotation2-id">
-            <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>
+            <description>en-session1Annotation2-desc</description>
+            <description xml:lang="fr">fr-session1Annotation2-desc</description>
+            <description xml:lang="de">de-session1Annotation2-desc</description>
             
             <annotation-class>session1Annotation2Class</annotation-class>
             <annotation-implementation-class>session1Annotation2Impl</annotation-implementation-class>
@@ -430,25 +430,25 @@
                <injection-target-name>session1Annotation2InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="session1Annotation2Property1-id">
-               <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>
+               <description>en-session1Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-session1Annotation2Property1-desc</description>
+               <description xml:lang="de">de-session1Annotation2Property1-desc</description>
                <property-name>session1Annotation2Property1Name</property-name>
                <property-value>session1Annotation2Property1Value</property-value>
             </property>
             <property id="session1Annotation2Property2-id">
-               <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>
+               <description>en-session1Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-session1Annotation2Property2-desc</description>
+               <description xml:lang="de">de-session1Annotation2Property2-desc</description>
                <property-name>session1Annotation2Property2Name</property-name>
                <property-value>session1Annotation2Property2Value</property-value>
             </property>
          </annotation>
 
          <ignore-dependency id="session1IgnoreDependency-id">
-            <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>
+            <description>en-session1IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-session1IgnoreDependency-desc</description>
+            <description xml:lang="de">de-session1IgnoreDependency-desc</description>
             <injection-target>
                <injection-target-class>session1IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>session1IgnoreDependencyInjection1Name</injection-target-name>
@@ -469,9 +469,9 @@
          
          <!-- TODO jndi ref -->
          <jndi-ref id="session1JndiRef1-id">
-            <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>
+            <description>en-session1JndiRef1-desc</description>
+            <description xml:lang="fr">fr-session1JndiRef1-desc</description>
+            <description xml:lang="de">de-session1JndiRef1-desc</description>
             <jndi-ref-name>session1JndiRef1Name</jndi-ref-name>
             <mapped-name>session1JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -484,9 +484,9 @@
             </injection-target>
          </jndi-ref>
          <jndi-ref id="session1JndiRef2-id">
-            <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>
+            <description>en-session1JndiRef2-desc</description>
+            <description xml:lang="fr">fr-session1JndiRef2-desc</description>
+            <description xml:lang="de">de-session1JndiRef2-desc</description>
             <jndi-ref-name>session1JndiRef2Name</jndi-ref-name>
             <mapped-name>session1JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -502,31 +502,31 @@
       </session>
 
       <session id="session2-id">
-         <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>
+         <description>en-session2-desc</description>
+         <description xml:lang="fr">fr-session2-desc</description>
+         <description xml:lang="de">de-session2-desc</description>
+         <display-name>en-session2-disp</display-name>
+         <display-name xml:lang="fr">fr-session2-disp</display-name>
+         <display-name xml:lang="de">de-session2-disp</display-name>
+         <icon id="en-session2-icon-id">
+            <small-icon>en-session2-small-icon</small-icon>
+            <large-icon>en-session2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-session2-icon-id">
+            <small-icon>fr-session2-small-icon</small-icon>
+            <large-icon>fr-session2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-session2-icon-id">
+            <small-icon>de-session2-small-icon</small-icon>
+            <large-icon>de-session2-large-icon</large-icon>
+         </icon>
 
          <ejb-name>session2EjbName</ejb-name>
          
          <remote-binding id="session2RemoteBinding-id">
-            <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>
+            <description>en-session2RemoteBinding-desc</description>
+            <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
+            <description xml:lang="de">de-session2RemoteBinding-desc</description>
             <jndi-name>session2RemoteBindingJndiName</jndi-name>
             <client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
             <interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
@@ -541,23 +541,23 @@
          <configuration-name>session2ConfigurationName</configuration-name>
          
          <invoker-bindings id="session2InvokerBindings-id">
-            <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>
+            <description>en-session2InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
+            <description xml:lang="de">de-session2InvokerBindings-desc</description>
 
             <invoker id="session2Invoker1-id">
-               <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>
+               <description>en-session2Invoker1-desc</description>
+               <description xml:lang="fr">fr-session2Invoker1-desc</description>
+               <description xml:lang="de">de-session2Invoker1-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
             <invoker id="session2Invoker2-id">
-               <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>
+               <description>en-session2Invoker2-desc</description>
+               <description xml:lang="fr">fr-session2Invoker2-desc</description>
+               <description xml:lang="de">de-session2Invoker2-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>session2Invoker2JndiName</jndi-name>
@@ -568,9 +568,9 @@
          <security-proxy>session2SecurityProxy</security-proxy>
          
          <ejb-ref id="session2EjbRef1-id">
-            <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>
+            <description>en-session2EjbRef1-desc</description>
+            <description xml:lang="fr">fr-session2EjbRef1-desc</description>
+            <description xml:lang="de">de-session2EjbRef1-desc</description>
 
             <ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -585,9 +585,9 @@
             <ignore-dependency/>
          </ejb-ref>
          <ejb-ref id="session2EjbRef2-id">
-            <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>
+            <description>en-session2EjbRef2-desc</description>
+            <description xml:lang="fr">fr-session2EjbRef2-desc</description>
+            <description xml:lang="de">de-session2EjbRef2-desc</description>
 
             <ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -602,9 +602,9 @@
          </ejb-ref>
 
          <ejb-local-ref id="session2EjbLocalRef1-id">
-            <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>
+            <description>en-session2EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-session2EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-session2EjbLocalRef1-desc</description>
 
             <ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -619,9 +619,9 @@
             <ignore-dependency/>
          </ejb-local-ref>
          <ejb-local-ref id="session2EjbLocalRef2-id">
-            <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>
+            <description>en-session2EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-session2EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-session2EjbLocalRef2-desc</description>
 
             <ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -638,16 +638,16 @@
          <!-- TODO service-ref -->
 
          <security-identity id="session2SecurityIdentity-id">
-            <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>
+            <description>en-session2SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
+            <description xml:lang="de">de-session2SecurityIdentity-desc</description>
             <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
          </security-identity>
 
          <resource-ref id="session2ResourceRef1-id">
-            <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>
+            <description>en-session2ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-session2ResourceRef1-desc</description>
+            <description xml:lang="de">de-session2ResourceRef1-desc</description>
             <res-ref-name>session2ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
@@ -661,9 +661,9 @@
             <ignore-dependency/>
          </resource-ref>
          <resource-ref id="session2ResourceRef2-id">
-            <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>
+            <description>en-session2ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-session2ResourceRef2-desc</description>
+            <description xml:lang="de">de-session2ResourceRef2-desc</description>
             <res-ref-name>session2ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
@@ -676,9 +676,9 @@
             <jndi-name>session2ResourceRef2JndiName</jndi-name>
          </resource-ref>
          <resource-env-ref id="session2ResourceEnvRef1-id">
-            <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>
+            <description>en-session2ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-session2ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-session2ResourceEnvRef1-desc</description>
             <resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -692,9 +692,9 @@
             <ignore-dependency/>
          </resource-env-ref>
          <resource-env-ref id="session2ResourceEnvRef2-id">
-            <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>
+            <description>en-session2ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-session2ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-session2ResourceEnvRef2-desc</description>
             <resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -707,9 +707,9 @@
             <jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
          <message-destination-ref id="session2MessageDestinationRef1-id">
-            <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>
+            <description>en-session2MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-session2MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-session2MessageDestinationRef1-desc</description>
             <message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -723,9 +723,9 @@
             <ignore-dependency/>
          </message-destination-ref>
          <message-destination-ref id="session2MessageDestinationRef2-id">
-            <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>
+            <description>en-session2MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-session2MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-session2MessageDestinationRef2-desc</description>
             <message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -738,9 +738,9 @@
             <jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
          <message-destination-ref id="session2MessageDestinationRef3-id">
-            <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>
+            <description>en-session2MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-session2MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-session2MessageDestinationRef3-desc</description>
             <message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -756,9 +756,9 @@
          <clustered>false</clustered>
          
          <cluster-config id="session2ClusterConfig-id">
-            <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>
+            <description>en-session2ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-session2ClusterConfig-desc</description>
+            <description xml:lang="de">de-session2ClusterConfig-desc</description>
             <partition-name>session2ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>session2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>session2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -783,13 +783,13 @@
          <depends>session2Depends2</depends>
          
          <ior-security-config id="session2IorSecurityConfig-id">
-            <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>
+            <description>en-session2IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
             <transport-config id="session2TransportConfig-id">
-               <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>
+               <description>en-session2TransportConfig-desc</description>
+               <description xml:lang="fr">fr-session2TransportConfig-desc</description>
+               <description xml:lang="de">de-session2TransportConfig-desc</description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -798,17 +798,17 @@
                <detect-replay>NONE</detect-replay>
             </transport-config>
             <as-context id="session2ASContext-id">
-               <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>
+               <description>en-session2ASContext-desc</description>
+               <description xml:lang="fr">fr-session2ASContext-desc</description>
+               <description xml:lang="de">de-session2ASContext-desc</description>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>session2ASContextRealm</realm>
                <required>false</required>
             </as-context>
             <sas-context id="session2SASContext-id">
-               <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>
+               <description>en-session2SASContext-desc</description>
+               <description xml:lang="fr">fr-session2SASContext-desc</description>
+               <description xml:lang="de">de-session2SASContext-desc</description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
@@ -822,16 +822,16 @@
          </port-component>         
          
          <ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
-            <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>
+            <description>en-session2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
             <run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
          
          <annotation id="session2Annotation1-id">
-            <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>
+            <description>en-session2Annotation1-desc</description>
+            <description xml:lang="fr">fr-session2Annotation1-desc</description>
+            <description xml:lang="de">de-session2Annotation1-desc</description>
             
             <annotation-class>session2Annotation1Class</annotation-class>
             <annotation-implementation-class>session2Annotation1Impl</annotation-implementation-class>
@@ -840,24 +840,24 @@
                <injection-target-name>session2Annotation1InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="session2Annotation1Property1-id">
-               <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>
+               <description>en-session2Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-session2Annotation1Property1-desc</description>
+               <description xml:lang="de">de-session2Annotation1Property1-desc</description>
                <property-name>session2Annotation1Property1Name</property-name>
                <property-value>session2Annotation1Property1Value</property-value>
             </property>
             <property id="session2Annotation1Property2-id">
-               <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>
+               <description>en-session2Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-session2Annotation1Property2-desc</description>
+               <description xml:lang="de">de-session2Annotation1Property2-desc</description>
                <property-name>session2Annotation1Property2Name</property-name>
                <property-value>session2Annotation1Property2Value</property-value>
             </property>
          </annotation>
          <annotation id="session2Annotation2-id">
-            <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>
+            <description>en-session2Annotation2-desc</description>
+            <description xml:lang="fr">fr-session2Annotation2-desc</description>
+            <description xml:lang="de">de-session2Annotation2-desc</description>
             
             <annotation-class>session2Annotation2Class</annotation-class>
             <annotation-implementation-class>session2Annotation2Impl</annotation-implementation-class>
@@ -866,25 +866,25 @@
                <injection-target-name>session2Annotation2InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="session2Annotation2Property1-id">
-               <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>
+               <description>en-session2Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-session2Annotation2Property1-desc</description>
+               <description xml:lang="de">de-session2Annotation2Property1-desc</description>
                <property-name>session2Annotation2Property1Name</property-name>
                <property-value>session2Annotation2Property1Value</property-value>
             </property>
             <property id="session2Annotation2Property2-id">
-               <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>
+               <description>en-session2Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-session2Annotation2Property2-desc</description>
+               <description xml:lang="de">de-session2Annotation2Property2-desc</description>
                <property-name>session2Annotation2Property2Name</property-name>
                <property-value>session2Annotation2Property2Value</property-value>
             </property>
          </annotation>
 
          <ignore-dependency id="session2IgnoreDependency-id">
-            <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>
+            <description>en-session2IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-session2IgnoreDependency-desc</description>
+            <description xml:lang="de">de-session2IgnoreDependency-desc</description>
             <injection-target>
                <injection-target-class>session2IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>session2IgnoreDependencyInjection1Name</injection-target-name>
@@ -904,9 +904,9 @@
          <concurrent>false</concurrent>         
          
          <jndi-ref id="session2JndiRef1-id">
-            <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>
+            <description>en-session2JndiRef1-desc</description>
+            <description xml:lang="fr">fr-session2JndiRef1-desc</description>
+            <description xml:lang="de">de-session2JndiRef1-desc</description>
             <jndi-ref-name>session2JndiRef1Name</jndi-ref-name>
             <mapped-name>session2JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -919,9 +919,9 @@
             </injection-target>
          </jndi-ref>
          <jndi-ref id="session2JndiRef2-id">
-            <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>
+            <description>en-session2JndiRef2-desc</description>
+            <description xml:lang="fr">fr-session2JndiRef2-desc</description>
+            <description xml:lang="de">de-session2JndiRef2-desc</description>
             <jndi-ref-name>session2JndiRef2Name</jndi-ref-name>
             <mapped-name>session2JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -941,24 +941,24 @@
       </entity>
 
       <entity id="entity1-id">
-         <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>
+         <description>en-entity1-desc</description>
+         <description xml:lang="fr">fr-entity1-desc</description>
+         <description xml:lang="de">de-entity1-desc</description>
+         <display-name>en-entity1-disp</display-name>
+         <display-name xml:lang="fr">fr-entity1-disp</display-name>
+         <display-name xml:lang="de">de-entity1-disp</display-name>
+         <icon id="en-entity1-icon-id">
+            <small-icon>en-entity1-small-icon</small-icon>
+            <large-icon>en-entity1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-entity1-icon-id">
+            <small-icon>fr-entity1-small-icon</small-icon>
+            <large-icon>fr-entity1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-entity1-icon-id">
+            <small-icon>de-entity1-small-icon</small-icon>
+            <large-icon>de-entity1-large-icon</large-icon>
+         </icon>
 
          <ejb-name>entity1EjbName</ejb-name>
 
@@ -971,23 +971,23 @@
          <configuration-name>entity1ConfigurationName</configuration-name>
          
          <invoker-bindings id="entity1InvokerBindings-id">
-            <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>
+            <description>en-entity1InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-entity1InvokerBindings-desc</description>
+            <description xml:lang="de">de-entity1InvokerBindings-desc</description>
 
             <invoker id="entity1Invoker1-id">
-               <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>
+               <description>en-entity1Invoker1-desc</description>
+               <description xml:lang="fr">fr-entity1Invoker1-desc</description>
+               <description xml:lang="de">de-entity1Invoker1-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
             <invoker id="entity1Invoker2-id">
-               <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>
+               <description>en-entity1Invoker2-desc</description>
+               <description xml:lang="fr">fr-entity1Invoker2-desc</description>
+               <description xml:lang="de">de-entity1Invoker2-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>entity1Invoker2JndiName</jndi-name>
@@ -998,9 +998,9 @@
          <security-proxy>entity1SecurityProxy</security-proxy>
          
          <ejb-ref id="entity1EjbRef1-id">
-            <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>
+            <description>en-entity1EjbRef1-desc</description>
+            <description xml:lang="fr">fr-entity1EjbRef1-desc</description>
+            <description xml:lang="de">de-entity1EjbRef1-desc</description>
 
             <ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -1015,9 +1015,9 @@
             <ignore-dependency/>
          </ejb-ref>
          <ejb-ref id="entity1EjbRef2-id">
-            <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>
+            <description>en-entity1EjbRef2-desc</description>
+            <description xml:lang="fr">fr-entity1EjbRef2-desc</description>
+            <description xml:lang="de">de-entity1EjbRef2-desc</description>
 
             <ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -1032,9 +1032,9 @@
          </ejb-ref>
 
          <ejb-local-ref id="entity1EjbLocalRef1-id">
-            <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>
+            <description>en-entity1EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-entity1EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-entity1EjbLocalRef1-desc</description>
 
             <ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -1049,9 +1049,9 @@
             <ignore-dependency/>
          </ejb-local-ref>
          <ejb-local-ref id="entity1EjbLocalRef2-id">
-            <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>
+            <description>en-entity1EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-entity1EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-entity1EjbLocalRef2-desc</description>
 
             <ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -1068,16 +1068,16 @@
          <!-- TODO service-ref -->
 
          <security-identity id="entity1SecurityIdentity-id">
-            <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>
+            <description>en-entity1SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
+            <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
             <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
          </security-identity>
 
          <resource-ref id="entity1ResourceRef1-id">
-            <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>
+            <description>en-entity1ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
+            <description xml:lang="de">de-entity1ResourceRef1-desc</description>
             <res-ref-name>entity1ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
@@ -1091,9 +1091,9 @@
             <ignore-dependency/>
          </resource-ref>
          <resource-ref id="entity1ResourceRef2-id">
-            <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>
+            <description>en-entity1ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceRef2-desc</description>
+            <description xml:lang="de">de-entity1ResourceRef2-desc</description>
             <res-ref-name>entity1ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
@@ -1106,9 +1106,9 @@
             <jndi-name>entity1ResourceRef2JndiName</jndi-name>
          </resource-ref>
          <resource-env-ref id="entity1ResourceEnvRef1-id">
-            <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>
+            <description>en-entity1ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-entity1ResourceEnvRef1-desc</description>
             <resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1122,9 +1122,9 @@
             <ignore-dependency/>
          </resource-env-ref>
          <resource-env-ref id="entity1ResourceEnvRef2-id">
-            <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>
+            <description>en-entity1ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-entity1ResourceEnvRef2-desc</description>
             <resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1137,9 +1137,9 @@
             <jndi-name>entity1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
          <message-destination-ref id="entity1MessageDestinationRef1-id">
-            <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>
+            <description>en-entity1MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-entity1MessageDestinationRef1-desc</description>
             <message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1153,9 +1153,9 @@
             <ignore-dependency/>
          </message-destination-ref>
          <message-destination-ref id="entity1MessageDestinationRef2-id">
-            <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>
+            <description>en-entity1MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-entity1MessageDestinationRef2-desc</description>
             <message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1168,9 +1168,9 @@
             <jndi-name>entity1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
          <message-destination-ref id="entity1MessageDestinationRef3-id">
-            <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>
+            <description>en-entity1MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-entity1MessageDestinationRef3-desc</description>
             <message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -1198,9 +1198,9 @@
          <clustered>true</clustered>
          
          <cluster-config id="entity1ClusterConfig-id">
-            <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>
+            <description>en-entity1ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-entity1ClusterConfig-desc</description>
+            <description xml:lang="de">de-entity1ClusterConfig-desc</description>
             <partition-name>entity1ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>entity1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>entity1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -1210,9 +1210,9 @@
          
          <cache-invalidation>true</cache-invalidation>
          <cache-invalidation-config id="entity1CacheInvalidationConfig-id">
-            <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>
+            <description>en-entity1CacheInvalidationConfig-desc</description>
+            <description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</description>
+            <description xml:lang="de">de-entity1CacheInvalidationConfig-desc</description>
             <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1221,13 +1221,13 @@
          <depends>entity1Depends2</depends>
          
          <ior-security-config id="entity1IorSecurityConfig-id">
-            <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>
+            <description>en-entity1IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-entity1IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-entity1IorSecurityConfig-desc</description>
             <transport-config id="entity1TransportConfig-id">
-               <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>
+               <description>en-entity1TransportConfig-desc</description>
+               <description xml:lang="fr">fr-entity1TransportConfig-desc</description>
+               <description xml:lang="de">de-entity1TransportConfig-desc</description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1236,25 +1236,25 @@
                <detect-replay>NONE</detect-replay>
             </transport-config>
             <as-context id="entity1ASContext-id">
-               <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>
+               <description>en-entity1ASContext-desc</description>
+               <description xml:lang="fr">fr-entity1ASContext-desc</description>
+               <description xml:lang="de">de-entity1ASContext-desc</description>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>entity1ASContextRealm</realm>
                <required>false</required>
             </as-context>
             <sas-context id="entity1SASContext-id">
-               <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>
+               <description>en-entity1SASContext-desc</description>
+               <description xml:lang="fr">fr-entity1SASContext-desc</description>
+               <description xml:lang="de">de-entity1SASContext-desc</description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
          <annotation id="entity1Annotation1-id">
-            <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>
+            <description>en-entity1Annotation1-desc</description>
+            <description xml:lang="fr">fr-entity1Annotation1-desc</description>
+            <description xml:lang="de">de-entity1Annotation1-desc</description>
             
             <annotation-class>entity1Annotation1Class</annotation-class>
             <annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
@@ -1263,24 +1263,24 @@
                <injection-target-name>entity1Annotation1InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="entity1Annotation1Property1-id">
-               <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>
+               <description>en-entity1Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation1Property1-desc</description>
+               <description xml:lang="de">de-entity1Annotation1Property1-desc</description>
                <property-name>entity1Annotation1Property1Name</property-name>
                <property-value>entity1Annotation1Property1Value</property-value>
             </property>
             <property id="entity1Annotation1Property2-id">
-               <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>
+               <description>en-entity1Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation1Property2-desc</description>
+               <description xml:lang="de">de-entity1Annotation1Property2-desc</description>
                <property-name>entity1Annotation1Property2Name</property-name>
                <property-value>entity1Annotation1Property2Value</property-value>
             </property>
          </annotation>
          <annotation id="entity1Annotation2-id">
-            <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>
+            <description>en-entity1Annotation2-desc</description>
+            <description xml:lang="fr">fr-entity1Annotation2-desc</description>
+            <description xml:lang="de">de-entity1Annotation2-desc</description>
             
             <annotation-class>entity1Annotation2Class</annotation-class>
             <annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
@@ -1289,25 +1289,25 @@
                <injection-target-name>entity1Annotation2InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="entity1Annotation2Property1-id">
-               <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>
+               <description>en-entity1Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation2Property1-desc</description>
+               <description xml:lang="de">de-entity1Annotation2Property1-desc</description>
                <property-name>entity1Annotation2Property1Name</property-name>
                <property-value>entity1Annotation2Property1Value</property-value>
             </property>
             <property id="entity1Annotation2Property2-id">
-               <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>
+               <description>en-entity1Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-entity1Annotation2Property2-desc</description>
+               <description xml:lang="de">de-entity1Annotation2Property2-desc</description>
                <property-name>entity1Annotation2Property2Name</property-name>
                <property-value>entity1Annotation2Property2Value</property-value>
             </property>
          </annotation>
 
          <ignore-dependency id="entity1IgnoreDependency-id">
-            <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>
+            <description>en-entity1IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-entity1IgnoreDependency-desc</description>
+            <description xml:lang="de">de-entity1IgnoreDependency-desc</description>
             <injection-target>
                <injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
@@ -1325,9 +1325,9 @@
          <!-- TODO pool config -->
          
          <jndi-ref id="entity1JndiRef1-id">
-            <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>
+            <description>en-entity1JndiRef1-desc</description>
+            <description xml:lang="fr">fr-entity1JndiRef1-desc</description>
+            <description xml:lang="de">de-entity1JndiRef1-desc</description>
             <jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
             <mapped-name>entity1JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -1340,9 +1340,9 @@
             </injection-target>
          </jndi-ref>
          <jndi-ref id="entity1JndiRef2-id">
-            <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>
+            <description>en-entity1JndiRef2-desc</description>
+            <description xml:lang="fr">fr-entity1JndiRef2-desc</description>
+            <description xml:lang="de">de-entity1JndiRef2-desc</description>
             <jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
             <mapped-name>entity1JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -1358,24 +1358,24 @@
       </entity>
 
       <entity id="entity2-id">
-         <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>
+         <description>en-entity2-desc</description>
+         <description xml:lang="fr">fr-entity2-desc</description>
+         <description xml:lang="de">de-entity2-desc</description>
+         <display-name>en-entity2-disp</display-name>
+         <display-name xml:lang="fr">fr-entity2-disp</display-name>
+         <display-name xml:lang="de">de-entity2-disp</display-name>
+         <icon id="en-entity2-icon-id">
+            <small-icon>en-entity2-small-icon</small-icon>
+            <large-icon>en-entity2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-entity2-icon-id">
+            <small-icon>fr-entity2-small-icon</small-icon>
+            <large-icon>fr-entity2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-entity2-icon-id">
+            <small-icon>de-entity2-small-icon</small-icon>
+            <large-icon>de-entity2-large-icon</large-icon>
+         </icon>
 
          <ejb-name>entity2EjbName</ejb-name>
 
@@ -1388,23 +1388,23 @@
          <configuration-name>entity2ConfigurationName</configuration-name>
          
          <invoker-bindings id="entity2InvokerBindings-id">
-            <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>
+            <description>en-entity2InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-entity2InvokerBindings-desc</description>
+            <description xml:lang="de">de-entity2InvokerBindings-desc</description>
 
             <invoker id="entity2Invoker1-id">
-               <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>
+               <description>en-entity2Invoker1-desc</description>
+               <description xml:lang="fr">fr-entity2Invoker1-desc</description>
+               <description xml:lang="de">de-entity2Invoker1-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
             <invoker id="entity2Invoker2-id">
-               <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>
+               <description>en-entity2Invoker2-desc</description>
+               <description xml:lang="fr">fr-entity2Invoker2-desc</description>
+               <description xml:lang="de">de-entity2Invoker2-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>entity2Invoker2JndiName</jndi-name>
@@ -1415,9 +1415,9 @@
          <security-proxy>entity2SecurityProxy</security-proxy>
          
          <ejb-ref id="entity2EjbRef1-id">
-            <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>
+            <description>en-entity2EjbRef1-desc</description>
+            <description xml:lang="fr">fr-entity2EjbRef1-desc</description>
+            <description xml:lang="de">de-entity2EjbRef1-desc</description>
 
             <ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -1432,9 +1432,9 @@
             <ignore-dependency/>
          </ejb-ref>
          <ejb-ref id="entity2EjbRef2-id">
-            <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>
+            <description>en-entity2EjbRef2-desc</description>
+            <description xml:lang="fr">fr-entity2EjbRef2-desc</description>
+            <description xml:lang="de">de-entity2EjbRef2-desc</description>
 
             <ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -1449,9 +1449,9 @@
          </ejb-ref>
 
          <ejb-local-ref id="entity2EjbLocalRef1-id">
-            <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>
+            <description>en-entity2EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-entity2EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-entity2EjbLocalRef1-desc</description>
 
             <ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -1466,9 +1466,9 @@
             <ignore-dependency/>
          </ejb-local-ref>
          <ejb-local-ref id="entity2EjbLocalRef2-id">
-            <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>
+            <description>en-entity2EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-entity2EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-entity2EjbLocalRef2-desc</description>
 
             <ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -1485,16 +1485,16 @@
          <!-- TODO service-ref -->
 
          <security-identity id="entity2SecurityIdentity-id">
-            <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>
+            <description>en-entity2SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
+            <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
             <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
          </security-identity>
 
          <resource-ref id="entity2ResourceRef1-id">
-            <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>
+            <description>en-entity2ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
+            <description xml:lang="de">de-entity2ResourceRef1-desc</description>
             <res-ref-name>entity2ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
@@ -1508,9 +1508,9 @@
             <ignore-dependency/>
          </resource-ref>
          <resource-ref id="entity2ResourceRef2-id">
-            <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>
+            <description>en-entity2ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceRef2-desc</description>
+            <description xml:lang="de">de-entity2ResourceRef2-desc</description>
             <res-ref-name>entity2ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
@@ -1523,9 +1523,9 @@
             <jndi-name>entity2ResourceRef2JndiName</jndi-name>
          </resource-ref>
          <resource-env-ref id="entity2ResourceEnvRef1-id">
-            <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>
+            <description>en-entity2ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-entity2ResourceEnvRef1-desc</description>
             <resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1539,9 +1539,9 @@
             <ignore-dependency/>
          </resource-env-ref>
          <resource-env-ref id="entity2ResourceEnvRef2-id">
-            <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>
+            <description>en-entity2ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-entity2ResourceEnvRef2-desc</description>
             <resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1554,9 +1554,9 @@
             <jndi-name>entity2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
          <message-destination-ref id="entity2MessageDestinationRef1-id">
-            <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>
+            <description>en-entity2MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-entity2MessageDestinationRef1-desc</description>
             <message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1570,9 +1570,9 @@
             <ignore-dependency/>
          </message-destination-ref>
          <message-destination-ref id="entity2MessageDestinationRef2-id">
-            <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>
+            <description>en-entity2MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-entity2MessageDestinationRef2-desc</description>
             <message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1585,9 +1585,9 @@
             <jndi-name>entity2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
          <message-destination-ref id="entity2MessageDestinationRef3-id">
-            <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>
+            <description>en-entity2MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-entity2MessageDestinationRef3-desc</description>
             <message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -1615,9 +1615,9 @@
          <clustered>false</clustered>
          
          <cluster-config id="entity2ClusterConfig-id">
-            <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>
+            <description>en-entity2ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-entity2ClusterConfig-desc</description>
+            <description xml:lang="de">de-entity2ClusterConfig-desc</description>
             <partition-name>entity2ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>entity2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>entity2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -1627,9 +1627,9 @@
 
          <cache-invalidation>false</cache-invalidation>
          <cache-invalidation-config id="entity2CacheInvalidationConfig-id">
-            <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>
+            <description>en-entity2CacheInvalidationConfig-desc</description>
+            <description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</description>
+            <description xml:lang="de">de-entity2CacheInvalidationConfig-desc</description>
             <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
             <invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
          </cache-invalidation-config>
@@ -1638,13 +1638,13 @@
          <depends>entity2Depends2</depends>
          
          <ior-security-config id="entity2IorSecurityConfig-id">
-            <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>
+            <description>en-entity2IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-entity2IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-entity2IorSecurityConfig-desc</description>
             <transport-config id="entity2TransportConfig-id">
-               <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>
+               <description>en-entity2TransportConfig-desc</description>
+               <description xml:lang="fr">fr-entity2TransportConfig-desc</description>
+               <description xml:lang="de">de-entity2TransportConfig-desc</description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1653,25 +1653,25 @@
                <detect-replay>NONE</detect-replay>
             </transport-config>
             <as-context id="entity2ASContext-id">
-               <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>
+               <description>en-entity2ASContext-desc</description>
+               <description xml:lang="fr">fr-entity2ASContext-desc</description>
+               <description xml:lang="de">de-entity2ASContext-desc</description>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>entity2ASContextRealm</realm>
                <required>false</required>
             </as-context>
             <sas-context id="entity2SASContext-id">
-               <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>
+               <description>en-entity2SASContext-desc</description>
+               <description xml:lang="fr">fr-entity2SASContext-desc</description>
+               <description xml:lang="de">de-entity2SASContext-desc</description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
          <annotation id="entity2Annotation1-id">
-            <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>
+            <description>en-entity2Annotation1-desc</description>
+            <description xml:lang="fr">fr-entity2Annotation1-desc</description>
+            <description xml:lang="de">de-entity2Annotation1-desc</description>
             
             <annotation-class>entity2Annotation1Class</annotation-class>
             <annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
@@ -1680,24 +1680,24 @@
                <injection-target-name>entity2Annotation1InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="entity2Annotation1Property1-id">
-               <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>
+               <description>en-entity2Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation1Property1-desc</description>
+               <description xml:lang="de">de-entity2Annotation1Property1-desc</description>
                <property-name>entity2Annotation1Property1Name</property-name>
                <property-value>entity2Annotation1Property1Value</property-value>
             </property>
             <property id="entity2Annotation1Property2-id">
-               <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>
+               <description>en-entity2Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation1Property2-desc</description>
+               <description xml:lang="de">de-entity2Annotation1Property2-desc</description>
                <property-name>entity2Annotation1Property2Name</property-name>
                <property-value>entity2Annotation1Property2Value</property-value>
             </property>
          </annotation>
          <annotation id="entity2Annotation2-id">
-            <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>
+            <description>en-entity2Annotation2-desc</description>
+            <description xml:lang="fr">fr-entity2Annotation2-desc</description>
+            <description xml:lang="de">de-entity2Annotation2-desc</description>
             
             <annotation-class>entity2Annotation2Class</annotation-class>
             <annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
@@ -1706,25 +1706,25 @@
                <injection-target-name>entity2Annotation2InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="entity2Annotation2Property1-id">
-               <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>
+               <description>en-entity2Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation2Property1-desc</description>
+               <description xml:lang="de">de-entity2Annotation2Property1-desc</description>
                <property-name>entity2Annotation2Property1Name</property-name>
                <property-value>entity2Annotation2Property1Value</property-value>
             </property>
             <property id="entity2Annotation2Property2-id">
-               <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>
+               <description>en-entity2Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-entity2Annotation2Property2-desc</description>
+               <description xml:lang="de">de-entity2Annotation2Property2-desc</description>
                <property-name>entity2Annotation2Property2Name</property-name>
                <property-value>entity2Annotation2Property2Value</property-value>
             </property>
          </annotation>
 
          <ignore-dependency id="entity2IgnoreDependency-id">
-            <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>
+            <description>en-entity2IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-entity2IgnoreDependency-desc</description>
+            <description xml:lang="de">de-entity2IgnoreDependency-desc</description>
             <injection-target>
                <injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
@@ -1742,9 +1742,9 @@
          <!-- TODO pool config -->
          
          <jndi-ref id="entity2JndiRef1-id">
-            <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>
+            <description>en-entity2JndiRef1-desc</description>
+            <description xml:lang="fr">fr-entity2JndiRef1-desc</description>
+            <description xml:lang="de">de-entity2JndiRef1-desc</description>
             <jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
             <mapped-name>entity2JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -1757,9 +1757,9 @@
             </injection-target>
          </jndi-ref>
          <jndi-ref id="entity2JndiRef2-id">
-            <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>
+            <description>en-entity2JndiRef2-desc</description>
+            <description xml:lang="fr">fr-entity2JndiRef2-desc</description>
+            <description xml:lang="de">de-entity2JndiRef2-desc</description>
             <jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
             <mapped-name>entity2JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -1779,24 +1779,24 @@
       </message-driven>
 
       <message-driven id="mdb1-id">
-         <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>
+         <description>en-mdb1-desc</description>
+         <description xml:lang="fr">fr-mdb1-desc</description>
+         <description xml:lang="de">de-mdb1-desc</description>
+         <display-name>en-mdb1-disp</display-name>
+         <display-name xml:lang="fr">fr-mdb1-disp</display-name>
+         <display-name xml:lang="de">de-mdb1-disp</display-name>
+         <icon id="en-mdb1-icon-id">
+            <small-icon>en-mdb1-small-icon</small-icon>
+            <large-icon>en-mdb1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-mdb1-icon-id">
+            <small-icon>fr-mdb1-small-icon</small-icon>
+            <large-icon>fr-mdb1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-mdb1-icon-id">
+            <small-icon>de-mdb1-small-icon</small-icon>
+            <large-icon>de-mdb1-large-icon</large-icon>
+         </icon>
 
          <ejb-name>mdb1EjbName</ejb-name>
 
@@ -1812,23 +1812,23 @@
          <configuration-name>mdb1ConfigurationName</configuration-name>
          
          <invoker-bindings id="mdb1InvokerBindings-id">
-            <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>
+            <description>en-mdb1InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-mdb1InvokerBindings-desc</description>
+            <description xml:lang="de">de-mdb1InvokerBindings-desc</description>
 
             <invoker id="mdb1Invoker1-id">
-               <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>
+               <description>en-mdb1Invoker1-desc</description>
+               <description xml:lang="fr">fr-mdb1Invoker1-desc</description>
+               <description xml:lang="de">de-mdb1Invoker1-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
             <invoker id="mdb1Invoker2-id">
-               <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>
+               <description>en-mdb1Invoker2-desc</description>
+               <description xml:lang="fr">fr-mdb1Invoker2-desc</description>
+               <description xml:lang="de">de-mdb1Invoker2-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>mdb1Invoker2JndiName</jndi-name>
@@ -1839,9 +1839,9 @@
          <security-proxy>mdb1SecurityProxy</security-proxy>
          
          <ejb-ref id="mdb1EjbRef1-id">
-            <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>
+            <description>en-mdb1EjbRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbRef1-desc</description>
+            <description xml:lang="de">de-mdb1EjbRef1-desc</description>
 
             <ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -1856,9 +1856,9 @@
             <ignore-dependency/>
          </ejb-ref>
          <ejb-ref id="mdb1EjbRef2-id">
-            <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>
+            <description>en-mdb1EjbRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbRef2-desc</description>
+            <description xml:lang="de">de-mdb1EjbRef2-desc</description>
 
             <ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -1873,9 +1873,9 @@
          </ejb-ref>
 
          <ejb-local-ref id="mdb1EjbLocalRef1-id">
-            <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>
+            <description>en-mdb1EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-mdb1EjbLocalRef1-desc</description>
 
             <ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -1890,9 +1890,9 @@
             <ignore-dependency/>
          </ejb-local-ref>
          <ejb-local-ref id="mdb1EjbLocalRef2-id">
-            <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>
+            <description>en-mdb1EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-mdb1EjbLocalRef2-desc</description>
 
             <ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -1909,16 +1909,16 @@
          <!-- TODO service-ref -->
 
          <security-identity id="mdb1SecurityIdentity-id">
-            <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>
+            <description>en-mdb1SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
+            <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
             <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
          </security-identity>
 
          <resource-ref id="mdb1ResourceRef1-id">
-            <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>
+            <description>en-mdb1ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
+            <description xml:lang="de">de-mdb1ResourceRef1-desc</description>
             <res-ref-name>mdb1ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
@@ -1932,9 +1932,9 @@
             <ignore-dependency/>
          </resource-ref>
          <resource-ref id="mdb1ResourceRef2-id">
-            <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>
+            <description>en-mdb1ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceRef2-desc</description>
+            <description xml:lang="de">de-mdb1ResourceRef2-desc</description>
             <res-ref-name>mdb1ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
@@ -1947,9 +1947,9 @@
             <jndi-name>mdb1ResourceRef2JndiName</jndi-name>
          </resource-ref>
          <resource-env-ref id="mdb1ResourceEnvRef1-id">
-            <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>
+            <description>en-mdb1ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-mdb1ResourceEnvRef1-desc</description>
             <resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1963,9 +1963,9 @@
             <ignore-dependency/>
          </resource-env-ref>
          <resource-env-ref id="mdb1ResourceEnvRef2-id">
-            <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>
+            <description>en-mdb1ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-mdb1ResourceEnvRef2-desc</description>
             <resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1978,9 +1978,9 @@
             <jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
          <message-destination-ref id="mdb1MessageDestinationRef1-id">
-            <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>
+            <description>en-mdb1MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-mdb1MessageDestinationRef1-desc</description>
             <message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1994,9 +1994,9 @@
             <ignore-dependency/>
          </message-destination-ref>
          <message-destination-ref id="mdb1MessageDestinationRef2-id">
-            <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>
+            <description>en-mdb1MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-mdb1MessageDestinationRef2-desc</description>
             <message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -2009,9 +2009,9 @@
             <jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
          <message-destination-ref id="mdb1MessageDestinationRef3-id">
-            <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>
+            <description>en-mdb1MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-mdb1MessageDestinationRef3-desc</description>
             <message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -2040,13 +2040,13 @@
          <depends>mdb1Depends2</depends>
          
          <ior-security-config id="mdb1IorSecurityConfig-id">
-            <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>
+            <description>en-mdb1IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-mdb1IorSecurityConfig-desc</description>
             <transport-config id="mdb1TransportConfig-id">
-               <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>
+               <description>en-mdb1TransportConfig-desc</description>
+               <description xml:lang="fr">fr-mdb1TransportConfig-desc</description>
+               <description xml:lang="de">de-mdb1TransportConfig-desc</description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2055,32 +2055,32 @@
                <detect-replay>NONE</detect-replay>
             </transport-config>
             <as-context id="mdb1ASContext-id">
-               <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>
+               <description>en-mdb1ASContext-desc</description>
+               <description xml:lang="fr">fr-mdb1ASContext-desc</description>
+               <description xml:lang="de">de-mdb1ASContext-desc</description>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>mdb1ASContextRealm</realm>
                <required>false</required>
             </as-context>
             <sas-context id="mdb1SASContext-id">
-               <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>
+               <description>en-mdb1SASContext-desc</description>
+               <description xml:lang="fr">fr-mdb1SASContext-desc</description>
+               <description xml:lang="de">de-mdb1SASContext-desc</description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
          <ejb-timeout-identity id="mdb1EjbTimeoutIdentity-id">
-            <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>
+            <description>en-mdb1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</description>
             <run-as-principal>mdb1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
          
          <annotation id="mdb1Annotation1-id">
-            <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>
+            <description>en-mdb1Annotation1-desc</description>
+            <description xml:lang="fr">fr-mdb1Annotation1-desc</description>
+            <description xml:lang="de">de-mdb1Annotation1-desc</description>
             
             <annotation-class>mdb1Annotation1Class</annotation-class>
             <annotation-implementation-class>mdb1Annotation1Impl</annotation-implementation-class>
@@ -2089,24 +2089,24 @@
                <injection-target-name>mdb1Annotation1InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="mdb1Annotation1Property1-id">
-               <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>
+               <description>en-mdb1Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation1Property1-desc</description>
+               <description xml:lang="de">de-mdb1Annotation1Property1-desc</description>
                <property-name>mdb1Annotation1Property1Name</property-name>
                <property-value>mdb1Annotation1Property1Value</property-value>
             </property>
             <property id="mdb1Annotation1Property2-id">
-               <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>
+               <description>en-mdb1Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation1Property2-desc</description>
+               <description xml:lang="de">de-mdb1Annotation1Property2-desc</description>
                <property-name>mdb1Annotation1Property2Name</property-name>
                <property-value>mdb1Annotation1Property2Value</property-value>
             </property>
          </annotation>
          <annotation id="mdb1Annotation2-id">
-            <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>
+            <description>en-mdb1Annotation2-desc</description>
+            <description xml:lang="fr">fr-mdb1Annotation2-desc</description>
+            <description xml:lang="de">de-mdb1Annotation2-desc</description>
             
             <annotation-class>mdb1Annotation2Class</annotation-class>
             <annotation-implementation-class>mdb1Annotation2Impl</annotation-implementation-class>
@@ -2115,25 +2115,25 @@
                <injection-target-name>mdb1Annotation2InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="mdb1Annotation2Property1-id">
-               <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>
+               <description>en-mdb1Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation2Property1-desc</description>
+               <description xml:lang="de">de-mdb1Annotation2Property1-desc</description>
                <property-name>mdb1Annotation2Property1Name</property-name>
                <property-value>mdb1Annotation2Property1Value</property-value>
             </property>
             <property id="mdb1Annotation2Property2-id">
-               <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>
+               <description>en-mdb1Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-mdb1Annotation2Property2-desc</description>
+               <description xml:lang="de">de-mdb1Annotation2Property2-desc</description>
                <property-name>mdb1Annotation2Property2Name</property-name>
                <property-value>mdb1Annotation2Property2Value</property-value>
             </property>
          </annotation>
 
          <ignore-dependency id="mdb1IgnoreDependency-id">
-            <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>
+            <description>en-mdb1IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-mdb1IgnoreDependency-desc</description>
+            <description xml:lang="de">de-mdb1IgnoreDependency-desc</description>
             <injection-target>
                <injection-target-class>mdb1IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>mdb1IgnoreDependencyInjection1Name</injection-target-name>
@@ -2149,9 +2149,9 @@
          <!-- TODO pool config -->
 
          <jndi-ref id="mdb1JndiRef1-id">
-            <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>
+            <description>en-mdb1JndiRef1-desc</description>
+            <description xml:lang="fr">fr-mdb1JndiRef1-desc</description>
+            <description xml:lang="de">de-mdb1JndiRef1-desc</description>
             <jndi-ref-name>mdb1JndiRef1Name</jndi-ref-name>
             <mapped-name>mdb1JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -2164,9 +2164,9 @@
             </injection-target>
          </jndi-ref>
          <jndi-ref id="mdb1JndiRef2-id">
-            <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>
+            <description>en-mdb1JndiRef2-desc</description>
+            <description xml:lang="fr">fr-mdb1JndiRef2-desc</description>
+            <description xml:lang="de">de-mdb1JndiRef2-desc</description>
             <jndi-ref-name>mdb1JndiRef2Name</jndi-ref-name>
             <mapped-name>mdb1JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -2193,24 +2193,24 @@
       </message-driven>
 
       <message-driven id="mdb2-id">
-         <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>
+         <description>en-mdb2-desc</description>
+         <description xml:lang="fr">fr-mdb2-desc</description>
+         <description xml:lang="de">de-mdb2-desc</description>
+         <display-name>en-mdb2-disp</display-name>
+         <display-name xml:lang="fr">fr-mdb2-disp</display-name>
+         <display-name xml:lang="de">de-mdb2-disp</display-name>
+         <icon id="en-mdb2-icon-id">
+            <small-icon>en-mdb2-small-icon</small-icon>
+            <large-icon>en-mdb2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-mdb2-icon-id">
+            <small-icon>fr-mdb2-small-icon</small-icon>
+            <large-icon>fr-mdb2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-mdb2-icon-id">
+            <small-icon>de-mdb2-small-icon</small-icon>
+            <large-icon>de-mdb2-large-icon</large-icon>
+         </icon>
 
          <ejb-name>mdb2EjbName</ejb-name>
 
@@ -2226,23 +2226,23 @@
          <configuration-name>mdb2ConfigurationName</configuration-name>
          
          <invoker-bindings id="mdb2InvokerBindings-id">
-            <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>
+            <description>en-mdb2InvokerBindings-desc</description>
+            <description xml:lang="fr">fr-mdb2InvokerBindings-desc</description>
+            <description xml:lang="de">de-mdb2InvokerBindings-desc</description>
 
             <invoker id="mdb2Invoker1-id">
-               <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>
+               <description>en-mdb2Invoker1-desc</description>
+               <description xml:lang="fr">fr-mdb2Invoker1-desc</description>
+               <description xml:lang="de">de-mdb2Invoker1-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker1JndiName</jndi-name>
                <!-- TODO ejb-ref -->
             </invoker>
             <invoker id="mdb2Invoker2-id">
-               <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>
+               <description>en-mdb2Invoker2-desc</description>
+               <description xml:lang="fr">fr-mdb2Invoker2-desc</description>
+               <description xml:lang="de">de-mdb2Invoker2-desc</description>
                
                <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
                <jndi-name>mdb2Invoker2JndiName</jndi-name>
@@ -2253,9 +2253,9 @@
          <security-proxy>mdb2SecurityProxy</security-proxy>
          
          <ejb-ref id="mdb2EjbRef1-id">
-            <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>
+            <description>en-mdb2EjbRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbRef1-desc</description>
+            <description xml:lang="de">de-mdb2EjbRef1-desc</description>
 
             <ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
             <injection-target>
@@ -2270,9 +2270,9 @@
             <ignore-dependency/>
          </ejb-ref>
          <ejb-ref id="mdb2EjbRef2-id">
-            <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>
+            <description>en-mdb2EjbRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbRef2-desc</description>
+            <description xml:lang="de">de-mdb2EjbRef2-desc</description>
 
             <ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
             <injection-target>
@@ -2287,9 +2287,9 @@
          </ejb-ref>
 
          <ejb-local-ref id="mdb2EjbLocalRef1-id">
-            <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>
+            <description>en-mdb2EjbLocalRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</description>
+            <description xml:lang="de">de-mdb2EjbLocalRef1-desc</description>
 
             <ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
             <injection-target>
@@ -2304,9 +2304,9 @@
             <ignore-dependency/>
          </ejb-local-ref>
          <ejb-local-ref id="mdb2EjbLocalRef2-id">
-            <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>
+            <description>en-mdb2EjbLocalRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</description>
+            <description xml:lang="de">de-mdb2EjbLocalRef2-desc</description>
 
             <ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
             <injection-target>
@@ -2323,16 +2323,16 @@
          <!-- TODO service-ref -->
 
          <security-identity id="mdb2SecurityIdentity-id">
-            <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>
+            <description>en-mdb2SecurityIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
+            <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
             <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
          </security-identity>
 
          <resource-ref id="mdb2ResourceRef1-id">
-            <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>
+            <description>en-mdb2ResourceRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
+            <description xml:lang="de">de-mdb2ResourceRef1-desc</description>
             <res-ref-name>mdb2ResourceRef1Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
@@ -2346,9 +2346,9 @@
             <ignore-dependency/>
          </resource-ref>
          <resource-ref id="mdb2ResourceRef2-id">
-            <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>
+            <description>en-mdb2ResourceRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceRef2-desc</description>
+            <description xml:lang="de">de-mdb2ResourceRef2-desc</description>
             <res-ref-name>mdb2ResourceRef2Name</res-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
@@ -2361,9 +2361,9 @@
             <jndi-name>mdb2ResourceRef2JndiName</jndi-name>
          </resource-ref>
          <resource-env-ref id="mdb2ResourceEnvRef1-id">
-            <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>
+            <description>en-mdb2ResourceEnvRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</description>
+            <description xml:lang="de">de-mdb2ResourceEnvRef1-desc</description>
             <resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -2377,9 +2377,9 @@
             <ignore-dependency/>
          </resource-env-ref>
          <resource-env-ref id="mdb2ResourceEnvRef2-id">
-            <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>
+            <description>en-mdb2ResourceEnvRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</description>
+            <description xml:lang="de">de-mdb2ResourceEnvRef2-desc</description>
             <resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
             <injection-target>
                <injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -2392,9 +2392,9 @@
             <jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
          </resource-env-ref>
          <message-destination-ref id="mdb2MessageDestinationRef1-id">
-            <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>
+            <description>en-mdb2MessageDestinationRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</description>
+            <description xml:lang="de">de-mdb2MessageDestinationRef1-desc</description>
             <message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -2408,9 +2408,9 @@
             <ignore-dependency/>
          </message-destination-ref>
          <message-destination-ref id="mdb2MessageDestinationRef2-id">
-            <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>
+            <description>en-mdb2MessageDestinationRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</description>
+            <description xml:lang="de">de-mdb2MessageDestinationRef2-desc</description>
             <message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -2423,9 +2423,9 @@
             <jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
          </message-destination-ref>
          <message-destination-ref id="mdb2MessageDestinationRef3-id">
-            <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>
+            <description>en-mdb2MessageDestinationRef3-desc</description>
+            <description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</description>
+            <description xml:lang="de">de-mdb2MessageDestinationRef3-desc</description>
             <message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
             <injection-target>
                <injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -2454,13 +2454,13 @@
          <depends>mdb2Depends2</depends>
          
          <ior-security-config id="mdb2IorSecurityConfig-id">
-            <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>
+            <description>en-mdb2IorSecurityConfig-desc</description>
+            <description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</description>
+            <description xml:lang="de">de-mdb2IorSecurityConfig-desc</description>
             <transport-config id="mdb2TransportConfig-id">
-               <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>
+               <description>en-mdb2TransportConfig-desc</description>
+               <description xml:lang="fr">fr-mdb2TransportConfig-desc</description>
+               <description xml:lang="de">de-mdb2TransportConfig-desc</description>
                <integrity>NONE</integrity>
                <confidentiality>NONE</confidentiality>
                <establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2469,32 +2469,32 @@
                <detect-replay>NONE</detect-replay>
             </transport-config>
             <as-context id="mdb2ASContext-id">
-               <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>
+               <description>en-mdb2ASContext-desc</description>
+               <description xml:lang="fr">fr-mdb2ASContext-desc</description>
+               <description xml:lang="de">de-mdb2ASContext-desc</description>
                <auth-method>USERNAME_PASSWORD</auth-method>
                <realm>mdb2ASContextRealm</realm>
                <required>false</required>
             </as-context>
             <sas-context id="mdb2SASContext-id">
-               <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>
+               <description>en-mdb2SASContext-desc</description>
+               <description xml:lang="fr">fr-mdb2SASContext-desc</description>
+               <description xml:lang="de">de-mdb2SASContext-desc</description>
                <caller-propagation>NONE</caller-propagation>
             </sas-context>
          </ior-security-config>
          
          <ejb-timeout-identity id="mdb2EjbTimeoutIdentity-id">
-            <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>
+            <description>en-mdb2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</description>
+            <description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</description>
             <run-as-principal>mdb2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
          </ejb-timeout-identity>
          
          <annotation id="mdb2Annotation1-id">
-            <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>
+            <description>en-mdb2Annotation1-desc</description>
+            <description xml:lang="fr">fr-mdb2Annotation1-desc</description>
+            <description xml:lang="de">de-mdb2Annotation1-desc</description>
             
             <annotation-class>mdb2Annotation1Class</annotation-class>
             <annotation-implementation-class>mdb2Annotation1Impl</annotation-implementation-class>
@@ -2503,24 +2503,24 @@
                <injection-target-name>mdb2Annotation1InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="mdb2Annotation1Property1-id">
-               <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>
+               <description>en-mdb2Annotation1Property1-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation1Property1-desc</description>
+               <description xml:lang="de">de-mdb2Annotation1Property1-desc</description>
                <property-name>mdb2Annotation1Property1Name</property-name>
                <property-value>mdb2Annotation1Property1Value</property-value>
             </property>
             <property id="mdb2Annotation1Property2-id">
-               <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>
+               <description>en-mdb2Annotation1Property2-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation1Property2-desc</description>
+               <description xml:lang="de">de-mdb2Annotation1Property2-desc</description>
                <property-name>mdb2Annotation1Property2Name</property-name>
                <property-value>mdb2Annotation1Property2Value</property-value>
             </property>
          </annotation>
          <annotation id="mdb2Annotation2-id">
-            <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>
+            <description>en-mdb2Annotation2-desc</description>
+            <description xml:lang="fr">fr-mdb2Annotation2-desc</description>
+            <description xml:lang="de">de-mdb2Annotation2-desc</description>
             
             <annotation-class>mdb2Annotation2Class</annotation-class>
             <annotation-implementation-class>mdb2Annotation2Impl</annotation-implementation-class>
@@ -2529,25 +2529,25 @@
                <injection-target-name>mdb2Annotation2InjectionTargetName</injection-target-name>
             </injection-target>
             <property id="mdb2Annotation2Property1-id">
-               <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>
+               <description>en-mdb2Annotation2Property1-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation2Property1-desc</description>
+               <description xml:lang="de">de-mdb2Annotation2Property1-desc</description>
                <property-name>mdb2Annotation2Property1Name</property-name>
                <property-value>mdb2Annotation2Property1Value</property-value>
             </property>
             <property id="mdb2Annotation2Property2-id">
-               <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>
+               <description>en-mdb2Annotation2Property2-desc</description>
+               <description xml:lang="fr">fr-mdb2Annotation2Property2-desc</description>
+               <description xml:lang="de">de-mdb2Annotation2Property2-desc</description>
                <property-name>mdb2Annotation2Property2Name</property-name>
                <property-value>mdb2Annotation2Property2Value</property-value>
             </property>
          </annotation>
 
          <ignore-dependency id="mdb2IgnoreDependency-id">
-            <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>
+            <description>en-mdb2IgnoreDependency-desc</description>
+            <description xml:lang="fr">fr-mdb2IgnoreDependency-desc</description>
+            <description xml:lang="de">de-mdb2IgnoreDependency-desc</description>
             <injection-target>
                <injection-target-class>mdb2IgnoreDependencyInjection1Class</injection-target-class>
                <injection-target-name>mdb2IgnoreDependencyInjection1Name</injection-target-name>
@@ -2563,9 +2563,9 @@
          <!-- TODO pool config -->
 
          <jndi-ref id="mdb2JndiRef1-id">
-            <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>
+            <description>en-mdb2JndiRef1-desc</description>
+            <description xml:lang="fr">fr-mdb2JndiRef1-desc</description>
+            <description xml:lang="de">de-mdb2JndiRef1-desc</description>
             <jndi-ref-name>mdb2JndiRef1Name</jndi-ref-name>
             <mapped-name>mdb2JndiRef1MappedName</mapped-name>
             <injection-target>
@@ -2578,9 +2578,9 @@
             </injection-target>
          </jndi-ref>
          <jndi-ref id="mdb2JndiRef2-id">
-            <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>
+            <description>en-mdb2JndiRef2-desc</description>
+            <description xml:lang="fr">fr-mdb2JndiRef2-desc</description>
+            <description xml:lang="de">de-mdb2JndiRef2-desc</description>
             <jndi-ref-name>mdb2JndiRef2Name</jndi-ref-name>
             <mapped-name>mdb2JndiRef2MappedName</mapped-name>
             <injection-target>
@@ -2611,63 +2611,63 @@
    <assembly-descriptor id="assembly-descriptor-id">
 
       <security-role id="securityRole1-id">
-         <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>
+         <description>en-securityRole1-desc</description>
+         <description xml:lang="fr">fr-securityRole1-desc</description>
+         <description xml:lang="de">de-securityRole1-desc</description>
          <role-name>securityRoleRef1RoleLink</role-name>
          <principal>securityRole1Principal1</principal>
          <principal>securityRole1Principal2</principal>
       </security-role>
       <security-role id="securityRole2-id">
-         <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>
+         <description>en-securityRole2-desc</description>
+         <description xml:lang="fr">fr-securityRole2-desc</description>
+         <description xml:lang="de">de-securityRole2-desc</description>
          <role-name>securityRoleRef2RoleLink</role-name>
          <principal>securityRole2Principal1</principal>
          <principal>securityRole2Principal2</principal>
       </security-role>
 
       <message-destination id="messageDestination1-id">
-         <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>
+         <description>en-messageDestination1-desc</description>
+         <description xml:lang="fr">fr-messageDestination1-desc</description>
+         <description xml:lang="de">de-messageDestination1-desc</description>
+         <display-name>en-messageDestination1-disp</display-name>
+         <display-name xml:lang="fr">fr-messageDestination1-disp</display-name>
+         <display-name xml:lang="de">de-messageDestination1-disp</display-name>
+         <icon id="en-messageDestination1-icon-id">
+            <small-icon>en-messageDestination1-small-icon</small-icon>
+            <large-icon>en-messageDestination1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-messageDestination1-icon-id">
+            <small-icon>fr-messageDestination1-small-icon</small-icon>
+            <large-icon>fr-messageDestination1-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-messageDestination1-icon-id">
+            <small-icon>de-messageDestination1-small-icon</small-icon>
+            <large-icon>de-messageDestination1-large-icon</large-icon>
+         </icon>
          <message-destination-name>messageDestination1Name</message-destination-name>
          <jndi-name>messageDestination1JndiName</jndi-name>
       </message-destination>
       <message-destination id="messageDestination2-id">
-         <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>
+         <description>en-messageDestination2-desc</description>
+         <description xml:lang="fr">fr-messageDestination2-desc</description>
+         <description xml:lang="de">de-messageDestination2-desc</description>
+         <display-name>en-messageDestination2-disp</display-name>
+         <display-name xml:lang="fr">fr-messageDestination2-disp</display-name>
+         <display-name xml:lang="de">de-messageDestination2-disp</display-name>
+         <icon id="en-messageDestination2-icon-id">
+            <small-icon>en-messageDestination2-small-icon</small-icon>
+            <large-icon>en-messageDestination2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="fr" id="fr-messageDestination2-icon-id">
+            <small-icon>fr-messageDestination2-small-icon</small-icon>
+            <large-icon>fr-messageDestination2-large-icon</large-icon>
+         </icon>
+         <icon xml:lang="de" id="de-messageDestination2-icon-id">
+            <small-icon>de-messageDestination2-small-icon</small-icon>
+            <large-icon>de-messageDestination2-large-icon</large-icon>
+         </icon>
          <message-destination-name>messageDestination2Name</message-destination-name>
          <jndi-name>messageDestination2JndiName</jndi-name>
       </message-destination>
@@ -2675,41 +2675,41 @@
    </assembly-descriptor>
 
    <resource-managers id="resource-managers-id">
-      <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>
+      <description>en-resource-managers-desc</description>
+      <description xml:lang="fr">fr-resource-managers-desc</description>
+      <description xml:lang="de">de-resource-managers-desc</description>
       <resource-manager id="resourceManager1-id" res-class="resourceManager1Class">
-         <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>
+         <description>en-resourceManager1-desc</description>
+         <description xml:lang="fr">fr-resourceManager1-desc</description>
+         <description xml:lang="de">de-resourceManager1-desc</description>
          <res-name>resourceManager1Name</res-name>
          <res-jndi-name>resourceManager1JndiName</res-jndi-name>
       </resource-manager>
       <resource-manager id="resourceManager2-id" res-class="resourceManager2Class">
-         <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>
+         <description>en-resourceManager2-desc</description>
+         <description xml:lang="fr">fr-resourceManager2-desc</description>
+         <description xml:lang="de">de-resourceManager2-desc</description>
          <res-name>resourceManager2Name</res-name>
          <res-url>resourceManager2URL</res-url>
       </resource-manager>
    </resource-managers>
    
    <invoker-proxy-bindings id="invoker-proxy-bindings-id">
-      <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>
+      <description>en-invoker-proxy-bindings-desc</description>
+      <description xml:lang="fr">fr-invoker-proxy-bindings-desc</description>
+      <description xml:lang="de">de-invoker-proxy-bindings-desc</description>
       <invoker-proxy-binding id="invokerProxyBinding1-id">
-         <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>
+         <description>en-invokerProxyBinding1-desc</description>
+         <description xml:lang="fr">fr-invokerProxyBinding1-desc</description>
+         <description xml:lang="de">de-invokerProxyBinding1-desc</description>
          <invoker-proxy-binding-name>invokerProxyBinding1Name</invoker-proxy-binding-name>
          <invoker-mbean>invokerProxyBinding1InvokerMBean</invoker-mbean>
          <proxy-factory>invokerProxyBinding1ProxyFactory</proxy-factory>
       </invoker-proxy-binding>
       <invoker-proxy-binding id="invokerProxyBinding2-id">
-         <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>
+         <description>en-invokerProxyBinding2-desc</description>
+         <description xml:lang="fr">fr-invokerProxyBinding2-desc</description>
+         <description xml:lang="de">de-invokerProxyBinding2-desc</description>
          <invoker-proxy-binding-name>invokerProxyBinding2Name</invoker-proxy-binding-name>
          <invoker-mbean>invokerProxyBinding2InvokerMBean</invoker-mbean>
          <proxy-factory>invokerProxyBinding2ProxyFactory</proxy-factory>
@@ -2741,9 +2741,9 @@
    </invoker-proxy-bindings>   
    
    <container-configurations id="container-configurations-id">
-      <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>
+      <description>en-container-configurations-desc</description>
+      <description xml:lang="fr">fr-container-configurations-desc</description>
+      <description xml:lang="de">de-container-configurations-desc</description>
 
       <container-configuration extends="Standard Stateless SessionBean">
          <container-name>session1ConfigurationName</container-name>
@@ -2768,9 +2768,9 @@
          <container-name>containerConfiguration0Name</container-name>
       </container-configuration>
       <container-configuration id="containerConfiguration1-id" extends="containerConfiguration1Extends">
-         <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>
+         <description>en-containerConfiguration1-desc</description>
+         <description xml:lang="fr">fr-containerConfiguration1-desc</description>
+         <description xml:lang="de">de-containerConfiguration1-desc</description>
          <container-name>containerConfiguration1Name</container-name>
          <call-logging>true</call-logging>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1</invoker-proxy-binding-name>
@@ -2816,9 +2816,9 @@
          <optiond-refresh-rate>10</optiond-refresh-rate>
          <security-domain>containerConfiguration1SecurityDomain</security-domain>
          <cluster-config id="containerConfiguration1ClusterConfig-id">
-            <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>
+            <description>en-containerConfiguration1ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-containerConfiguration1ClusterConfig-desc</description>
+            <description xml:lang="de">de-containerConfiguration1ClusterConfig-desc</description>
             <partition-name>containerConfiguration1ClusterConfigPartitionName</partition-name>
             <home-load-balancing-policy>containerConfiguration1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
             <bean-load-balancing-policy>containerConfiguration1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -2828,9 +2828,9 @@
          <depends>containerConfiguration1Depends2</depends>
       </container-configuration>
       <container-configuration id="containerConfiguration2-id" extends="containerConfiguration2Extends">
-         <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>
+         <description>en-containerConfiguration2-desc</description>
+         <description xml:lang="fr">fr-containerConfiguration2-desc</description>
+         <description xml:lang="de">de-containerConfiguration2-desc</description>
          <container-name>containerConfiguration2Name</container-name>
          <call-logging>false</call-logging>
          <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
@@ -2875,9 +2875,9 @@
          <optiond-refresh-rate>10</optiond-refresh-rate>
          <security-domain>containerConfiguration2SecurityDomain</security-domain>
          <cluster-config id="containerConfiguration2ClusterConfig-id">
-            <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>
+            <description>en-containerConfiguration2ClusterConfig-desc</description>
+            <description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</description>
+            <description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</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-cvs-commits mailing list