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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Oct 10 23:39:35 EDT 2007


Author: scott.stark at jboss.org
Date: 2007-10-10 23:39:35 -0400 (Wed, 10 Oct 2007)
New Revision: 66019

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
Log:
Add web-app/taglib to the 2.3 metadata

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2007-10-11 03:33:36 UTC (rev 66018)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/Web23MetaData.java	2007-10-11 03:39:35 UTC (rev 66019)
@@ -1,5 +1,9 @@
 package org.jboss.metadata.web.spec;
 
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -32,4 +36,27 @@
    {
       return "2.3";
    }
+
+   public List<TaglibMetaData> getTaglibs()
+   {
+      List<JspConfigMetaData> jspConfigs = super.getJspConfig();
+      List<TaglibMetaData> taglibs = null;
+      if (jspConfigs != null && jspConfigs.size() > 0)
+      {
+         taglibs = jspConfigs.get(0).getTaglibs();
+      }
+      return taglibs;
+   }
+   /**
+    * Map the 2.3 taglibs onto jsp-config/taglibs
+    * @param taglibs
+    */
+   @XmlElement(name="taglib")
+   public void setTaglibs(List<TaglibMetaData> taglibs)
+   {
+      JspConfigMetaData jspConfig = new JspConfigMetaData();
+      jspConfig.setTaglibs(taglibs);
+      List<JspConfigMetaData> jspConfigs = Collections.singletonList(jspConfig);
+      super.setJspConfig(jspConfigs);
+   }
 }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java	2007-10-11 03:33:36 UTC (rev 66018)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java	2007-10-11 03:39:35 UTC (rev 66019)
@@ -22,10 +22,7 @@
 package org.jboss.test.metadata.web;
 
 import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
 import org.jboss.metadata.web.spec.Web23MetaData;
-import org.jboss.metadata.web.spec.Web25MetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -49,22 +46,8 @@
       DescriptionGroupMetaData dg = webApp.getDescriptionGroup();
       assertNotNull(dg);
       assertEquals("web-app-desc", dg.getDescription());
-
-      assertRemoteEnvironment("webApp", webApp, true);
-      assertMessageDestinations5("webAppMessageDestination", 2, webApp.getMessageDestinations(), true);
+      assertEquals("web-app_2_3-display-name", dg.getDisplayName());
    }
-   
-   private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
-   {
-      assertNotNull("no message destinations are set", messageDestinations);
-      assertEquals(size, messageDestinations.size());
-      int count = 1;
-      for(MessageDestinationMetaData messageDestinationMetaData : messageDestinations)
-      {
-         assertMessageDestination50(prefix + count, messageDestinationMetaData);
-         count++;
-      }
-   }
 
    public static SchemaBindingResolver initResolver()
    {

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml	2007-10-11 03:33:36 UTC (rev 66018)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp23_testEverything.xml	2007-10-11 03:39:35 UTC (rev 66019)
@@ -4,10 +4,12 @@
 "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app id="web-app_2_3">
+   
    <icon id="en-web-app-icon-id">
       <small-icon>en-web-app-small-icon</small-icon>
       <large-icon>en-web-app-large-icon</large-icon>
    </icon>
+   <display-name>web-app_2_3-display-name</display-name>
 
     <description>web-app-desc</description>
     
@@ -36,32 +38,6 @@
         <listener-class>listener0.class</listener-class>
     </listener>
 
-    <error-page id="error-page0">
-      <error-code>404</error-code>
-      <location>/error-page0</location>
-   </error-page>
-    <error-page id="error-page1">
-       <exception-type>java.lang.Throwable</exception-type>
-       <location>/error-page1</location>
-    </error-page>
-
-    <login-config id="login-config-FORM">
-       <auth-method>FORM</auth-method>
-       <form-login-config>
-          <form-login-page>/login.jsp</form-login-page>
-          <form-error-page>/login-error.jsp</form-error-page>
-       </form-login-config>
-    </login-config>
-
-    <mime-mapping id="mime-mapping0">
-      <extension>ext0</extension>
-      <mime-type>x/type0</mime-type>
-    </mime-mapping>
-    <mime-mapping id="mime-mapping1">
-       <extension>ext1</extension>
-       <mime-type>x/type1</mime-type>
-    </mime-mapping>
-
    <servlet id="servlet0">
       <servlet-name>servlet0-name</servlet-name>
       <servlet-class>servlet0.class</servlet-class>
@@ -109,6 +85,65 @@
        <url-pattern>/servlet1/*</url-pattern>
     </servlet-mapping>
 
+   <session-config id="session-config0">
+      <session-timeout>30</session-timeout>
+   </session-config>
+   <mime-mapping id="mime-mapping0">
+      <extension>ext0</extension>
+      <mime-type>x/type0</mime-type>
+   </mime-mapping>
+   <mime-mapping id="mime-mapping1">
+      <extension>ext1</extension>
+      <mime-type>x/type1</mime-type>
+   </mime-mapping>
+
+   <welcome-file-list id="welcome-file-list0">
+      <welcome-file>index.html</welcome-file>
+      <welcome-file>*.welcome</welcome-file>
+   </welcome-file-list>
+   
+   <error-page id="error-page0">
+      <error-code>404</error-code>
+      <location>/error-page0</location>
+   </error-page>
+   <error-page id="error-page1">
+      <exception-type>java.lang.Throwable</exception-type>
+      <location>/error-page1</location>
+   </error-page>
+
+   <taglib>
+      <taglib-uri>jsp-config0</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/jsp-config0.tld</taglib-location>
+   </taglib>
+
+   <!-- resource env ref -->
+   <resource-env-ref id="webAppResourceEnvRef1-id">
+      <description>en-webAppResourceEnvRef1-desc</description>
+      <resource-env-ref-name>webAppResourceEnvRef1Name</resource-env-ref-name>
+      <resource-env-ref-type>webAppResourceEnvRef1Type</resource-env-ref-type>
+   </resource-env-ref>
+   <resource-env-ref id="webAppResourceEnvRef2-id">
+      <description>en-webAppResourceEnvRef2-desc</description>
+      <resource-env-ref-name>webAppResourceEnvRef2Name</resource-env-ref-name>
+      <resource-env-ref-type>webAppResourceEnvRef2Type</resource-env-ref-type>
+   </resource-env-ref>
+   
+   <!-- resource ref -->
+   <resource-ref id="webAppResourceRef1-id">
+      <description>en-webAppResourceRef1-desc</description>
+      <res-ref-name>webAppResourceRef1Name</res-ref-name>
+      <res-type>webAppResourceRef1Type</res-type>
+      <res-auth>Application</res-auth>
+      <res-sharing-scope>Shareable</res-sharing-scope>
+   </resource-ref>
+   <resource-ref id="webAppResourceRef2-id">
+      <description>en-webAppResourceRef2-desc</description>
+      <res-ref-name>webAppResourceRef2Name</res-ref-name>
+      <res-type>webAppResourceRef2Type</res-type>
+      <res-auth>Container</res-auth>
+      <res-sharing-scope>Unshareable</res-sharing-scope>
+   </resource-ref>
+   
     <security-constraint id="security-constraint0">
        <display-name>security-constraint0-display-name</display-name>
        <web-resource-collection id="web-resource-collection0">
@@ -143,6 +178,14 @@
        </web-resource-collection>
     </security-constraint>
 
+   <login-config id="login-config-FORM">
+      <auth-method>FORM</auth-method>
+      <form-login-config>
+         <form-login-page>/login.jsp</form-login-page>
+         <form-error-page>/login-error.jsp</form-error-page>
+      </form-login-config>
+   </login-config>
+   
    <security-role id="security-role0">
       <role-name>role0</role-name>
    </security-role>
@@ -150,324 +193,52 @@
        <role-name>role1</role-name>
     </security-role>
     
-    <welcome-file-list id="welcome-file-list0">
-       <welcome-file>index.html</welcome-file>
-       <welcome-file>*.welcome</welcome-file>
-    </welcome-file-list>
-
-    <session-config id="session-config0">
-        <session-timeout>30</session-timeout>
-    </session-config>
-    
-    
    <!-- env entry -->
    <env-entry id="webAppEnvEntry1-id">
       <description>en-webAppEnvEntry1-desc</description>
-      <description xml:lang="fr">fr-webAppEnvEntry1-desc</description>
-      <description xml:lang="de">de-webAppEnvEntry1-desc</description>
       <env-entry-name>webAppEnvEntry1Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
       <env-entry-value>webAppEnvEntry1Value</env-entry-value>
-      <mapped-name>webAppEnvEntry1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry1Injection1Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry1Injection2Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry1Injection2Name</injection-target-name>
-      </injection-target>
+      <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
    <env-entry id="webAppEnvEntry2-id">
       <description>en-webAppEnvEntry2-desc</description>
-      <description xml:lang="fr">fr-webAppEnvEntry2-desc</description>
-      <description xml:lang="de">de-webAppEnvEntry2-desc</description>
       <env-entry-name>webAppEnvEntry2Name</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
       <env-entry-value>webAppEnvEntry2Value</env-entry-value>
-      <mapped-name>webAppEnvEntry2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry2Injection1Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEnvEntry2Injection2Class</injection-target-class>
-         <injection-target-name>webAppEnvEntry2Injection2Name</injection-target-name>
-      </injection-target>
+      <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
 
    <!-- ejb ref -->
    <ejb-ref id="webAppEjbRef1-id">
       <description>en-webAppEjbRef1-desc</description>
-      <description xml:lang="fr">fr-webAppEjbRef1-desc</description>
-      <description xml:lang="de">de-webAppEjbRef1-desc</description>
       <ejb-ref-name>webAppEjbRef1Name</ejb-ref-name>
       <ejb-ref-type>Session</ejb-ref-type>
       <home>webAppEjbRef1Home</home>
       <remote>webAppEjbRef1Remote</remote>
       <ejb-link>webAppEjbRef1EjbLink</ejb-link>
-      <mapped-name>webAppEjbRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEjbRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppEjbRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEjbRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppEjbRef1Injection2Name</injection-target-name>
-      </injection-target>
    </ejb-ref>
    <ejb-ref id="webAppEjbRef2-id">
       <description>en-webAppEjbRef2-desc</description>
-      <description xml:lang="fr">fr-webAppEjbRef2-desc</description>
-      <description xml:lang="de">de-webAppEjbRef2-desc</description>
       <ejb-ref-name>webAppEjbRef2Name</ejb-ref-name>
       <ejb-ref-type>Entity</ejb-ref-type>
       <home>webAppEjbRef2Home</home>
       <remote>webAppEjbRef2Remote</remote>
       <ejb-link>webAppEjbRef2EjbLink</ejb-link>
-      <mapped-name>webAppEjbRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppEjbRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppEjbRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppEjbRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppEjbRef2Injection2Name</injection-target-name>
-      </injection-target>
    </ejb-ref>
-   
-   <!-- resource ref -->
-   <resource-ref id="webAppResourceRef1-id">
-      <description>en-webAppResourceRef1-desc</description>
-      <description xml:lang="fr">fr-webAppResourceRef1-desc</description>
-      <description xml:lang="de">de-webAppResourceRef1-desc</description>
-      <res-ref-name>webAppResourceRef1Name</res-ref-name>
-      <res-type>webAppResourceRef1Type</res-type>
-      <res-auth>Application</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-      <mapped-name>webAppResourceRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-ref>
-   <resource-ref id="webAppResourceRef2-id">
-      <description>en-webAppResourceRef2-desc</description>
-      <description xml:lang="fr">fr-webAppResourceRef2-desc</description>
-      <description xml:lang="de">de-webAppResourceRef2-desc</description>
-      <res-ref-name>webAppResourceRef2Name</res-ref-name>
-      <res-type>webAppResourceRef2Type</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Unshareable</res-sharing-scope>
-      <mapped-name>webAppResourceRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-ref>
-   
-   <!-- resource env ref -->
-   <resource-env-ref id="webAppResourceEnvRef1-id">
-      <description>en-webAppResourceEnvRef1-desc</description>
-      <description xml:lang="fr">fr-webAppResourceEnvRef1-desc</description>
-      <description xml:lang="de">de-webAppResourceEnvRef1-desc</description>
-      <resource-env-ref-name>webAppResourceEnvRef1Name</resource-env-ref-name>
-      <resource-env-ref-type>webAppResourceEnvRef1Type</resource-env-ref-type>
-      <mapped-name>webAppResourceEnvRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-env-ref>
-   <resource-env-ref id="webAppResourceEnvRef2-id">
-      <description>en-webAppResourceEnvRef2-desc</description>
-      <description xml:lang="fr">fr-webAppResourceEnvRef2-desc</description>
-      <description xml:lang="de">de-webAppResourceEnvRef2-desc</description>
-      <resource-env-ref-name>webAppResourceEnvRef2Name</resource-env-ref-name>
-      <resource-env-ref-type>webAppResourceEnvRef2Type</resource-env-ref-type>
-      <mapped-name>webAppResourceEnvRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppResourceEnvRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppResourceEnvRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </resource-env-ref>
-   
-   <!-- message destination ref -->
-   <message-destination-ref id="webAppMessageDestinationRef1-id">
-      <description>en-webAppMessageDestinationRef1-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestinationRef1-desc</description>
-      <description xml:lang="de">de-webAppMessageDestinationRef1-desc</description>
-      <message-destination-ref-name>webAppMessageDestinationRef1Name</message-destination-ref-name>
-      <message-destination-type>webAppMessageDestinationRef1Type</message-destination-type>
-      <message-destination-usage>Consumes</message-destination-usage>
-      <message-destination-link>webAppMessageDestinationRef1Link</message-destination-link>
-      <mapped-name>webAppMessageDestinationRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   <message-destination-ref id="webAppMessageDestinationRef2-id">
-      <description>en-webAppMessageDestinationRef2-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestinationRef2-desc</description>
-      <description xml:lang="de">de-webAppMessageDestinationRef2-desc</description>
-      <message-destination-ref-name>webAppMessageDestinationRef2Name</message-destination-ref-name>
-      <message-destination-type>webAppMessageDestinationRef2Type</message-destination-type>
-      <message-destination-usage>Produces</message-destination-usage>
-      <message-destination-link>webAppMessageDestinationRef2Link</message-destination-link>
-      <mapped-name>webAppMessageDestinationRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   <message-destination-ref id="webAppMessageDestinationRef3-id">
-      <description>en-webAppMessageDestinationRef3-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestinationRef3-desc</description>
-      <description xml:lang="de">de-webAppMessageDestinationRef3-desc</description>
-      <message-destination-ref-name>webAppMessageDestinationRef3Name</message-destination-ref-name>
-      <message-destination-type>webAppMessageDestinationRef3Type</message-destination-type>
-      <message-destination-usage>ConsumesProduces</message-destination-usage>
-      <message-destination-link>webAppMessageDestinationRef3Link</message-destination-link>
-      <mapped-name>webAppMessageDestinationRef3MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef3Injection1Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef3Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppMessageDestinationRef3Injection2Class</injection-target-class>
-         <injection-target-name>webAppMessageDestinationRef3Injection2Name</injection-target-name>
-      </injection-target>
-   </message-destination-ref>
-   
-   <!-- persistence unit ref -->
-   <persistence-unit-ref id="webAppPersistenceUnitRef1-id">
-      <description>en-webAppPersistenceUnitRef1-desc</description>
-      <description xml:lang="fr">fr-webAppPersistenceUnitRef1-desc</description>
-      <description xml:lang="de">de-webAppPersistenceUnitRef1-desc</description>
-      <persistence-unit-ref-name>webAppPersistenceUnitRef1Name</persistence-unit-ref-name>
-      <persistence-unit-name>webAppPersistenceUnitRef1Unit</persistence-unit-name>
-      <mapped-name>webAppPersistenceUnitRef1MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef1Injection1Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef1Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef1Injection2Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef1Injection2Name</injection-target-name>
-      </injection-target>
-   </persistence-unit-ref>
-   <persistence-unit-ref id="webAppPersistenceUnitRef2-id">
-      <description>en-webAppPersistenceUnitRef2-desc</description>
-      <description xml:lang="fr">fr-webAppPersistenceUnitRef2-desc</description>
-      <description xml:lang="de">de-webAppPersistenceUnitRef2-desc</description>
-      <persistence-unit-ref-name>webAppPersistenceUnitRef2Name</persistence-unit-ref-name>
-      <persistence-unit-name>webAppPersistenceUnitRef2Unit</persistence-unit-name>
-      <mapped-name>webAppPersistenceUnitRef2MappedName</mapped-name>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef2Injection1Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef2Injection1Name</injection-target-name>
-      </injection-target>
-      <injection-target>
-         <injection-target-class>webAppPersistenceUnitRef2Injection2Class</injection-target-class>
-         <injection-target-name>webAppPersistenceUnitRef2Injection2Name</injection-target-name>
-      </injection-target>
-   </persistence-unit-ref>
-   
-   <!-- post-construct -->
-   <post-construct>
-      <lifecycle-callback-class>webAppPostConstruct1Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPostConstruct1Method</lifecycle-callback-method>
-   </post-construct>
-   <post-construct>
-      <lifecycle-callback-class>webAppPostConstruct2Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPostConstruct2Method</lifecycle-callback-method>
-   </post-construct>
-   
-   <!-- pre-destroy -->
-   <pre-destroy>
-      <lifecycle-callback-class>webAppPreDestroy1Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPreDestroy1Method</lifecycle-callback-method>
-   </pre-destroy>
-   <pre-destroy>
-      <lifecycle-callback-class>webAppPreDestroy2Class</lifecycle-callback-class>
-      <lifecycle-callback-method>webAppPreDestroy2Method</lifecycle-callback-method>
-   </pre-destroy>
-   
-   <!-- message destination -->
-   <message-destination id="webAppMessageDestination1-id">
-      <description>en-webAppMessageDestination1-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestination1-desc</description>
-      <description xml:lang="de">de-webAppMessageDestination1-desc</description>
-      <display-name>en-webAppMessageDestination1-disp</display-name>
-      <display-name xml:lang="fr">fr-webAppMessageDestination1-disp</display-name>
-      <display-name xml:lang="de">de-webAppMessageDestination1-disp</display-name>
-      <icon id="en-webAppMessageDestination1-icon-id">
-         <small-icon>en-webAppMessageDestination1-small-icon</small-icon>
-         <large-icon>en-webAppMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-webAppMessageDestination1-icon-id">
-         <small-icon>fr-webAppMessageDestination1-small-icon</small-icon>
-         <large-icon>fr-webAppMessageDestination1-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-webAppMessageDestination1-icon-id">
-         <small-icon>de-webAppMessageDestination1-small-icon</small-icon>
-         <large-icon>de-webAppMessageDestination1-large-icon</large-icon>
-      </icon>
-      <message-destination-name>webAppMessageDestination1Name</message-destination-name>
-      <mapped-name>webAppMessageDestination1MappedName</mapped-name>
-   </message-destination>
-   <message-destination id="webAppMessageDestination2-id">
-      <description>en-webAppMessageDestination2-desc</description>
-      <description xml:lang="fr">fr-webAppMessageDestination2-desc</description>
-      <description xml:lang="de">de-webAppMessageDestination2-desc</description>
-      <display-name>en-webAppMessageDestination2-disp</display-name>
-      <display-name xml:lang="fr">fr-webAppMessageDestination2-disp</display-name>
-      <display-name xml:lang="de">de-webAppMessageDestination2-disp</display-name>
-      <icon id="en-webAppMessageDestination2-icon-id">
-         <small-icon>en-webAppMessageDestination2-small-icon</small-icon>
-         <large-icon>en-webAppMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="fr" id="fr-webAppMessageDestination2-icon-id">
-         <small-icon>fr-webAppMessageDestination2-small-icon</small-icon>
-         <large-icon>fr-webAppMessageDestination2-large-icon</large-icon>
-      </icon>
-      <icon xml:lang="de" id="de-webAppMessageDestination2-icon-id">
-         <small-icon>de-webAppMessageDestination2-small-icon</small-icon>
-         <large-icon>de-webAppMessageDestination2-large-icon</large-icon>
-      </icon>
-      <message-destination-name>webAppMessageDestination2Name</message-destination-name>
-      <mapped-name>webAppMessageDestination2MappedName</mapped-name>
-   </message-destination>
 
-    <locale-encoding-mapping-list id="locale-encoding-mapping-list0">
-       <locale-encoding-mapping>
-          <locale>en</locale>
-          <encoding>en</encoding>
-       </locale-encoding-mapping>
-    </locale-encoding-mapping-list>
+   <ejb-local-ref id="webAppEjbLocalRef1-id">
+      <description>en-webAppEjbLocalRef1-desc</description>
+      <ejb-ref-name>webAppEjbLocalRef1-name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <local-home>ejb.local.home.class</local-home>
+      <local>ejb.local.class</local>
+      <ejb-link>webAppEjbLocalRef1-link</ejb-link>
+   </ejb-local-ref>
+   <ejb-local-ref id="webAppEjbLocalRef2-id">
+      <description>en-webAppEjbLocalRef2-desc</description>
+      <ejb-ref-name>webAppEjbLocalRef2-name</ejb-ref-name>
+      <ejb-ref-type>Session</ejb-ref-type>
+      <local-home>ejb.local.home.class</local-home>
+      <local>ejb.local.class</local>
+      <ejb-link>webAppEjbLocalRef2-link</ejb-link>
+   </ejb-local-ref>
 </web-app>




More information about the jboss-cvs-commits mailing list