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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Nov 14 08:32:01 EST 2008


Author: alex.loubyansky at jboss.com
Date: 2008-11-14 08:32:01 -0500 (Fri, 14 Nov 2008)
New Revision: 81035

Modified:
   projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverythingDTD.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml
Log:
JBMETA-139 allow multiple invoker-proxy-binding-name per container configuration in jboss_5_0.dtd, removed useless comments

Modified: projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd	2008-11-14 13:06:48 UTC (rev 81034)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd	2008-11-14 13:32:01 UTC (rev 81035)
@@ -1115,7 +1115,7 @@
   Used in: container-configurations
 -->
 <!ELEMENT container-configuration (container-name , call-logging?,
- invoker-proxy-binding-name?, sync-on-commit-only?,
+ invoker-proxy-binding-name*, sync-on-commit-only?,
  insert-after-ejb-post-create?, call-ejb-store-on-clean?, store-not-flushed?, container-interceptors? ,
  instance-pool? , instance-cache? ,  persistence-manager? , web-class-loader? ,
  locking-policy? ,  container-cache-conf? , container-pool-conf? ,

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2008-11-14 13:06:48 UTC (rev 81034)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java	2008-11-14 13:32:01 UTC (rev 81035)
@@ -226,7 +226,7 @@
       Set<String> invokerNames = sssb.getInvokerProxyBindingNames();
       HashSet<String> expectedInvokerNames = new HashSet<String>();
       expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName1-override");
-      //expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
+      expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
       assertEquals(expectedInvokerNames, invokerNames);
       ContainerConfigurationMetaData session2Configuration = jbossMetaData.getContainerConfiguration("session2ConfigurationName");
       assertNotNull(session2Configuration);
@@ -234,7 +234,7 @@
       invokerNames = session2Configuration.getInvokerProxyBindingNames();
       expectedInvokerNames.clear();
       expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName1-override1");
-      //expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override1");
+      expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override1");
       assertEquals(expectedInvokerNames, invokerNames);
 
       ContainerConfigurationMetaData containerConfiguration1 = jbossMetaData.getContainerConfiguration("containerConfiguration1Name-override");
@@ -251,7 +251,7 @@
       invokerNames = containerConfiguration1.getInvokerProxyBindingNames();
       expectedInvokerNames.clear();
       expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName1-override");
-      //expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
+      expectedInvokerNames.add("containerConfiguration1InvokerProxyBindingName2-override");
       assertEquals(expectedInvokerNames, invokerNames);
    }
    
@@ -949,11 +949,7 @@
          assertFalse(configuration.isStoreNotFlushed());
       }
       
-      // TODO
-      if(mode == Mode.JBOSS_DTD)
-         assertInvokerProxyBindingNames(prefix, 1, configuration.getInvokerProxyBindingNames());
-      else
-         assertInvokerProxyBindingNames(prefix, 2, configuration.getInvokerProxyBindingNames());
+      assertInvokerProxyBindingNames(prefix, 2, configuration.getInvokerProxyBindingNames());
       Element interceptors = configuration.getContainerInterceptors();
       assertContainerInterceptors(prefix, interceptors);
       Element cacheConf = configuration.getContainerCacheConf();

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml	2008-11-14 13:06:48 UTC (rev 81034)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testBaseData.xml	2008-11-14 13:32:01 UTC (rev 81035)
@@ -945,7 +945,7 @@
          <container-name>containerConfiguration1Name</container-name>
          <call-logging>true</call-logging>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1</invoker-proxy-binding-name>
-<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2</invoker-proxy-binding-name> -->
+         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2</invoker-proxy-binding-name>
          <sync-on-commit-only>true</sync-on-commit-only>
          <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
          <call-ejb-store-on-clean>true</call-ejb-store-on-clean>
@@ -999,7 +999,7 @@
          <container-name>containerConfiguration2Name</container-name>
          <call-logging>false</call-logging>
          <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
-<!--         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name> -->
+         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name>
          <sync-on-commit-only>false</sync-on-commit-only>
          <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
          <call-ejb-store-on-clean>false</call-ejb-store-on-clean>

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

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml	2008-11-14 13:06:48 UTC (rev 81034)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml	2008-11-14 13:32:01 UTC (rev 81035)
@@ -6,14 +6,7 @@
   <!DOCTYPE jboss PUBLIC
       "-//JBoss//DTD JBOSS 5.0//EN"
       "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
-<!--
-<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
-       xmlns:jee="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-       version="5.0"
-       id="jboss-id-override">
--->
+
 <jboss>
    <loader-repository loaderRepositoryClass="loaderRepositoryClass-override">
       loaderRepositoryName-override
@@ -137,8 +130,6 @@
             <bean-load-balance-policy>session1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
             <session-state-manager-jndi-name>session1ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
          </cluster-config>
-
-<!--         <security-domain>session1SecurityDomain</security-domain> -->
          
          <method-attributes>
             <method>
@@ -272,8 +263,6 @@
             <bean-load-balance-policy>session2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
             <session-state-manager-jndi-name>session2ClusterConfigSessionStateManagerJndiName</session-state-manager-jndi-name>
          </cluster-config>
-
-<!--         <security-domain>session2SecurityDomain</security-domain> -->
          
          <method-attributes>
             <method>
@@ -424,8 +413,6 @@
             <bean-load-balance-policy>entity1ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
          </cluster-config>
          
-<!--         <security-domain>entity1SecurityDomain</security-domain> -->
-         
          <cache-invalidation>true</cache-invalidation>
          <cache-invalidation-config>
             <invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
@@ -554,8 +541,6 @@
             <bean-load-balance-policy>entity2ClusterConfigBeanLoadBalancePolicy</bean-load-balance-policy>
          </cluster-config>
          
-<!--         <security-domain>entity2SecurityDomain</security-domain> -->
-
          <cache-invalidation>false</cache-invalidation>
          <cache-invalidation-config>
             <invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
@@ -907,7 +892,7 @@
          <!-- This replaces the testEverything entry -->
          <container-name>Standard Stateless SessionBean</container-name>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1-override</invoker-proxy-binding-name>
-<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name> -->
+         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name>
          <container-interceptors>
             <interceptor>containerConfiguration1.Interceptor1-override</interceptor>
             <interceptor>containerConfiguration1.Interceptor2-override</interceptor>
@@ -957,20 +942,20 @@
       <container-configuration extends="Standard Stateless SessionBean">
          <container-name>session2ConfigurationName</container-name>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1-override1</invoker-proxy-binding-name>
-<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override1</invoker-proxy-binding-name> -->
+         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override1</invoker-proxy-binding-name>
       </container-configuration>
       <!-- This extends a config from the overriden jboss.xml  -->
       <container-configuration extends="containerConfiguration1Name">
          <container-name>containerConfiguration1Name-override</container-name>
          <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName1-override</invoker-proxy-binding-name>
-<!--         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name> -->
+         <invoker-proxy-binding-name>containerConfiguration1InvokerProxyBindingName2-override</invoker-proxy-binding-name>
       </container-configuration>
 
       <container-configuration extends="containerConfiguration2Extends">
          <container-name>containerConfiguration2Name</container-name>
          <call-logging>false</call-logging>
          <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
-<!--         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name> -->
+         <invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName2</invoker-proxy-binding-name>
          <sync-on-commit-only>false</sync-on-commit-only>
          <insert-after-ejb-post-create>false</insert-after-ejb-post-create>
          <call-ejb-store-on-clean>false</call-ejb-store-on-clean>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml	2008-11-14 13:06:48 UTC (rev 81034)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml	2008-11-14 13:32:01 UTC (rev 81035)
@@ -4,14 +4,7 @@
       "-//JBoss//DTD JBOSS 5.0//EN"
       "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
 
-<!-- A sample jboss5 standardjboss.xml
-<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
-       xmlns:jee="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-       version="3.0"
-       id="jboss-id">
--->
+<!-- A sample jboss5 standardjboss.xml -->
 <jboss>
 
   <!--




More information about the jboss-cvs-commits mailing list