[jboss-cvs] JBossAS SVN: r81163 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2008-11-17 05:35:33 -0500 (Mon, 17 Nov 2008)
New Revision: 81163

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
Log:
JBXB-139 jboss_5_0.dtd doesn't have 'ejb' element

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java	2008-11-17 09:10:51 UTC (rev 81162)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss50DTDMetaData.java	2008-11-17 10:35:33 UTC (rev 81163)
@@ -21,6 +21,9 @@
 */
 package org.jboss.metadata.ejb.jboss;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -55,4 +58,15 @@
    {
       // For serialization
    }
+   
+   @XmlElementWrapper(name="enterprise-beans")
+   @XmlElements({
+      @XmlElement(name="session", type=JBossSessionBeanMetaData.class),
+      @XmlElement(name="entity", type=JBossEntityBeanMetaData.class),
+      @XmlElement(name="message-driven", type=JBossMessageDrivenBeanMetaData.class)
+      })
+   public void setEnterpriseBeans(JBossEnterpriseBeansMetaData enterpriseBeans)
+   {
+      super.setEnterpriseBeans(enterpriseBeans);
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2008-11-17 09:10:51 UTC (rev 81162)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2008-11-17 10:35:33 UTC (rev 81163)
@@ -443,14 +443,6 @@
     * @param enterpriseBeans the enterpriseBeans.
     * @throws IllegalArgumentException for a null enterpriseBeans
     */
-   //@XmlElement(name="enterprise-beans")
-   @XmlElementWrapper(name="enterprise-beans")
-   @XmlElements({
-      @XmlElement(name="session", type=JBossSessionBeanMetaData.class),
-      @XmlElement(name="entity", type=JBossEntityBeanMetaData.class),
-      @XmlElement(name="message-driven", type=JBossMessageDrivenBeanMetaData.class),
-      @XmlElement(name="ejb", type=JBossGenericBeanMetaData.class)
-      })
    public void setEnterpriseBeans(JBossEnterpriseBeansMetaData enterpriseBeans)
    {
       if (enterpriseBeans == null)