[jboss-cvs] JBossAS SVN: r93474 - projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Sep 14 09:39:25 EDT 2009


Author: jaikiran
Date: 2009-09-14 09:39:24 -0400 (Mon, 14 Sep 2009)
New Revision: 93474

Added:
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpVersionType.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationUsageType.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MultiplicityType.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/PersistenceType.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ResultTypeMappingType.java
Removed:
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ListenerMetaData.java
Modified:
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/AssemblyDescriptorMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpFieldMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmrFieldMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbJarMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationshipRoleMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EntityBeanMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ExcludeListMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InitMethodMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorOrderMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDrivenBeanMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ParamValueMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/QueryMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RelationshipRoleSourceMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RemoveMethodMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainsMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/SessionBeanMetaData.java
Log:
EJBTHREE-1791 Javadocs and cleanup

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/AssemblyDescriptorMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/AssemblyDescriptorMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/AssemblyDescriptorMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -8,7 +8,6 @@
 package org.jboss.ejb3.metadata.spi.javaee;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  *
@@ -126,72 +125,50 @@
    void setInterceptorBindings(List<InterceptorBindingMetaData> interceptorBindings);
 
    /**
-    * Gets the value of the messageDestination property.
+    * @return Returns the message destinations configured in this
+    * assembly descriptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the messageDestination property.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getMessageDestination().add(newItem);
-    * </pre>
+    */
+   List<MessageDestinationMetaData> getMessageDestinations();
+
+   /**
+    * Sets the message destinations associated with this assembly descriptor
     *
+    * @param messageDestinations
+    */
+   void setMessageDestinations(List<MessageDestinationMetaData> messageDestinations);
+
+   /**
+    * Returns the list of methods which are marked as uncallable.
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link MessageDestinationMetaData }
+    * If the method permission relation contains methods that are
+    * in the exclude list, the Deployer should consider those
+    * methods to be uncallable.
     *
+    * @return Returns the uncallable methods
     *
     */
-   List<MessageDestinationMetaData> getMessageDestination();
+   List<EjbMethodMetaData> getExcludedMethods();
 
    /**
-    * Gets the value of the excludeList property.
+    * Sets the list of uncallable methods
     *
-    * @return
-    *     possible object is
-    *     {@link ExcludeListMetaData }
-    *
+    * @param excludedMethods The EJB methods which are to be marked as uncallable
     */
-   ExcludeListMetaData getExcludeList();
+   void setExcludedMethods(List<EjbMethodMetaData> excludedMethods);
 
    /**
-    * Sets the value of the excludeList property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link ExcludeListMetaData }
-    *
+    * @return Returns a list of application exceptions configured in the assembly
+    * descriptor
     */
-   void setExcludeList(ExcludeListMetaData value);
+   List<ApplicationExceptionMetaData> getApplicationExceptions();
 
    /**
-    * Gets the value of the applicationException property.
+    * Sets the application exceptions configured in the assembly descriptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the applicationException property.
-    *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getApplicationException().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ApplicationExceptionMetaData }
-    *
-    *
+    * @param applicationExceptions List of application exceptions
     */
-   List<ApplicationExceptionMetaData> getApplicationExceptions();
+   void setApplicationExceptions(List<ApplicationExceptionMetaData> applicationExceptions);
 
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpFieldMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpFieldMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpFieldMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -38,7 +38,7 @@
  * 
  * 
  */
-public interface CmpFieldMetaData
+public interface CmpFieldMetaData extends IdMetaData
 {
 
    /**
@@ -66,43 +66,31 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the fieldName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link JavaIdentifierType }
-    *     
+    * @return Returns the name of the container managed field.
+    *
+    *    The name of the cmp-field of an entity bean with
+    *    cmp-version 2.x must begin with a lowercase
+    *    letter. This field is accessed by methods whose
+    *    names consists of the name of the field specified by
+    *    field-name in which the first letter is uppercased,
+    *    prefixed by "get" or "set".
+    *
+    *   The name of the cmp-field of an entity bean with
+    *    cmp-version 1.x must denote a public field of the
+    *    enterprise bean class or one of its superclasses.
+    * 
+    * @see EntityBeanMetaData#getCmpVersion()     
     */
    String getFieldName();
 
    /**
-    * Sets the value of the fieldName property.
+    * Sets the container managed field of the entity bean.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JavaIdentifierType }
-    *     
-    */
-   void setFieldName(String value);
-
-   /**
-    * Gets the value of the id property.
+    * @param cmpFieldName The name of the container managed field 
     * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
+    * @see #getFieldName() for the field naming rules    
     */
-   java.lang.String getId();
+   void setFieldName(String cmpFieldName);
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpVersionType.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpVersionType.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmpVersionType.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -0,0 +1,49 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.metadata.spi.javaee;
+
+/**
+ * CmpVersionType
+ * 
+ * The cmp-versionType specifies the version of an entity bean
+ * with container-managed persistence. It is used by
+ *   cmp-version elements.
+ *   The value must be one of the two following:
+ *       1.x
+ *       2.x
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public enum CmpVersionType 
+{
+
+   /**
+    * CMP version 1.x
+    */
+   CMP_VERSION_1_x,
+   
+   /**
+    * CMP version 2.x
+    */
+   CMP_VERSION_2_x
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmrFieldMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmrFieldMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/CmrFieldMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -44,7 +44,7 @@
  * 
  * 
  */
-public interface CmrFieldMetaData
+public interface CmrFieldMetaData extends IdMetaData
 {
 
    /**
@@ -72,63 +72,36 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the cmrFieldName property.
+    * Returns the cmr-field-name
     * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
-    *     
+    * The cmr-field-name element specifies the name of a
+    *    logical relationship field in the entity bean
+    *    class. The name of the cmr-field must begin with a
+    *    lowercase letter. This field is accessed by methods
+    *    whose names consist of the name of the field
+    *    specified by cmr-field-name in which the first
+    *    letter is uppercased, prefixed by "get" or "set".
     */
    String getCmrFieldName();
 
    /**
-    * Sets the value of the cmrFieldName property.
+    * Sets the cmr-field-name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
-    *     
+    * @param cmrFieldName     
     */
-   void setCmrFieldName(String value);
+   void setCmrFieldName(String cmrFieldName);
 
    /**
-    * Gets the value of the cmrFieldType property.
+    * Returns the CMR field type
     * 
-    * @return
-    *     possible object is
-    *     {@link CmrFieldTypeType }
     *     
     */
    String getCmrFieldType();
 
    /**
-    * Sets the value of the cmrFieldType property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link CmrFieldTypeType }
+    * Sets the CMR field type
     *     
     */
-   void setCmrFieldType(String value);
+   void setCmrFieldType(String cmrFieldType);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbJarMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbJarMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbJarMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -185,24 +185,20 @@
    void setRelationships(RelationshipsMetaData value);
 
    /**
-    * Gets the value of the assemblyDescriptor property.
     *
-    * @return
-    *     possible object is
-    *     {@link AssemblyDescriptorMetaData }
+    * @return Returns the assembly descriptor configuration associated with this
+    * ejb-jar
     *
     */
    AssemblyDescriptorMetaData getAssemblyDescriptor();
 
    /**
-    * Sets the value of the assemblyDescriptor property.
+    * Sets the assembly descriptor configuration on this ejb-jar
     *
-    * @param value
-    *     allowed object is
-    *     {@link AssemblyDescriptorMetaData }
+    * @param assemblyDescriptor The assembly descriptor configuration
     *
     */
-   void setAssemblyDescriptor(AssemblyDescriptorMetaData value);
+   void setAssemblyDescriptor(AssemblyDescriptorMetaData assemblyDescriptor);
 
    /**
     * The optional ejb-client-jar element specifies a JAR

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -1,18 +1,16 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.08 at 07:12:16 PM IST 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.06.08 at 07:12:16 PM IST
 //
 
 package org.jboss.ejb3.metadata.spi.javaee;
 
-import java.util.List;
-import javax.xml.bind.JAXBElement;
 
 /**
- * 
- * 
+ *
+ *
  * 	The ejb-relationType describes a relationship between two
  * 	entity beans with container-managed persistence.  It is used
  * 	by ejb-relation elements. It contains a description; an
@@ -21,13 +19,13 @@
  * 	ejb-relationship-role elements. The name of the
  * 	relationship, if specified, is unique within the ejb-jar
  * 	file.
- * 
- *       
- * 
+ *
+ *
+ *
  * <p>Java class for ejb-relationType complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType name="ejb-relationType">
  *   &lt;complexContent>
@@ -43,66 +41,36 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
-public interface EjbRelationMetaData
+public interface EjbRelationMetaData extends IdMetaData
 {
 
    /**
-    * Gets the rest of the content model. 
-    * 
-    * <p>
-    * You are getting this "catch-all" property because of the following reason: 
-    * The field name "EjbRelationshipRole" is used by two different parts of a schema. See: 
-    * line 773 of http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
-    * line 771 of http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
-    * <p>
-    * To get rid of this property, apply a property customization to one 
-    * of both of the following declarations to change their names: 
-    * Gets the value of the content property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the content property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getContent().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JAXBElement }{@code <}{@link com.sun.java.xml.ns.javaee.String }{@code >}
-    * {@link JAXBElement }{@code <}{@link EjbRelationshipRoleMetaData }{@code >}
-    * {@link JAXBElement }{@code <}{@link DescriptionMetaData }{@code >}
-    * 
-    * 
+    *
+    * @return Returns the relationship role for entity bean1
     */
-   List<JAXBElement<?>> getContent();
+   EjbRelationshipRoleMetaData getEjbRelationshipRoleForEntityBean1();
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
+    * Sets the relationship role for entity bean1
+    *
+    * @param relationshipRole Relationship role
     */
-   java.lang.String getId();
+   void setEjbRelationshipRoleForEntityBean1(EjbRelationshipRoleMetaData relationshipRole);
 
    /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
+    *
+    * @return Returns the relationship role for entity bean2
     */
-   void setId(java.lang.String value);
+   EjbRelationshipRoleMetaData getEjbRelationshipRoleForEntityBean2();
 
+   /**
+    * Sets the relationship role for entity bean2
+    *
+    * @param relationshipRole Relationship role
+    */
+   void setEjbRelationshipRoleForEntityBean2(EjbRelationshipRoleMetaData relationshipRole);
+
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationshipRoleMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationshipRoleMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EjbRelationshipRoleMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -77,7 +77,7 @@
  *
  *
  */
-public interface EjbRelationshipRoleMetaData
+public interface EjbRelationshipRoleMetaData extends IdMetaData
 {
 
    /**
@@ -105,51 +105,37 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the ejbRelationshipRoleName property.
     *
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @return Returns the ejb relationship role  name
     *
     */
    String getEjbRelationshipRoleName();
 
    /**
-    * Sets the value of the ejbRelationshipRoleName property.
+    * Sets the ejb relationship role name
     *
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @param roleName
     *
+    *
     */
-   void setEjbRelationshipRoleName(String value);
+   void setEjbRelationshipRoleName(String roleName);
 
    /**
-    * Gets the value of the multiplicity property.
+    * @return Returns the multiplicity
     *
-    * @return
-    *     possible object is
-    *     {@link MultiplicityType }
-    *
     */
-   String getMultiplicity();
+   MultiplicityType getMultiplicity();
 
    /**
-    * Sets the value of the multiplicity property.
+    * Sets the multiplicity
     *
-    * @param value
-    *     allowed object is
-    *     {@link MultiplicityType }
-    *
+    * @param multiplicity The multiplicity
     */
-   void setMultiplicity(String value);
+   void setMultiplicity(String multiplicity);
 
    /**
-    * Gets the value of the cascadeDelete property.
     *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
+    * @return Returns true if cascade-delete is set. False otherwise
     *
     */
    boolean isCascadeDelete();
@@ -157,12 +143,10 @@
    /**
     * Sets the value of the cascadeDelete property.
     *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
+    * @param cascadeDelete True if cascade-delete has to be set. False otherwise
     *
     */
-   void setCascadeDelete(boolean value);
+   void setCascadeDelete(boolean cascadeDelete);
 
    /**
     * Gets the value of the relationshipRoleSource property.
@@ -204,24 +188,4 @@
     */
    void setCmrField(CmrFieldMetaData value);
 
-   /**
-    * Gets the value of the id property.
-    *
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *
-    */
-   java.lang.String getId();
-
-   /**
-    * Sets the value of the id property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EntityBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EntityBeanMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/EntityBeanMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -141,364 +141,191 @@
  * 
  * 
  */
-public interface EntityBeanMetaData
+public interface EntityBeanMetaData extends EnterpriseBeanMetaData, IdMetaData
 {
 
-   /**
-    * Gets the value of the description property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the description property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDescription().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link DescriptionMetaData }
-    * 
-    * 
-    */
-   List<DescriptionMetaData> getDescription();
+   
 
    /**
-    * Gets the value of the displayName property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the displayName property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDisplayName().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link DisplayNameMetaData }
-    * 
-    * 
+    * Returns the classname of the home interface corresponding to this
+    * bean. Returns null if there is no home interface
+    *
     */
-   List<DisplayNameMetaData> getDisplayName();
-
-   /**
-    * Gets the value of the icon property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the icon property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getIcon().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link IconType }
-    * 
-    * 
-    */
-   List<IconType> getIcon();
-
-   /**
-    * Gets the value of the ejbName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EjbNameType }
-    *     
-    */
-   String getEjbName();
-
-   /**
-    * Sets the value of the ejbName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EjbNameType }
-    *     
-    */
-   void setEjbName(String value);
-
-   /**
-    * Gets the value of the mappedName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *     
-    */
-   String getMappedName();
-
-   /**
-    * Sets the value of the mappedName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
-    *     
-    */
-   void setMappedName(String value);
-
-   /**
-    * Gets the value of the home property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link HomeType }
-    *     
-    */
    String getHome();
 
    /**
-    * Sets the value of the home property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link HomeType }
-    *     
+    * Sets the classname of the home interface for this bean
+    *
+    * @param homeInterface The home interface of the bean
+    *
     */
-   void setHome(String value);
+   void setHome(String homeInterface);
 
    /**
-    * Gets the value of the remote property.
+    * Returns the fully qualified classname of the remote interface corresponding to this
+    * bean. Returns null if there is no remote interface.
     * 
-    * @return
-    *     possible object is
-    *     {@link RemoteType }
-    *     
+    *
     */
    String getRemote();
 
    /**
-    * Sets the value of the remote property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link RemoteType }
-    *     
+    * Sets the EJB2.x remote interface for this bean.
+    *
+    * @param remoteInterface The EJB2.x remote interface for the bean
+    *
     */
-   void setRemote(String value);
+   void setRemote(String remoteInterface);
 
    /**
-    * Gets the value of the localHome property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link LocalHomeType }
-    *     
+    * Returns the fully qualified classname of the local home interface corresponding to this
+    * bean. Returns null if there is no local home interface
+    *
     */
    String getLocalHome();
 
    /**
-    * Sets the value of the localHome property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link LocalHomeType }
-    *     
+    * Sets the local home for this bean
+    *
+    * @param localHome The local home interface of this bean
+    *
     */
-   void setLocalHome(String value);
+   void setLocalHome(String localHome);
 
    /**
-    * Gets the value of the local property.
+    * Returns the fully qualified classname of the local interface corresponding to this
+    * bean. Returns null if there is no local interface.
     * 
-    * @return
-    *     possible object is
-    *     {@link LocalType }
-    *     
+    *
     */
    String getLocal();
 
    /**
-    * Sets the value of the local property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link LocalType }
-    *     
+    * Sets the EJB2.x local interface for this bean.
+    *
+    * @param The EJB2.x local interface
+    *
     */
-   void setLocal(String value);
+   void setLocal(String local);
 
    /**
-    * Gets the value of the ejbClass property.
+    * Returns the persistence-type of the bean. If not 
+    * explicitly set, then it defaults to {@link PersistenceType#CONTAINER}
     * 
     * @return
-    *     possible object is
-    *     {@link EjbClassType }
     *     
     */
-   String getEjbClass();
+   PersistenceType getPersistenceType();
 
    /**
-    * Sets the value of the ejbClass property.
+    * Sets the persistence-type for this entity bean.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link EjbClassType }
+    * @param persistenceType The persistence-type of this bean
     *     
     */
-   void setEjbClass(String value);
+   void setPersistenceType(PersistenceType persistenceType);
 
    /**
-    * Gets the value of the persistenceType property.
+    * Returns the fully qualified name of the primary key class of this entity bean
     * 
     * @return
-    *     possible object is
-    *     {@link PersistenceTypeType }
-    *     
-    */
-   String getPersistenceType();
-
-   /**
-    * Sets the value of the persistenceType property.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link PersistenceTypeType }
     *     
     */
-   void setPersistenceType(String value);
-
-   /**
-    * Gets the value of the primKeyClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link FullyQualifiedClassType }
-    *     
-    */
    String getPrimKeyClass();
 
    /**
-    * Sets the value of the primKeyClass property.
+    * Set the fully qualified class name of the primary key class of the 
+    * entity bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link FullyQualifiedClassType }
+    * @param primaryKeyClassName Fully qualified class name of the
+    * primary key class of the entity bean
     *     
     */
-   void setPrimKeyClass(String value);
+   void setPrimKeyClass(String primaryKeyClassName);
 
    /**
-    * Gets the value of the reentrant property.
+    * Returns true if this entity bean is explicitly marked as reentrant.
+    * Else returns false.
     * 
-    * @return
-    *     possible object is
-    *     {@link TrueFalseType }
+    * @return 
     *     
     */
-   boolean getReentrant();
+   boolean isReentrant();
 
    /**
-    * Sets the value of the reentrant property.
+    * Sets to true if the bean is to be marked as re-entrant. Else
+    * set to false.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link TrueFalseType }
+    * @param isReentrant True if bean is re-entrant. Else false.
     *     
     */
-   void setReentrant(boolean value);
+   void setReentrant(boolean isReentrant);
 
    /**
-    * Gets the value of the cmpVersion property.
     * 
-    * @return
-    *     possible object is
-    *     {@link CmpVersionType }
+    * 
+    * @return Returns the {@link CmpVersionType} of this bean. 
+    *   Returns null, if not explicitly set
     *     
     */
-   String getCmpVersion();
+   CmpVersionType getCmpVersion();
 
    /**
-    * Sets the value of the cmpVersion property.
+    * Sets the CMP version of the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link CmpVersionType }
+    * @param cmpVersion {@link CmpVersionType} of the bean
     *     
     */
-   void setCmpVersion(String value);
+   void setCmpVersion(CmpVersionType cmpVersion);
 
    /**
-    * Gets the value of the abstractSchemaName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link JavaIdentifierType }
+    * @return Returns the abstract schema name of this entity
+    * bean. Returns null if not set.
     *     
     */
    String getAbstractSchemaName();
 
    /**
-    * Sets the value of the abstractSchemaName property.
+    * Sets the abstract schema name of this entity bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JavaIdentifierType }
+    * @param schemaName Schema name
     *     
     */
-   void setAbstractSchemaName(String value);
+   void setAbstractSchemaName(String schemaName);
 
    /**
-    * Gets the value of the cmpField property.
+    * @return Returns a list of container managed fields of this entity
+    * bean. Returns an empty list if there are no such fields
+    */
+   List<CmpFieldMetaData> getCmpFields();
+   
+   /**
+    * Sets the container managed fields of this entity bean
     * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the cmpField property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getCmpField().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link CmpFieldMetaData }
-    * 
-    * 
+    * @param cmpFields
     */
-   List<CmpFieldMetaData> getCmpField();
+   void setCmpFields(List<CmpFieldMetaData> cmpFields);
 
    /**
-    * Gets the value of the primkeyField property.
     * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @return Returns the name of the primary key field. Returns null
+    * if it is not set
+    * 
+    * @see #getCmpFields() for the naming rules of CMP fields
     *     
     */
    String getPrimkeyField();
 
    /**
-    * Sets the value of the primkeyField property.
+    * Sets the primary key field of this entity bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @param primaryKey The primary key field
+    * @see #getCmpFields() for the naming rules of CMP fields
     *     
     */
-   void setPrimkeyField(String value);
+   void setPrimkeyField(String primaryKey);
 
    /**
     * Gets the value of the envEntry property.
@@ -832,24 +659,6 @@
     */
    List<QueryMetaData> getQuery();
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
+   
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ExcludeListMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ExcludeListMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ExcludeListMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.08 at 07:12:16 PM IST 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.06.08 at 07:12:16 PM IST
 //
 
 package org.jboss.ejb3.metadata.spi.javaee;
@@ -10,21 +10,21 @@
 import java.util.List;
 
 /**
- * 
- * 
+ *
+ *
  * 	The exclude-listType specifies one or more methods which
  * 	the Assembler marks to be uncallable.
- * 
+ *
  * 	If the method permission relation contains methods that are
  * 	in the exclude list, the Deployer should consider those
  * 	methods to be uncallable.
- * 
- *       
- * 
+ *
+ *
+ *
  * <p>Java class for exclude-listType complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType name="exclude-listType">
  *   &lt;complexContent>
@@ -38,78 +38,50 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
-public interface ExcludeListMetaData
+public interface ExcludeListMetaData extends IdMetaData
 {
 
    /**
     * Gets the value of the description property.
-    * 
+    *
     * <p>
     * This accessor method returns a reference to the live list,
     * not a snapshot. Therefore any modification you make to the
     * returned list will be present inside the JAXB object.
     * This is why there is not a <CODE>set</CODE> method for the description property.
-    * 
+    *
     * <p>
     * For example, to add a new item, do as follows:
     * <pre>
     *    getDescription().add(newItem);
     * </pre>
-    * 
-    * 
+    *
+    *
     * <p>
     * Objects of the following type(s) are allowed in the list
     * {@link DescriptionMetaData }
-    * 
-    * 
+    *
+    *
     */
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the method property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the method property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getMethod().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EjbMethodMetaData }
-    * 
-    * 
+    * Returns the list of EJB methods which are marked
+    * as uncallable
+    *
     */
-   List<EjbMethodMetaData> getMethod();
-
+   List<EjbMethodMetaData> getMethods();
+   
    /**
-    * Gets the value of the id property.
+    * Sets the EJB methods which are to be marked 
+    * as uncallable
     * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
+    * @param excludeMethods The methods to be marked as uncallable
     */
-   java.lang.String getId();
+   void setMethods(List<EjbMethodMetaData> excludeMethods);
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InitMethodMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InitMethodMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InitMethodMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -28,67 +28,35 @@
  * 
  * 
  */
-public interface InitMethodMetaData
+public interface InitMethodMetaData extends IdMetaData
 {
 
    /**
-    * Gets the value of the createMethod property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NamedMethodMetaData }
+    * Returns the create method
     *     
     */
    NamedMethodMetaData getCreateMethod();
 
    /**
-    * Sets the value of the createMethod property.
+    * Sets the create method
     * 
-    * @param value
-    *     allowed object is
-    *     {@link NamedMethodMetaData }
+    * @param createMethod Create method 
     *     
     */
-   void setCreateMethod(NamedMethodMetaData value);
+   void setCreateMethod(NamedMethodMetaData createMethod);
 
    /**
-    * Gets the value of the beanMethod property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NamedMethodMetaData }
+    * Returns the bean method
     *     
     */
    NamedMethodMetaData getBeanMethod();
 
    /**
-    * Sets the value of the beanMethod property.
+    * Sets the bean method
     * 
-    * @param value
-    *     allowed object is
-    *     {@link NamedMethodMetaData }
+    * @param beanMethod
     *     
     */
-   void setBeanMethod(NamedMethodMetaData value);
+   void setBeanMethod(NamedMethodMetaData beanMethod);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -80,360 +80,265 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the interceptorClass property.
+    * @return Returns the fully qualified classname of the interceptor class
     *
-    * @return
-    *     possible object is
-    *     {@link FullyQualifiedClassType }
-    *
     */
    String getInterceptorClass();
 
    /**
-    * Sets the value of the interceptorClass property.
+    * Sets the fully qualified class name of the interceptor
+    * 
+    * @param Fully qualified classname of the interceptor
     *
-    * @param value
-    *     allowed object is
-    *     {@link FullyQualifiedClassType }
+    */
+   void setInterceptorClass(String interceptorClassName);
+
+   /**
+    * @return Returns a list of around invoke methods declared on the
+    *          interceptor class and/or its super-classes
     *
     */
-   void setInterceptorClass(String value);
+   List<AroundInvokeMetaData> getAroundInvokes();
+   
+   /**
+    * Sets the list of around invoke methods declared on the 
+    * interceptor class and/or its super-classes
+    * 
+    * @param aroundInvokes
+    */
+   void setAroundInvokes(List<AroundInvokeMetaData> aroundInvokes);
 
    /**
-    * Gets the value of the aroundInvoke property.
+    * Returns a list of env-entry metadata of this interceptor.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the aroundInvoke property.
+    * Returns an empty list if there is no env-entry.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAroundInvoke().add(newItem);
-    * </pre>
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
     *
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AroundInvokeMetaData }
+    */
+   List<EnvEntryMetaData> getEnvEntries();
+   
+   /**
+    * Sets the list of env-entry metadata of this interceptor
     *
-    *
+    * @param envEntries The list of env-entry of this interceptor
     */
-   List<AroundInvokeMetaData> getAroundInvoke();
+   void setEnvEntries(List<EnvEntryMetaData> envEntries);
 
    /**
-    * Gets the value of the envEntry property.
+    * Returns the list of EJB references of this interceptor
+    * Returns an empty list if there is no EJB reference for this interceptor.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the envEntry property.
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEnvEntry().add(newItem);
-    * </pre>
     *
+    */
+   List<EjbRefMetaData> getEjbRefs();
+
+   /**
+    * Sets the list of EJB references for this interceptor
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EnvEntryMetaData }
+    * @param ejbRefs The list of EJB references
+    */
+   void setEjbRefs(List<EjbRefMetaData> ejbRefs);
+
+
+   /**
+    * Returns the list of EJB local references of this interceptor
+    * Returns an empty list if there is no EJB local reference for this interceptor.
     *
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
     *
     */
-   List<EnvEntryMetaData> getEnvEntry();
+   List<EjbLocalRefMetaData> getEjbLocalRefs();
 
    /**
-    * Gets the value of the ejbRef property.
+    * Sets the list of EJB local references for this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the ejbRef property.
+    * @param ejbLocalRefs The list of EJB local references
+    */
+   void setEjbLocalRefs(List<EjbLocalRefMetaData> ejbLocalRefs);
+
+   /**
+    * Returns the list of web service reference(s) of this interceptor.
+    * Returns an empty list if there are no such references.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbRef().add(newItem);
-    * </pre>
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
     *
+    */
+   List<ServiceRefMetaData> getServiceRefs();
+
+   /**
+    * Sets the list of web service references for this interceptor
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EjbRefMetaData }
-    *
-    *
+    * @param serviceRefs The service references
     */
-   List<EjbRefMetaData> getEjbRef();
+   void setServiceRefs(List<ServiceRefMetaData> serviceRefs);
 
    /**
-    * Gets the value of the ejbLocalRef property.
+    * @return Returns the list of resource references of this interceptor.
+    * Returns an empty list if there are no such references.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the ejbLocalRef property.
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbLocalRef().add(newItem);
-    * </pre>
     *
+    */
+   List<ResourceRefMetaData> getResourceRefs();
+
+   /**
+    * Sets the resource references of this interceptor
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EjbLocalRefMetaData }
-    *
-    *
+    * @param resourceRefs List of resource references of this interceptor
     */
-   List<EjbLocalRefMetaData> getEjbLocalRef();
+   void setResourceRefs(List<ResourceRefMetaData> resourceRefs);
 
    /**
-    * Gets the value of the serviceRef property.
+    * @return Returns the list of resource environment references of this interceptor.
+    * Returns an empty list if there are no such references.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the serviceRef property.
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getServiceRef().add(newItem);
-    * </pre>
     *
+    */
+   List<ResourceEnvRefMetaData> getResourceEnvRefs();
+
+   /**
+    * Sets the resource env references of this interceptor
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ServiceRefMetaData }
+    * @param resourceEnvRefs
+    */
+   void setResourceEnvRefs(List<ResourceEnvRefMetaData> resourceEnvRefs);
+
+   /**
+    * Returns the message destination references associated with this interceptor
     *
     *
     */
-   List<ServiceRefMetaData> getServiceRef();
+   List<MessageDestinationRefMetaData> getMessageDestinationRefs();
+   
+   /**
+    * Sets the message destination references associated with this interceptor
+    * 
+    * @param messageDestinationRefs
+    */
+   void setMessageDestinationRefs(List<MessageDestinationRefMetaData> messageDestinationRefs);
 
    /**
-    * Gets the value of the resourceRef property.
+    * @return Returns the list of persistence context references of this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the resourceRef property.
+    * Returns an empty list if there are no such references.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceRef().add(newItem);
-    * </pre>
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
+    */
+   List<PersistenceContextRefMetaData> getPersistenceContextRefs();
+
+   /**
+    * Sets the list of persistence context references of this interceptor
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ResourceRefMetaData }
-    *
-    *
+    * @param persistenceContextRefs The persistence context references
     */
-   List<ResourceRefMetaData> getResourceRef();
+   void setPeristenceContextRefs(List<PersistenceContextRefMetaData> persistenceContextRefs);
 
+
+
    /**
-    * Gets the value of the resourceEnvRef property.
+    * @returns Returns the persistence unit references associated with this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the resourceEnvRef property.
+    * Returns an empty list if there are no such references.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceEnvRef().add(newItem);
-    * </pre>
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
+    */
+   List<PersistenceUnitRefMetaData> getPersistenceUnitRefs();
+
+   /**
+    * Sets the persistence unit references
     *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ResourceEnvRefMetaData }
+    * @param persistenceUnitRefs The persistence unit references of this interceptor
+    */
+   void setPersistenceUnitRefs(List<PersistenceUnitRefMetaData> persistenceUnitRefs);
+
+   /**
+    * @return Returns a list of post-construct methods associated with this interceptor
+    * Returns an empty list if there are no post-constructs.
     *
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
     */
-   List<ResourceEnvRefMetaData> getResourceEnvRef();
+   List<LifecycleCallbackMetaData> getPostConstructs();
 
    /**
-    * Gets the value of the messageDestinationRef property.
+    * Sets the post-constructs associated with this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the messageDestinationRef property.
-    *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getMessageDestinationRef().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link MessageDestinationRefMetaData }
-    *
-    *
+    * @param postConstructs The list of post-constructs
     */
-   List<MessageDestinationRefMetaData> getMessageDestinationRef();
+   void setPostConstructs(List<LifecycleCallbackMetaData> postConstructs);
 
+
+
    /**
-    * Gets the value of the persistenceContextRef property.
+    * @return Returns a list of pre-destroy methods associated with this interceptor
+    * Returns an empty list if there are no pre-destroy callbacks for this interceptor.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the persistenceContextRef property.
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPersistenceContextRef().add(newItem);
-    * </pre>
     *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link PersistenceContextRefMetaData }
-    *
-    *
     */
-   List<PersistenceContextRefMetaData> getPersistenceContextRef();
+   List<LifecycleCallbackMetaData> getPreDestroys();
 
    /**
-    * Gets the value of the persistenceUnitRef property.
+    * Sets the list of pre-destroy callbacks associated with this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the persistenceUnitRef property.
-    *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPersistenceUnitRef().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link PersistenceUnitRefMetaData }
-    *
-    *
+    * @param preDestroys The list of pre-destroys for this bean
     */
-   List<PersistenceUnitRefMetaData> getPersistenceUnitRef();
+   void setPreDestroys(List<LifecycleCallbackMetaData> preDestroys);
 
    /**
-    * Gets the value of the postConstruct property.
+    * @return Returns a list of post-activate methods associated with this interceptor
+    * Returns an empty list if there are no post-activate callbacks for this interceptor.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the postConstruct property.
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPostConstruct().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LifecycleCallbackMetaData }
-    *
-    *
     */
-   List<LifecycleCallbackMetaData> getPostConstruct();
+   List<LifecycleCallbackMetaData> getPostActivates();
 
    /**
-    * Gets the value of the preDestroy property.
+    * Sets the list of post-activate callbacks associated with this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the preDestroy property.
-    *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPreDestroy().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LifecycleCallbackMetaData }
-    *
-    *
+    * @param postActivates The post-activate callbacks associated with this interceptor
     */
-   List<LifecycleCallbackMetaData> getPreDestroy();
+   void setPostActivates(List<LifecycleCallbackMetaData> postActivates);
 
    /**
-    * Gets the value of the postActivate property.
+    * @return Returns a list of pre-passivate methods associated with this interceptor
+    * Returns an empty list if there are no pre-passivate callbacks for this interceptor.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the postActivate property.
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPostActivate().add(newItem);
-    * </pre>
     *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LifecycleCallbackMetaData }
-    *
-    *
     */
-   List<LifecycleCallbackMetaData> getPostActivate();
+   List<LifecycleCallbackMetaData> getPrePassivates();
 
    /**
-    * Gets the value of the prePassivate property.
+    * Sets the list of pre-passivate callbacks associated with this interceptor
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the prePassivate property.
-    *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPrePassivate().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LifecycleCallbackMetaData }
-    *
-    *
+    * @param prePassivates The pre-passivate callbacks for this interceptor
     */
-   List<LifecycleCallbackMetaData> getPrePassivate();
+   void setPrePassivates(List<LifecycleCallbackMetaData> prePassivates);
 
 
 

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorOrderMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorOrderMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/InterceptorOrderMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -38,27 +38,17 @@
 {
 
    /**
-    * Gets the value of the interceptorClass property.
+    * Returns the ordered list of fully qualified name of interceptor classes.
     *
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the interceptorClass property.
     *
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getInterceptorClass().add(newItem);
-    * </pre>
-    *
-    *
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link FullyQualifiedClassType }
-    *
-    *
     */
-   List<String> getInterceptorClass();
+   List<String> getOrderedInterceptorClasses();
+   
+   /**
+    * Sets the ordered list of fully qualified name of interceptor classes.
+    * 
+    * @param orderedInterceptorClasses
+    */
+   void setOrderedInterceptorClasses(List<String> orderedInterceptorClasses);
 
 }

Deleted: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ListenerMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ListenerMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ListenerMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -1,155 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.08 at 07:12:16 PM IST 
-//
-
-package org.jboss.ejb3.metadata.spi.javaee;
-
-import java.util.List;
-
-/**
- * 
- * 
- * 	The listenerType indicates the deployment properties for a web
- * 	application listener bean.
- * 
- *       
- * 
- * <p>Java class for listenerType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="listenerType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{http://java.sun.com/xml/ns/javaee}descriptionGroup"/>
- *         &lt;element name="listener-class" type="{http://java.sun.com/xml/ns/javaee}fully-qualified-classType"/>
- *       &lt;/sequence>
- *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public interface ListenerMetaData
-{
-
-   /**
-    * Gets the value of the description property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the description property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDescription().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link DescriptionMetaData }
-    * 
-    * 
-    */
-   List<DescriptionMetaData> getDescription();
-
-   /**
-    * Gets the value of the displayName property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the displayName property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDisplayName().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link DisplayNameMetaData }
-    * 
-    * 
-    */
-   List<DisplayNameMetaData> getDisplayName();
-
-   /**
-    * Gets the value of the icon property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the icon property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getIcon().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link IconType }
-    * 
-    * 
-    */
-   List<IconType> getIcon();
-
-   /**
-    * Gets the value of the listenerClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link FullyQualifiedClassType }
-    *     
-    */
-   String getListenerClass();
-
-   /**
-    * Sets the value of the listenerClass property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link FullyQualifiedClassType }
-    *     
-    */
-   void setListenerClass(String value);
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
-}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2009.06.08 at 07:12:16 PM IST 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2009.06.08 at 07:12:16 PM IST
 //
 
 package org.jboss.ejb3.metadata.spi.javaee;
@@ -10,15 +10,15 @@
 import java.util.List;
 
 /**
- * 
- * 	
- * 
+ *
+ *
+ *
  * 	  The message-destinationType specifies a message
  * 	  destination. The logical destination described by this
  * 	  element is mapped to a physical destination by the Deployer.
- * 
+ *
  * 	  The message destination element contains:
- * 
+ *
  * 		  - an optional description
  * 		  - an optional display-name
  * 		  - an optional icon
@@ -26,21 +26,21 @@
  * 		    among message destination names within the same
  * 		    Deployment File.
  * 		  - an optional mapped name
- * 
+ *
  * 	  Example:
- * 
+ *
  * 	  <message-destination>
  * 		  <message-destination-name>CorporateStocks
  * 		  </message-destination-name>
  * 	  </message-destination>
- * 
- * 	  
- *       
- * 
+ *
+ *
+ *
+ *
  * <p>Java class for message-destinationType complex type.
- * 
+ *
  * <p>The following schema fragment specifies the expected content contained within this class.
- * 
+ *
  * <pre>
  * &lt;complexType name="message-destinationType">
  *   &lt;complexContent>
@@ -55,142 +55,114 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
- * 
- * 
+ *
+ *
  */
-public interface MessageDestinationMetaData
+public interface MessageDestinationMetaData extends IdMetaData
 {
 
    /**
     * Gets the value of the description property.
-    * 
+    *
     * <p>
     * This accessor method returns a reference to the live list,
     * not a snapshot. Therefore any modification you make to the
     * returned list will be present inside the JAXB object.
     * This is why there is not a <CODE>set</CODE> method for the description property.
-    * 
+    *
     * <p>
     * For example, to add a new item, do as follows:
     * <pre>
     *    getDescription().add(newItem);
     * </pre>
-    * 
-    * 
+    *
+    *
     * <p>
     * Objects of the following type(s) are allowed in the list
     * {@link DescriptionMetaData }
-    * 
-    * 
+    *
+    *
     */
    List<DescriptionMetaData> getDescription();
 
    /**
     * Gets the value of the displayName property.
-    * 
+    *
     * <p>
     * This accessor method returns a reference to the live list,
     * not a snapshot. Therefore any modification you make to the
     * returned list will be present inside the JAXB object.
     * This is why there is not a <CODE>set</CODE> method for the displayName property.
-    * 
+    *
     * <p>
     * For example, to add a new item, do as follows:
     * <pre>
     *    getDisplayName().add(newItem);
     * </pre>
-    * 
-    * 
+    *
+    *
     * <p>
     * Objects of the following type(s) are allowed in the list
     * {@link DisplayNameMetaData }
-    * 
-    * 
+    *
+    *
     */
    List<DisplayNameMetaData> getDisplayName();
 
    /**
     * Gets the value of the icon property.
-    * 
+    *
     * <p>
     * This accessor method returns a reference to the live list,
     * not a snapshot. Therefore any modification you make to the
     * returned list will be present inside the JAXB object.
     * This is why there is not a <CODE>set</CODE> method for the icon property.
-    * 
+    *
     * <p>
     * For example, to add a new item, do as follows:
     * <pre>
     *    getIcon().add(newItem);
     * </pre>
-    * 
-    * 
+    *
+    *
     * <p>
     * Objects of the following type(s) are allowed in the list
     * {@link IconType }
-    * 
-    * 
+    *
+    *
     */
    List<IconType> getIcon();
 
    /**
-    * Gets the value of the messageDestinationName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
-    *     
+    *
+    * @return Returns the message-destination name
+    *
     */
    String getMessageDestinationName();
 
    /**
-    * Sets the value of the messageDestinationName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
-    *     
+    * Sets the message destination name.
+    *
+    * @param messageDestName The message destination name
+    *
     */
-   void setMessageDestinationName(String value);
+   void setMessageDestinationName(String messageDestName);
 
    /**
-    * Gets the value of the mappedName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *     
+    *
+    * @return Returns the mapped name
+    *
     */
    String getMappedName();
 
    /**
-    * Sets the value of the mappedName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
-    *     
+    * Sets the mapped name
+    *
+    * @param mappedName The mapped name
+    *
     */
-   void setMappedName(String value);
+   void setMappedName(String mappedName);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationRefMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationRefMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -74,7 +74,7 @@
  * 
  * 
  */
-public interface MessageDestinationRefMetaData
+public interface MessageDestinationRefMetaData extends IdMetaData
 {
 
    /**
@@ -102,147 +102,112 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the messageDestinationRefName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
+    * @return Returns the message-destination-ref-name
     *     
     */
    String getMessageDestinationRefName();
 
    /**
-    * Sets the value of the messageDestinationRefName property.
+    * Sets the message-destination-ref-name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *     
+    * @param messageDestinationRefName message-destination-ref-name
     */
-   void setMessageDestinationRefName(String value);
+   void setMessageDestinationRefName(String messageDestinationRefName);
 
    /**
-    * Gets the value of the messageDestinationType property.
+    * Returns the message destination type.
     * 
-    * @return
-    *     possible object is
-    *     {@link MessageDestinationTypeType }
+    * The type is specified by the fully qualified Java interface
+    *  expected to be implemented by the destination.
     *     
     */
    String getMessageDestinationType();
 
    /**
-    * Sets the value of the messageDestinationType property.
+    *  Sets the message destination type.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link MessageDestinationTypeType }
+    * The type is specified by the fully qualified Java interface
+    *  expected to be implemented by the destination.
+    *  
+    *  @param messageDestinationType 
     *     
     */
-   void setMessageDestinationType(String value);
+   void setMessageDestinationType(String messageDestinationType);
 
    /**
-    * Gets the value of the messageDestinationUsage property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link MessageDestinationUsageType }
-    *     
+    * Returns the message destination usage type
     */
-   String getMessageDestinationUsage();
+   MessageDestinationUsageType getMessageDestinationUsage();
 
    /**
-    * Sets the value of the messageDestinationUsage property.
+    * Sets the message destination usage type
     * 
-    * @param value
-    *     allowed object is
-    *     {@link MessageDestinationUsageType }
+    * @param messageDestinationUsage
     *     
     */
-   void setMessageDestinationUsage(String value);
+   void setMessageDestinationUsage(MessageDestinationUsageType messageDestinationUsage);
 
    /**
-    * Gets the value of the messageDestinationLink property.
+    * Returns the message destination link
     * 
-    * @return
-    *     possible object is
-    *     {@link MessageDestinationLinkType }
+    * The value must be the message-destination-name of a message
+    * destination in the same Deployment File or in another
+    * Deployment File in the same Java EE application unit.
+    *
+    * Alternatively, the value may be composed of a path name
+    * specifying a Deployment File containing the referenced
+    * message destination with the message-destination-name of the
+    * destination appended and separated from the path name by
+    * "#". The path name is relative to the Deployment File
+    * containing Deployment Component that is referencing the
+    * message destination.  This allows multiple message
+    * destinations with the same name to be uniquely identified.
+    * 
     *     
     */
    String getMessageDestinationLink();
 
    /**
-    * Sets the value of the messageDestinationLink property.
+    * Sets the message destination link
     * 
-    * @param value
-    *     allowed object is
-    *     {@link MessageDestinationLinkType }
+    * @param messageDestinationLink
+    * 
+    * @see MessageDestinationRefMetaData#getMessageDestinationLink()
     *     
     */
-   void setMessageDestinationLink(String value);
+   void setMessageDestinationLink(String messageDestinationLink);
 
    /**
-    * Gets the value of the mappedName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * Returns the mapped-name
     *     
     */
    String getMappedName();
 
    /**
-    * Sets the value of the mappedName property.
+    * Sets the mapped-name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param mappedName mapped-name
     *     
     */
-   void setMappedName(String value);
+   void setMappedName(String mappedName);
 
    /**
-    * Gets the value of the injectionTarget property.
-    * 
-    * <p>
-    * This accessor method returns a reference to the live list,
-    * not a snapshot. Therefore any modification you make to the
-    * returned list will be present inside the JAXB object.
-    * This is why there is not a <CODE>set</CODE> method for the injectionTarget property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getInjectionTarget().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link InjectionTargetMetaData }
-    * 
-    * 
+    * Returns a list of injection target(s) metadata for
+    * this message destination reference
+    * Returns an empty list if there is no injection-target.
+    *
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
     */
-   List<InjectionTargetMetaData> getInjectionTarget();
+   List<InjectionTargetMetaData> getInjectionTargets();
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
+    * Sets the list of injection targets for this message destination reference
+    *
+    * @param injectionTargets List of injection targets metadata for this message destination reference
     */
-   java.lang.String getId();
+   void setInjectionTargets(List<InjectionTargetMetaData> injectionTargets);
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
+   
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationUsageType.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationUsageType.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDestinationUsageType.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.metadata.spi.javaee;
+
+/**
+ * MessageDestinationUsageType
+ * The MessageDestinationUsageType specifies the use of the
+ *  message destination indicated by the reference.  The value
+ *   indicates whether messages are consumed from the message
+ *   destination, produced for the destination, or both. 
+ *
+ *   The value of the message-destination-usage element must be
+ *   one of the following:
+ *       Consumes
+ *       Produces
+ *       ConsumesProduces
+ *       
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public enum MessageDestinationUsageType 
+{
+
+   CONSUMES,
+   PRODUCES,
+   CONSUMES_PRODUCES
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDrivenBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDrivenBeanMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MessageDrivenBeanMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -238,6 +238,6 @@
     *
     */
    // TODO: We need this. Revisit this
-   //List<MessageDestinationRefType> getMessageDestinationRef();
+   List<MessageDestinationRefMetaData> getMessageDestinationRef();
 
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MultiplicityType.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MultiplicityType.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/MultiplicityType.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.metadata.spi.javaee;
+
+/**
+ * MultiplicityType
+ *
+ * The multiplicityType describes the multiplicity of the
+ * role that participates in a relation.
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public enum MultiplicityType {
+
+   ONE, MANY
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ParamValueMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ParamValueMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ParamValueMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -38,7 +38,7 @@
  * 
  * 
  */
-public interface ParamValueMetaData
+public interface ParamValueMetaData extends IdMetaData
 {
 
    /**
@@ -66,63 +66,30 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the paramName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * Returns the name of the param
     *     
     */
    String getParamName();
 
    /**
-    * Sets the value of the paramName property.
+    * Sets the param-name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @param paramName
     *     
     */
-   void setParamName(String value);
+   void setParamName(String paramName);
 
    /**
-    * Gets the value of the paramValue property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * Returns the param-value
     *     
     */
    String getParamValue();
 
    /**
-    * Sets the value of the paramValue property.
+    * Sets the param-value
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param paramValue param-value
     *     
     */
-   void setParamValue(String value);
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
+   void setParamValue(String paramValue);
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/PersistenceType.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/PersistenceType.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/PersistenceType.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.metadata.spi.javaee;
+
+/**
+ * PersistenceType
+ * The persistence-typeType specifies an entity bean's persistence
+ *    management type.
+ *    The persistence-type element must be one of the two following:
+ *        Bean
+ *       Container
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public enum PersistenceType 
+{
+
+   /**
+    * Bean managed persitence
+    */
+   BEAN,
+   
+   /**
+    * Container managed persistence
+    */
+   CONTAINER
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/QueryMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/QueryMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/QueryMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -55,7 +55,7 @@
  * 
  * 
  */
-public interface QueryMetaData
+public interface QueryMetaData extends IdMetaData
 {
 
    /**
@@ -86,7 +86,7 @@
     *     {@link QueryMethodMetaData }
     *     
     */
-   QueryMethodMetaData getQueryMethod();
+   NamedMethodMetaData getQueryMethod();
 
    /**
     * Sets the value of the queryMethod property.
@@ -96,66 +96,39 @@
     *     {@link QueryMethodMetaData }
     *     
     */
-   void setQueryMethod(QueryMethodMetaData value);
+   void setQueryMethod(NamedMethodMetaData value);
 
    /**
-    * Gets the value of the resultTypeMapping property.
+    * Returns the result-type-mapping
     * 
-    * @return
-    *     possible object is
-    *     {@link ResultTypeMappingType }
+    * The result-type-mappingType is used in the query element to
+    * specify whether an abstract schema type returned by a query
+    * for a select method is to be mapped to an EJBLocalObject or
+    * EJBObject type.
     *     
     */
-   String getResultTypeMapping();
+   ResultTypeMappingType getResultTypeMapping();
 
    /**
-    * Sets the value of the resultTypeMapping property.
+    * Sets the result-type-mapping type
     * 
-    * @param value
-    *     allowed object is
-    *     {@link ResultTypeMappingType }
+    * @param resultTypeMapping
     *     
     */
-   void setResultTypeMapping(String value);
+   void setResultTypeMapping(ResultTypeMappingType resultTypeMapping);
 
    /**
-    * Gets the value of the ejbQl property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * Returns the ejb-ql query.
     *     
     */
    String getEjbQl();
 
    /**
-    * Sets the value of the ejbQl property.
+    * Sets the ejb-ql query
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param query
     *     
     */
-   void setEjbQl(String value);
+   void setEjbQl(String query);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RelationshipRoleSourceMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RelationshipRoleSourceMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RelationshipRoleSourceMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -40,7 +40,7 @@
  * 
  * 
  */
-public interface RelationshipRoleSourceMetaData
+public interface RelationshipRoleSourceMetaData extends IdMetaData
 {
 
    /**
@@ -87,24 +87,6 @@
     */
    void setEjbName(String value);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
+   
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RemoveMethodMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RemoveMethodMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/RemoveMethodMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -28,67 +28,39 @@
  * 
  * 
  */
-public interface RemoveMethodMetaData
+public interface RemoveMethodMetaData extends IdMetaData
 {
 
    /**
-    * Gets the value of the beanMethod property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NamedMethodMetaData }
+    * Returns the remove method on the bean
     *     
     */
    NamedMethodMetaData getBeanMethod();
 
    /**
-    * Sets the value of the beanMethod property.
+    * Sets the remove method of the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link NamedMethodMetaData }
+    * @param removedMethod
     *     
     */
-   void setBeanMethod(NamedMethodMetaData value);
+   void setBeanMethod(NamedMethodMetaData removeMethod);
 
    /**
-    * Gets the value of the retainIfException property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link TrueFalseType }
+    * Returns true if the bean has to be retained on exception.
+    * Else returns false.
     *     
     */
-   boolean getRetainIfException();
+   boolean isRetainIfException();
 
    /**
-    * Sets the value of the retainIfException property.
+    * Set to true if the bean has to be retained on exception.
+    * Else set to false.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link TrueFalseType }
+    * @param retainIfException
     *     
     */
-   void setRetainIfException(boolean value);
+   void setRetainIfException(boolean retainIfException);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
+   
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ResultTypeMappingType.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ResultTypeMappingType.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ResultTypeMappingType.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3.metadata.spi.javaee;
+
+/**
+ * ResultTypeMappingType
+ * 
+ * The result-type-mappingType is used in the query element to
+ * specify whether an abstract schema type returned by a query
+ * for a select method is to be mapped to an EJBLocalObject or
+ * EJBObject type.
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public enum ResultTypeMappingType 
+{
+
+   LOCAL, 
+   REMOTE
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -49,7 +49,7 @@
  * 
  * 
  */
-public interface ServiceRef_HandlerChainMetaData
+public interface ServiceRef_HandlerChainMetaData extends IdMetaData
 {
 
    /**
@@ -140,24 +140,6 @@
     */
    List<ServiceRef_HandlerMetaData> getHandler();
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
+   
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainsMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainsMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/ServiceRef_HandlerChainsMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -36,7 +36,7 @@
  * 
  * 
  */
-public interface ServiceRef_HandlerChainsMetaData
+public interface ServiceRef_HandlerChainsMetaData extends IdMetaData
 {
 
    /**
@@ -63,24 +63,6 @@
     */
    List<ServiceRef_HandlerChainMetaData> getHandlerChain();
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
-    */
-   java.lang.String getId();
+   
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/SessionBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/SessionBeanMetaData.java	2009-09-14 13:36:52 UTC (rev 93473)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/SessionBeanMetaData.java	2009-09-14 13:39:24 UTC (rev 93474)
@@ -423,7 +423,7 @@
     *
     */
    // TODO: Revisit, we need this
-   //List<MessageDestinationRefType> getMessageDestinationRef();
+   List<MessageDestinationRefMetaData> getMessageDestinationRef();
 
 
 




More information about the jboss-cvs-commits mailing list