[jboss-cvs] JBossAS SVN: r93815 - in projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi: jboss and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Sep 21 13:36:35 EDT 2009


Author: jaikiran
Date: 2009-09-21 13:36:34 -0400 (Mon, 21 Sep 2009)
New Revision: 93815

Added:
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPortComponentRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossServiceRefMetaData.java
Removed:
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/PortComponentRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceRefMetaData.java
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/jboss/AnnotationMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationPropertyMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CacheConfigMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CallPropertyMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ConsumerBeanMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/GenericBeanMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbLocalRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEnvEntryMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMethodMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceContextRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceUnitRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossProducerMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceEnvRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceRefMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSecurityRoleMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSessionBeanMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryConfigMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/MessagePropertiesMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagerMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagersMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceBeanMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/StubPropertyMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebserviceDescriptionMetaData.java
   projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebservicesMetaData.java
Log:
EJBTHREE-1791 Javadocs and more cleanup/refactoring

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-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/javaee/SessionBeanMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -423,7 +423,7 @@
     *
     */
    // TODO: Revisit, we need this
-   List<MessageDestinationRefMetaData> getMessageDestinationRef();
+   List<MessageDestinationRefMetaData> getMessageDestinationRefs();
 
 
 

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import org.jboss.ejb3.metadata.spi.javaee.DescriptionMetaData;
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.InjectionTargetMetaData;
 
 /**
@@ -43,7 +44,7 @@
  * 
  * 
  */
-public interface AnnotationMetaData
+public interface AnnotationMetaData extends IdMetaData
 {
 
    /**
@@ -71,107 +72,62 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the annotationClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AnnotationClassType }
+    * @return Returns the fully qualified class name of the annotation
     *     
     */
    String getAnnotationClass();
 
    /**
-    * Sets the value of the annotationClass property.
+    * Sets the fully qualified class name of the annotation to be added
+    * to the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link AnnotationClassType }
+    * @param annotationClassName Fully qualified class name of the annotation
     *     
     */
-   void setAnnotationClass(String value);
+   void setAnnotationClass(String annotationClassName);
 
    /**
-    * Gets the value of the annotationImplementationClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AnnotationClassType }
+    * @return Returns the fully qualified classname of the annotation implementation
+    * class
     *     
     */
    String getAnnotationImplementationClass();
 
    /**
-    * Sets the value of the annotationImplementationClass property.
+    * Sets the fully qualified class name of the annotation implementation
+    * class
     * 
-    * @param value
-    *     allowed object is
-    *     {@link AnnotationClassType }
+    * @param annotationImplClassName Fully qualified class name of the annotation
+    *                   implementation.
     *     
     */
-   void setAnnotationImplementationClass(String value);
+   void setAnnotationImplementationClass(String annotationImplClassName);
 
    /**
-    * Gets the value of the injectionTarget property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link InjectionTargetMetaData }
+    * @return Returns the injection target
     *     
     */
    InjectionTargetMetaData getInjectionTarget();
 
    /**
-    * Sets the value of the injectionTarget property.
+    * Sets the injection target for this annotation
     * 
-    * @param value
-    *     allowed object is
-    *     {@link InjectionTargetMetaData }
+    * @param injectionTarget
     *     
     */
-   void setInjectionTarget(InjectionTargetMetaData value);
+   void setInjectionTarget(InjectionTargetMetaData injectionTarget);
 
    /**
-    * Gets the value of the property property.
+    * Returns the properties associated with this annotation metadata
     * 
-    * <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 property property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getProperty().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AnnotationPropertyMetaData }
-    * 
-    * 
     */
-   List<AnnotationPropertyMetaData> getProperty();
-
+   List<AnnotationPropertyMetaData> getProperties();
+   
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
+    * Sets the annotation properties of this annotation
+    * @param annotationProperties
     */
-   String getId();
+   void setProperties(List<AnnotationPropertyMetaData> annotationProperties);
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationPropertyMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationPropertyMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/AnnotationPropertyMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import org.jboss.ejb3.metadata.spi.javaee.DescriptionMetaData;
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
 
 /**
  * 
@@ -39,7 +40,7 @@
  * 
  * 
  */
-public interface AnnotationPropertyMetaData
+public interface AnnotationPropertyMetaData extends IdMetaData
 {
 
    /**
@@ -67,63 +68,30 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the propertyName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
-    *     
+    * @return Returns the property name
     */
    String getPropertyName();
 
    /**
-    * Sets the value of the propertyName property.
+    * Sets the property name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @param name Property name
     *     
     */
-   void setPropertyName(String value);
+   void setPropertyName(String name);
 
    /**
-    * Gets the value of the propertyValue property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @return Returns the property value
     *     
     */
    String getPropertyValue();
 
    /**
-    * Sets the value of the propertyValue property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
-    *     
+    * Sets the property value
+    * @param value Property value     
     */
    void setPropertyValue(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/jboss/CacheConfigMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CacheConfigMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CacheConfigMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -145,8 +145,7 @@
     * Sets the value of the replicationIsPassivation property.
     *
     * @param value
-    *     allowed object is
-    *     {@link ReplicationIsPassivationType }
+    *     
     *
     */
    void setReplicationIsPassivation(String value);

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CallPropertyMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CallPropertyMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/CallPropertyMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -31,41 +31,24 @@
 {
 
    /**
-    * Gets the value of the propName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * Returns the property name
     *     
     */
    String getPropName();
 
    /**
-    * Sets the value of the propName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * Sets the property name
     *     
     */
-   void setPropName(String value);
+   void setPropName(String name);
 
    /**
-    * Gets the value of the propValue property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
+    * Returns the property value    
     */
    String getPropValue();
 
    /**
-    * Sets the value of the propValue property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * Sets the property value
     *     
     */
    void setPropValue(String value);

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ConsumerBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ConsumerBeanMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ConsumerBeanMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -13,6 +13,7 @@
 import org.jboss.ejb3.metadata.spi.javaee.DescriptionMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.DisplayNameMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.IconType;
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
 
 /**
  *  The consumer element holds all of the information specific about a
@@ -61,7 +62,7 @@
  * 
  * 
  */
-public interface ConsumerBeanMetaData
+public interface ConsumerBeanMetaData extends IdMetaData
 {
 
    /**
@@ -137,139 +138,103 @@
    List<IconType> getIcon();
 
    /**
-    * Gets the value of the ejbName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EjbNameType }
+    * @return Returns the EJB name
     *     
     */
    String getEjbName();
 
    /**
-    * Sets the value of the ejbName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EjbNameType }
+    * Sets the bean name
+    * @param ejbName Name of the EJB
     *     
     */
-   void setEjbName(String value);
+   void setEjbName(String ejbName);
 
    /**
-    * Gets the value of the ejbClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EjbClassType }
+    * @return Returns the fully qualified class name of the bean
     *     
     */
    String getEjbClass();
 
    /**
-    * Sets the value of the ejbClass property.
+    * Sets the fully qualified class name of the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link EjbClassType }
+    * @param ejbClass
     *     
     */
-   void setEjbClass(String value);
+   void setEjbClass(String ejbClass);
 
    /**
-    * Gets the value of the messageDestination property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ConsumerMessageDestinationType }
-    *     
+    * @return Returns the jndi-name of the message destination
+    * corresponding to this consumer bean
+    *      
     */
    String getMessageDestination();
 
    /**
-    * Sets the value of the messageDestination property.
+    * Sets the jndi-name of the message destination
+    * correpsonding to this consumer bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link ConsumerMessageDestinationType }
+    * @param messageDestination The jndi-name of the message destination
     *     
     */
-   void setMessageDestination(String value);
+   void setMessageDestination(String messageDestination);
 
    /**
-    * Gets the value of the messageDestinationType property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link MessageDestinationTypeType }
-    *     
-    */
+   *
+   * @return Returns the destination type associated with this
+   * message driven bean. The destination type is the fully qualified
+   * classname of the interface expected to be implemented by the destination.
+   *
+   *  Ex: javax.jms.Queue
+   *
+   */
    String getMessageDestinationType();
 
    /**
-    * Sets the value of the messageDestinationType property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link MessageDestinationTypeType }
-    *     
+    * Sets the destination type associated with this
+    * message driven bean. The destination type is the fully qualified
+    * classname of the interface expected to be implemented by the destination.
+    *
+    * @param destinationType Fully qualified classname of the interface implemented
+    * by the destination
+    *
     */
-   void setMessageDestinationType(String value);
+   void setMessageDestinationType(String destinationType);
 
    /**
-    * Gets the value of the producer property.
+    * @return Returns the list of producers associated with
+    * this consumer 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 producer property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getProducer().add(newItem);
-    * </pre>
+    */
+   List<JBossProducerMetaData> getProducers();
+
+   /**
+    * Sets the producers associated with this consumer bean
     * 
+    * @param producers
+    */
+   void setProducers(List<JBossProducerMetaData> producers);
+
+   /**
+    * @return Returns the list of local producers associated with
+    * this consumer bean
     * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossProducerMetaData }
     * 
-    * 
     */
-   List<JBossProducerMetaData> getProducer();
+   List<JBossProducerMetaData> getLocalProducers();
 
    /**
-    * Gets the value of the localProducer property.
+    * Sets the local producers associated with this consumer 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 localProducer property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getLocalProducer().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossProducerMetaData }
-    * 
-    * 
+    * @param localProducers
     */
-   List<JBossProducerMetaData> getLocalProducer();
+   void setLocalProducers(List<JBossProducerMetaData> localProducers);
 
    /**
-    * Gets the value of the currentMessage property.
     * 
     * @return
-    *     possible object is
-    *     {@link MethodAttributesMetaData }
     *     
     */
    MethodAttributesMetaData getCurrentMessage();
@@ -278,386 +243,239 @@
     * Sets the value of the currentMessage property.
     * 
     * @param value
-    *     allowed object is
-    *     {@link MethodAttributesMetaData }
     *     
     */
    void setCurrentMessage(MethodAttributesMetaData value);
 
    /**
-    * Gets the value of the messageProperties property.
+    * @return Returns the message properties
     * 
-    * <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 messageProperties property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getMessageProperties().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link MessagePropertiesMetaData }
-    * 
-    * 
     */
    List<MessagePropertiesMetaData> getMessageProperties();
 
    /**
-    * Gets the value of the ejbRef property.
+    * Sets the message properties
     * 
-    * <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 messageProperties
+    */
+   void setMessageProperties(List<MessagePropertiesMetaData> messageProperties);
+
+   /**
+    * Returns the list of EJB references of this bean
+    * Returns an empty list if there is no EJB reference for this bean.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEjbRefMetaData }
-    * 
-    * 
     */
-   List<JBossEjbRefMetaData> getEjbRef();
+   List<JBossEjbRefMetaData> getEjbRefs();
 
    /**
-    * Gets the value of the ejbLocalRef property.
+    * Sets the list of EJB references for this 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 ejbLocalRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbLocalRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEjbLocalRefMetaData }
-    * 
-    * 
+    * @param ejbRefs
     */
-   List<JBossEjbLocalRefMetaData> getEjbLocalRef();
+   void setEjbRefs(List<JBossEjbRefMetaData> ejbRefs);
 
    /**
-    * Gets the value of the securityIdentity property.
+    * @return Returns the list of EJB local references of this bean
+    * Returns an empty list if there is no EJB local reference for this bean.
     * 
-    * @return
-    *     possible object is
-    *     {@link JBossSecurityIdentityMetaData }
+    */
+   List<JBossEjbLocalRefMetaData> getEjbLocalRefs();
+
+   /**
+    * Sets the list of EJB local references for this bean
+    *
+    * @param ejbLocalRefs The list of EJB local references
+    */
+   void setEjbLocalRefs(List<JBossEjbLocalRefMetaData> ejbLocalRefs);
+
+   /**
+    * @return Returns the security identity associated with this bean
     *     
     */
    JBossSecurityIdentityMetaData getSecurityIdentity();
 
    /**
-    * Sets the value of the securityIdentity property.
+    * Sets the security identity associated with this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JBossSecurityIdentityMetaData }
+    * @param securityIdentity 
     *     
     */
-   void setSecurityIdentity(JBossSecurityIdentityMetaData value);
+   void setSecurityIdentity(JBossSecurityIdentityMetaData securityIdentity);
 
    /**
-    * Gets the value of the resourceRef property.
+    * @return Returns the list of resource references of this bean.
+    * 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 resourceRef property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceRef().add(newItem);
-    * </pre>
+    */
+   List<JBossResourceRefMetaData> getResourceRefs();
+
+   /**
+    * Sets the resource references of this bean
     * 
+    * @param resourceRefs
+    */
+   void setResourceRefs(List<JBossResourceRefMetaData> resourceRefs);
+
+   /**
+    * @return Returns the list of resource environment references of this bean.
+    * Returns an empty list if there are no such references.
     * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossResourceRefMetaData }
     * 
+    */
+   List<JBossResourceEnvRefMetaData> getResourceEnvRefs();
+
+   /**
+    * Sets the resource env references of this bean
     * 
+    * @param resourceEnvRefs
     */
-   List<JBossResourceRefMetaData> getResourceRef();
+   void setResourceEnvRefs(List<JBossResourceEnvRefMetaData> resourceEnvRefs);
 
    /**
-    * Gets the value of the resourceEnvRef property.
+    * @return Returns the list of message destination references of this bean.
+    * 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 resourceEnvRef property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceEnvRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossResourceEnvRefMetaData }
-    * 
-    * 
     */
-   List<JBossResourceEnvRefMetaData> getResourceEnvRef();
+   List<JBossMessageDestinationRefMetaData> getMessageDestinationRefs();
 
    /**
-    * Gets the value of the messageDestinationRef property.
+    * Sets the message destination references of this 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 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 JBossMessageDestinationRefMetaData }
-    * 
-    * 
+    * @param messageDestinationRefs
     */
-   List<JBossMessageDestinationRefMetaData> getMessageDestinationRef();
+   void setMessageDestinationRefs(List<JBossMessageDestinationRefMetaData> messageDestinationRefs);
 
    /**
-    * Gets the value of the securityDomain property.
     * 
-    * @return
-    *     possible object is
-    *     {@link SecurityDomainType }
+    * @return Returns the security domain associated with this bean
     *     
     */
    String getSecurityDomain();
 
    /**
-    * Sets the value of the securityDomain property.
+    * Sets the security domain associated with this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link SecurityDomainType }
+    * @param securityDomain The security domain for this bean
     *     
     */
-   void setSecurityDomain(String value);
+   void setSecurityDomain(String securityDomain);
 
    /**
-    * Gets the value of the methodAttributes property.
+    * Returns the method attributes configured for this bean
     * 
-    * @return
-    *     possible object is
-    *     {@link MethodAttributesMetaData }
-    *     
     */
    MethodAttributesMetaData getMethodAttributes();
 
    /**
-    * Sets the value of the methodAttributes property.
+    * Sets the method attributes for this bean 
     * 
-    * @param value
-    *     allowed object is
-    *     {@link MethodAttributesMetaData }
+    * @param methodAttributes
     *     
     */
-   void setMethodAttributes(MethodAttributesMetaData value);
+   void setMethodAttributes(MethodAttributesMetaData methodAttributes);
 
    /**
-    * Gets the value of the depends property.
+    * @return Returns a list of dependencies of this 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 depends property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDepends().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link DependsType }
-    * 
-    * 
     */
    List<String> getDepends();
 
    /**
-    * Gets the value of the annotation property.
+    * Sets the dependencies for this 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 annotation property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAnnotation().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AnnotationMetaData }
-    * 
-    * 
+    * @param dependencies
     */
-   List<AnnotationMetaData> getAnnotation();
+   void setDepends(List<String> dependencies);
 
    /**
-    * Gets the value of the ignoreDependency property.
+    * @return Returns the list of annotation added to this  consumer bean
     * 
-    * @return
-    *     possible object is
-    *     {@link IgnoreDependencyMetaData }
-    *     
     */
-   IgnoreDependencyMetaData getIgnoreDependency();
+   List<AnnotationMetaData> getAnnotations();
 
    /**
-    * Sets the value of the ignoreDependency property.
+    * Set the list of annotations to be added to the bean class, method or field
     * 
-    * @param value
-    *     allowed object is
-    *     {@link IgnoreDependencyMetaData }
-    *     
+    * @param annotations The list of annotations
     */
-   void setIgnoreDependency(IgnoreDependencyMetaData value);
+   void setAnnotations(List<AnnotationMetaData> annotations);
 
    /**
-    * Gets the value of the aopDomainName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AopDomainNameType }
-    *     
+    *  @return Returns the ignore dependency metadata associated with this bean
+    *
     */
-   String getAopDomainName();
+   IgnoreDependencyMetaData getIgnoreDependency();
 
    /**
-    * Sets the value of the aopDomainName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link AopDomainNameType }
-    *     
+    * Sets the ignore dependency metadata for this bean
+    *
+    * @param ignoreDependency The ignore dependency metadata
+    *
     */
-   void setAopDomainName(String value);
+   void setIgnoreDependency(IgnoreDependencyMetaData ignoreDependency);
 
+  /**
+   *
+   * @return Returns the AOP domain name associated with this bean.
+   * The aspect domain contains the interceptor stack and bindings
+   *
+   */
+   String getAopDomainName();
+
    /**
-    * Gets the value of the poolConfig property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link PoolConfigMetaData }
-    *     
+    * Sets the AOP domain name for this bean
+    *
+    * @param aopDomainName The AOP domain name
+    *
     */
-   PoolConfigMetaData getPoolConfig();
+   void setAopDomainName(String aopDomainName);
 
    /**
-    * Sets the value of the poolConfig property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link PoolConfigMetaData }
-    *     
+    *
+    *
+    * @return Returns the pool configuration of this bean
+    *
     */
-   void setPoolConfig(PoolConfigMetaData value);
+   PoolConfigMetaData getPoolConfig();
 
    /**
-    * Gets the value of the jndiRef 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 jndiRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getJndiRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JndiRefMetaData }
-    * 
-    * 
+    * Sets the pool configuration of this bean
+    *
+    * @param poolConfig The pool configuration for this bean
+    *
     */
-   List<JndiRefMetaData> getJndiRef();
+   void setPoolConfig(PoolConfigMetaData poolConfig);
 
    /**
-    * Gets the value of the activationConfig property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ActivationConfigMetaData }
-    *     
+    * @return Returns a list of jndi references for this bean.
+    * Returns an empty list if there are no such references.
+    *
     */
-   ActivationConfigMetaData getActivationConfig();
+   List<JndiRefMetaData> getJndiRefs();
 
    /**
-    * Sets the value of the activationConfig property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ActivationConfigMetaData }
-    *     
+    * Set the jndi references used to inject generic types based on JNDI name,
+    * for this bean
+    *
+    * @param jndiRefs
     */
-   void setActivationConfig(ActivationConfigMetaData value);
+   void setJndiRefs(List<JndiRefMetaData> jndiRefs);
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return Returns the activation config associated with this consumer bean
     *     
     */
-   String getId();
+   ActivationConfigMetaData getActivationConfig();
 
    /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * Sets the activation configuration for this consumer bean
+    *
+    * @param activationConfig
     *     
     */
-   void setId(String value);
+   void setActivationConfig(ActivationConfigMetaData activationConfig);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/GenericBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/GenericBeanMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/GenericBeanMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -127,619 +127,421 @@
    List<IconType> getIcon();
 
    /**
-    * Gets the value of the ejbName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EjbNameType }
+    * @return Returns the EJB name
     *     
     */
    String getEjbName();
 
    /**
-    * Sets the value of the ejbName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EjbNameType }
+    * Sets the bean name
+    * @param ejbName Name of the EJB
     *     
     */
-   void setEjbName(String value);
+   void setEjbName(String ejbName);
 
    /**
-    * Gets the value of the mappedName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *     
+    * Returns the mapped-name of the bean.
+    * Returns null if there is no mapped-name for
+    * this bean
+    *
     */
    String getMappedName();
 
    /**
-    * Sets the value of the mappedName property.
+    * Sets the mapped-name of the bean
+    * @param mappedName The mapped-name of the bean
+    */
+   void setMappedName(String mappedName);
+
+   /**
+    * Returns a list of env-entry metadata of this bean.
+    *
+    * Returns an empty list if there is no env-entry.
+    *
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
+    *
+    *
+    */
+   List<JBossEnvEntryMetaData> getEnvEntries();
+
+   /**
+    * Sets the env entries for this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *     
+    * @param envEntries
     */
-   void setMappedName(String value);
+   void setEnvEntries(List<JBossEnvEntryMetaData> envEntries);
 
    /**
-    * Gets the value of the envEntry property.
+    * Returns the list of EJB references of this bean
+    * Returns an empty list if there is no EJB reference for this 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 envEntry property.
+    */
+   List<JBossEjbRefMetaData> getEjbRefs();
+
+   /**
+    * Sets the list of EJB references for this bean
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEnvEntry().add(newItem);
-    * </pre>
+    * @param ejbRefs
+    */
+   void setEjbRefs(List<JBossEjbRefMetaData> ejbRefs);
+
+   /**
+    * @return Returns the list of EJB local references of this bean
+    * Returns an empty list if there is no EJB local reference for this bean.
     * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEnvEntryMetaData }
-    * 
-    * 
     */
-   List<JBossEnvEntryMetaData> getEnvEntry();
+   List<JBossEjbLocalRefMetaData> getEjbLocalRefs();
 
    /**
-    * Gets the value of the ejbRef property.
+    * Sets the list of EJB local references for this bean
+    *
+    * @param ejbLocalRefs The list of EJB local references
+    */
+   void setEjbLocalRefs(List<JBossEjbLocalRefMetaData> ejbLocalRefs);
+
+   /**
+    * Returns the list of web service reference(s) of this bean.
+    * Returns an empty list if there are no such references.
+    *
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list.
+    *
+    */
+   List<JBossServiceRefMetaData> getServiceRefs();
+
+   /**
+    * Sets the web service references for this 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 ejbRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEjbRefMetaData }
-    * 
-    * 
+    * @param serviceRefs
     */
-   List<JBossEjbRefMetaData> getEjbRef();
+   void setServiceRefs(List<JBossServiceRefMetaData> serviceRefs);
 
    /**
-    * Gets the value of the ejbLocalRef property.
+    * @return Returns the list of resource references of this bean.
+    * 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.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbLocalRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEjbLocalRefMetaData }
-    * 
-    * 
     */
-   List<JBossEjbLocalRefMetaData> getEjbLocalRef();
+   List<JBossResourceRefMetaData> getResourceRefs();
 
    /**
-    * Gets the value of the serviceRef property.
+    * Sets the resource references of this 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 serviceRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getServiceRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ServiceRefMetaData }
-    * 
-    * 
+    * @param resourceRefs
     */
-   List<ServiceRefMetaData> getServiceRef();
+   void setResourceRefs(List<JBossResourceRefMetaData> resourceRefs);
 
    /**
-    * Gets the value of the resourceRef property.
+    * @return Returns the list of resource environment references of this bean.
+    * 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 resourceRef property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossResourceRefMetaData }
-    * 
-    * 
     */
-   List<JBossResourceRefMetaData> getResourceRef();
+   List<JBossResourceEnvRefMetaData> getResourceEnvRefs();
 
    /**
-    * Gets the value of the resourceEnvRef property.
+    * Sets the resource env references of this 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 resourceEnvRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceEnvRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossResourceEnvRefMetaData }
-    * 
-    * 
+    * @param resourceEnvRefs
     */
-   List<JBossResourceEnvRefMetaData> getResourceEnvRef();
+   void setResourceEnvRefs(List<JBossResourceEnvRefMetaData> resourceEnvRefs);
 
    /**
-    * Gets the value of the messageDestinationRef property.
+    * @return Returns the list of message destination references of this bean.
+    * 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 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 JBossMessageDestinationRefMetaData }
-    * 
-    * 
     */
-   List<JBossMessageDestinationRefMetaData> getMessageDestinationRef();
+   List<JBossMessageDestinationRefMetaData> getMessageDestinationRefs();
 
    /**
-    * Gets the value of the persistenceContextRef property.
+    * Sets the message destination references of this 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 persistenceContextRef property.
-    * 
-    * <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 JBossPersistenceContextRefMetaData }
-    * 
-    * 
+    * @param messageDestinationRefs
     */
-   List<JBossPersistenceContextRefMetaData> getPersistenceContextRef();
+   void setMessageDestinationRefs(List<JBossMessageDestinationRefMetaData> messageDestinationRefs);
 
    /**
-    * Gets the value of the persistenceUnitRef property.
+    * @return Returns the list of persistence context references of this bean
+    *
+    * 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 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 JBossPersistenceUnitRefMetaData }
-    * 
-    * 
     */
-   List<JBossPersistenceUnitRefMetaData> getPersistenceUnitRef();
+   List<JBossPersistenceContextRefMetaData> getPersistenceContextRefs();
 
    /**
-    * Gets the value of the postConstruct property.
+    * Sets the persistence context references associated with this 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 postConstruct property.
-    * 
-    * <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 }
-    * 
-    * 
+    * @param persistenceCtxRefs
     */
-   List<LifecycleCallbackMetaData> getPostConstruct();
+   void setPersistenceContextRefs(List<JBossPersistenceContextRefMetaData> persistenceCtxRefs);
 
    /**
-    * Gets the value of the preDestroy property.
+    * @returns Returns the persistence unit references associated with this bean
+    *
+    * 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 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 }
-    * 
-    * 
     */
-   List<LifecycleCallbackMetaData> getPreDestroy();
+   List<JBossPersistenceUnitRefMetaData> getPersistenceUnitRefs();
 
    /**
-    * Gets the value of the securityIdentity property.
+    * Sets the persistence unit references associated with this bean
     * 
-    * @return
-    *     possible object is
-    *     {@link JBossSecurityIdentityMetaData }
+    * @param persistenceUnitRefs
+    */
+   void setPersistenceUnitRefs(List<JBossPersistenceUnitRefMetaData> persistenceUnitRefs);
+
+   /**
+    * @return Returns a list of post-construct methods associated with this bean
+    * 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<LifecycleCallbackMetaData> getPostConstructs();
+
+   /**
+    * Sets the post-constructs associated with this bean
+    *
+    * @param postConstructs The list of post-constructs
+    */
+   void setPostConstructs(List<LifecycleCallbackMetaData> postConstructs);
+
+   /**
+    * @return Returns a list of pre-destroy methods associated with this bean
+    * Returns an empty list if there are no pre-destroy callbacks for this bean.
+    *
+    * It's upto the implementation to return either a modifiable
+    * or an unmodifiable list
+    *
+    *
+    */
+   List<LifecycleCallbackMetaData> getPreDestroys();
+
+   /**
+    * Sets the list of pre-destroy callbacks associated with this bean
+    *
+    * @param preDestroys The list of pre-destroys for this bean
+    */
+   void setPreDestroys(List<LifecycleCallbackMetaData> preDestroys);
+
+   /**
+    * @return Returns the security identity associated with this bean
     *     
     */
    JBossSecurityIdentityMetaData getSecurityIdentity();
 
    /**
-    * Sets the value of the securityIdentity property.
+    * Sets the security identity associated with this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JBossSecurityIdentityMetaData }
+    * @param securityIdentity 
     *     
     */
-   void setSecurityIdentity(JBossSecurityIdentityMetaData value);
+   void setSecurityIdentity(JBossSecurityIdentityMetaData securityIdentity);
 
    /**
-    * Gets the value of the jndiName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
+    * @return Returns the jndi name of the bean
     *     
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi-name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *     
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the homeJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
+    * Returns the jndi name of the home interface of the bean
     *     
     */
    String getHomeJndiName();
 
    /**
-    * Sets the value of the homeJndiName property.
+    * Sets the jndi name of the home interface of the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *     
+    * @param homeJndiName The jndi name of the home interface of the bean
+    *          
     */
-   void setHomeJndiName(String value);
+   void setHomeJndiName(String homeJndiName);
 
    /**
-    * Gets the value of the localJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link LocalJndiNameType }
+    * Returns the jndi name of the local interface of the bean
     *     
     */
    String getLocalJndiName();
 
    /**
-    * Sets the value of the localJndiName property.
+    * Sets the jndi name of the local interface of the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link LocalJndiNameType }
+    * @param localJndiName The jndi name of the local interface of the bean
     *     
     */
-   void setLocalJndiName(String value);
+   void setLocalJndiName(String localJndiName);
 
    /**
-    * Gets the value of the localHomeJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
+    * Returns the jndi name of the local home interface of the bean
     *     
     */
    String getLocalHomeJndiName();
 
    /**
-    * Sets the value of the localHomeJndiName property.
+    * Sets the jndi name of the local home interface of the bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param localHomeJndiName The jndi name of the local home interface 
+    *   of the bean
     *     
     */
-   void setLocalHomeJndiName(String value);
+   void setLocalHomeJndiName(String localHomeJndiName);
 
    /**
-    * Gets the value of the jndiBindingPolicy property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiBindingPolicyType }
+    * @return Returns the fully qualified class name of the JNDI binding policy
     *     
     */
    String getJndiBindingPolicy();
 
    /**
-    * Sets the value of the jndiBindingPolicy property.
+    * Sets the jndi binding policy of this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiBindingPolicyType }
+    * @param jndiBindingPolicy Fully qualified class name of the JNDI binding policy
     *     
     */
-   void setJndiBindingPolicy(String value);
+   void setJndiBindingPolicy(String jndiBindingPolicy);
 
    /**
-    * Gets the value of the securityDomain property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SecurityDomainType }
-    *     
+    * @return Returns the security domain associated with this bean
     */
    String getSecurityDomain();
 
    /**
-    * Sets the value of the securityDomain property.
+    * Sets the security domain of this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link SecurityDomainType }
+    * @param securityDomain The security domain for this bean
     *     
     */
-   void setSecurityDomain(String value);
+   void setSecurityDomain(String securityDomain);
 
    /**
-    * Gets the value of the methodAttributes property.
+    * Returns the method attributes configured for this bean
     * 
-    * @return
-    *     possible object is
-    *     {@link MethodAttributesMetaData }
-    *     
     */
    MethodAttributesMetaData getMethodAttributes();
 
    /**
-    * Sets the value of the methodAttributes property.
+    * Sets the method attributes for this bean 
     * 
-    * @param value
-    *     allowed object is
-    *     {@link MethodAttributesMetaData }
+    * @param methodAttributes
     *     
     */
-   void setMethodAttributes(MethodAttributesMetaData value);
+   void setMethodAttributes(MethodAttributesMetaData methodAttributes);
 
    /**
-    * Gets the value of the depends property.
+    * @return Returns a list of dependencies of this 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 depends property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDepends().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link DependsType }
-    * 
-    * 
     */
    List<String> getDepends();
 
    /**
-    * Gets the value of the annotation property.
+    * Sets the dependencies for this 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 annotation property.
+    * @param dependencies
+    */
+   void setDepends(List<String> dependencies);
+
+   /**
+    * @return Returns the list of annotation added to this  consumer bean
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAnnotation().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AnnotationMetaData }
-    * 
-    * 
     */
-   List<AnnotationMetaData> getAnnotation();
+   List<AnnotationMetaData> getAnnotations();
 
    /**
-    * Gets the value of the ignoreDependency property.
+    * Set the list of annotations to be added to the bean class, method or field
     * 
-    * @return
-    *     possible object is
-    *     {@link IgnoreDependencyMetaData }
-    *     
+    * @param annotations The list of annotations
     */
+   void setAnnotations(List<AnnotationMetaData> annotations);
+
+   /**
+    *  @return Returns the ignore dependency metadata associated with this bean
+    *
+    */
    IgnoreDependencyMetaData getIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link IgnoreDependencyMetaData }
-    *     
+    * Sets the ignore dependency metadata for this bean
+    *
+    * @param ignoreDependency The ignore dependency metadata
+    *
     */
-   void setIgnoreDependency(IgnoreDependencyMetaData value);
+   void setIgnoreDependency(IgnoreDependencyMetaData ignoreDependency);
 
    /**
-    * Gets the value of the aopDomainName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AopDomainNameType }
-    *     
+    *
+    * @return Returns the AOP domain name associated with this bean.
+    * The aspect domain contains the interceptor stack and bindings
+    *
     */
    String getAopDomainName();
 
    /**
-    * Sets the value of the aopDomainName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link AopDomainNameType }
-    *     
+    * Sets the AOP domain name for this bean
+    *
+    * @param aopDomainName The AOP domain name
+    *
     */
-   void setAopDomainName(String value);
+   void setAopDomainName(String aopDomainName);
 
    /**
-    * Gets the value of the poolConfig property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link PoolConfigMetaData }
-    *     
-    */
+   *
+   *
+   * @return Returns the pool configuration of this bean
+   *
+   */
    PoolConfigMetaData getPoolConfig();
 
    /**
-    * Sets the value of the poolConfig property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link PoolConfigMetaData }
-    *     
+    * Sets the pool configuration of this bean
+    *
+    * @param poolConfig The pool configuration for this bean
+    *
     */
-   void setPoolConfig(PoolConfigMetaData value);
+   void setPoolConfig(PoolConfigMetaData poolConfig);
 
    /**
-    * Gets the value of the jndiRef 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 jndiRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getJndiRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JndiRefMetaData }
-    * 
-    * 
+    * @return Returns a list of jndi references for this bean.
+    * Returns an empty list if there are no such references.
+    *
     */
-   List<JndiRefMetaData> getJndiRef();
+   List<JndiRefMetaData> getJndiRefs();
 
    /**
-    * Gets the value of the portComponent property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link PortComponentMetaData }
-    *     
+    * Set the jndi references used to inject generic types based on JNDI name,
+    * for this bean
+    *
+    * @param jndiRefs
     */
+   void setJndiRefs(List<JndiRefMetaData> jndiRefs);
+
+   /**
+   *
+   * @return Returns the port component associated with this bean
+   *
+   */
    PortComponentMetaData getPortComponent();
 
    /**
-    * Sets the value of the portComponent property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link PortComponentMetaData }
-    *     
+    * Sets the port component metadata for this bean
+    *
+    * @param portComponent
+    *
     */
-   void setPortComponent(PortComponentMetaData value);
+   void setPortComponent(PortComponentMetaData portComponent);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbLocalRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbLocalRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbLocalRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -44,63 +44,50 @@
 {
 
    /**
-    * Gets the value of the localJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
+    * @return Returns the jndi name of this ejb-local-ref
     *     
     */
    String getLocalJndiName();
 
    /**
-    * Sets the value of the localJndiName property.
+    * Sets the jndi name of this ejb-local-ref
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param localJndiName 
     *     
     */
-   void setLocalJndiName(String value);
+   void setLocalJndiName(String localJndiName);
 
    /**
-    * Gets the value of the jndiName property.
+    * Returns the jndi name of this ejb-local-ref
     * 
     * @return
-    *     possible object is
-    *     {@link JndiNameType }
     *     
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this ejb-local-ref
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *     
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
+    * @return Returns true if ignore dependency is set for this bean. Else
+    * returns false
     * 
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
     *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
+    * Set to true if the dependencies on this bean are to be 
+    * ignored. Else set to false.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
+    * @param ignoreDependency
     *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEjbRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -44,43 +44,34 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
+    * @return Returns the jndi name of this ejb-ref
     *
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this ejb-ref
     *
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set for this bean. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies on this bean are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEnvEntryMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEnvEntryMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossEnvEntryMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -37,43 +37,34 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
+    * @return Returns the jndi name of this env-entry
     *
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this env-entry
     *
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set for this bean. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies on this bean are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -41,23 +41,17 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * @return Returns the jndi name of this message destination 
     *     
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this message destination 
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param jndiName
     *     
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMessageDestinationRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -38,43 +38,34 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
-    *
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *
+    * @return Returns the jndi name of this message destination ref
+    *     
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *
+    * Sets the jndi name of this message destination ref
+    * 
+    * @param jndiName
+    *     
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set for this bean. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies on this bean are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -16,8 +16,10 @@
 import org.jboss.ejb3.metadata.spi.javaee.AssemblyDescriptorMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.DescriptionMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.DisplayNameMetaData;
+import org.jboss.ejb3.metadata.spi.javaee.EnterpriseBeanMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.EnterpriseBeansMetaData;
 import org.jboss.ejb3.metadata.spi.javaee.IconType;
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
 
 /**
  *  The jboss element is the root element of the jboss.xml file. It contains
@@ -59,18 +61,10 @@
  * 
  * 
  */
-public interface JBossMetaData
+public interface JBossMetaData extends IdMetaData
 {
 
    /**
-    * 
-    * 
-    */
-   @XmlAttribute
-   @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-   public final static String VERSION = "5.1";
-
-   /**
     * Gets the value of the description property.
     * 
     * <p>
@@ -143,263 +137,188 @@
    List<IconType> getIcon();
 
    /**
-    * Gets the value of the loaderRepository property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link LoaderRepositoryMetaData }
+    * @return Returns the {@link LoaderRepositoryMetaData}
     *     
     */
    LoaderRepositoryMetaData getLoaderRepository();
 
    /**
-    * Sets the value of the loaderRepository property.
+    * Sets the loader repository metadata
     * 
-    * @param value
-    *     allowed object is
-    *     {@link LoaderRepositoryMetaData }
+    * @param loaderRepository 
     *     
     */
-   void setLoaderRepository(LoaderRepositoryMetaData value);
+   void setLoaderRepository(LoaderRepositoryMetaData loaderRepository);
 
    /**
-    * Gets the value of the jmxName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JmxNameType }
+    * @return Returns the JMX ObjectName of the MBean associated with the ejb-jar module. 
     *     
     */
    String getJmxName();
 
    /**
-    * Sets the value of the jmxName property.
+    * Sets the JMX ObjectName to use for the MBean associated with the ejb-jar module.
+    * This must be a unique name and valid JMX ObjectName string. 
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JmxNameType }
-    *     
+    * @param jmxName
     */
    void setJmxName(String value);
 
    /**
-    * Gets the value of the securityDomain property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SecurityDomainType }
+    * @return Returns the security domain associated with this ejb module
     *     
     */
    String getSecurityDomain();
 
    /**
-    * Sets the value of the securityDomain property.
+    * Sets the security domain associated with this ejb module
     * 
-    * @param value
-    *     allowed object is
-    *     {@link SecurityDomainType }
+    * @param securityDomain 
     *     
     */
-   void setSecurityDomain(String value);
+   void setSecurityDomain(String securityDomain);
 
    /**
-    * Gets the value of the missingMethodPermissionsExcludedMode property.
+    * The missing-method-permissions-excluded-mode determines the treatment
+    *        of missing method-permission mappings in the ejb-jar descriptor. The ejb 2.1
+    *        spec states: "It is possible that some methods are not assigned to any security
+    *        roles nor contained in the exclude-list element. In this case, it is the
+    *        responsibility of the Deployer to assign method permissions for all of the
+    *        unspecified methods, either by assigning them to security roles, or by marking
+    *        them as unchecked." The missing-method-permissions-excluded-mode is a boolean
+    *        that allows the deployer to globally indicate that all methods without a
+    *        method-permission element should be treated as excluded(= true and the default),
+    *       or that methods without a method-permission element should be treated as
+    *        unchecked(= false)
     * 
-    * @return
-    *     possible object is
-    *     {@link MissingMethodPermissionsExcludedModeType }
+    * @return Returns true if missing-method-permissions-excluded-mode is set. Else returns false.
     *     
     */
    boolean getMissingMethodPermissionsExcludedMode();
 
    /**
-    * Sets the value of the missingMethodPermissionsExcludedMode property.
+    * Sets missing-method-permissions-excluded-mode.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link MissingMethodPermissionsExcludedModeType }
+    * @param missingMethodPermissionExcludedMode true if missing-method-permissions-excluded-mode 
+    *   is to be set. Else false.
+    *   
+    *  @see #getMissingMethodPermissionsExcludedMode()
     *     
     */
-   void setMissingMethodPermissionsExcludedMode(boolean value);
+   void setMissingMethodPermissionsExcludedMode(boolean missingMethodPermissionExcludedMode);
 
    /**
-    * Gets the value of the unauthenticatedPrincipal property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link UnauthenticatedPrincipalType }
+    * @return Returns the unauthenticated-principal element specifies the name of the principal
+    * that will be returned by the EJBContext.getCallerPrincipal() method if there is no
+    * authenticated user. This Principal has no roles or privaledges to call any other beans.
     *     
     */
    String getUnauthenticatedPrincipal();
 
    /**
-    * Sets the value of the unauthenticatedPrincipal property.
+    * Sets the unauthenticated-principal. See {@link #getUnauthenticatedPrincipal()} for 
+    * more details about unauthenticated-principal
     * 
-    * @param value
-    *     allowed object is
-    *     {@link UnauthenticatedPrincipalType }
+    * @param unauthenticatedPrincipal
     *     
+    *     @see #getUnauthenticatedPrincipal()
+    *     
     */
-   void setUnauthenticatedPrincipal(String value);
+   void setUnauthenticatedPrincipal(String unauthenticatedPrincipal);
 
    /**
-    * Gets the value of the jndiBindingPolicy property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiBindingPolicyType }
+    * @return Return the fully qualified class name of the jndi binding policy
+    * for this ejb module
     *     
     */
    String getJndiBindingPolicy();
 
    /**
-    * Sets the value of the jndiBindingPolicy property.
+    * Sets the jndi binding policy of this ejb module
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiBindingPolicyType }
+    * @param jndiBindingPolicy The fully qualified class name of the jndi binding policy
     *     
     */
-   void setJndiBindingPolicy(String value);
+   void setJndiBindingPolicy(String jndiBindingPolicy);
 
    /**
-    * Gets the value of the jaccContextId property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JaccContextIdType }
+    * @return Returns the Jacc context id of this ejb module
     *     
     */
    String getJaccContextId();
 
    /**
-    * Sets the value of the jaccContextId property.
+    * Sets the Jacc context id of this ejb module
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JaccContextIdType }
+    * @param jaccContextId
     *     
     */
-   void setJaccContextId(String value);
+   void setJaccContextId(String jaccContextId);
 
    /**
-    * Gets the value of the webservices property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link WebservicesMetaData }
+    * @return Returns the web services metadata in this ejb module
     *     
     */
    WebservicesMetaData getWebservices();
 
    /**
-    * Sets the value of the webservices property.
+    * Sets the web services metadata 
     * 
-    * @param value
-    *     allowed object is
-    *     {@link WebservicesMetaData }
+    * @param webServicesMetadata
     *     
     */
-   void setWebservices(WebservicesMetaData value);
+   void setWebservices(WebservicesMetaData webServicesMetadata);
 
    /**
-    * Gets the value of the enterpriseBeans property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EnterpriseBeansMetaData }
-    *     
+    * @return Returns the enterprise beans present in this ejb module    
     */
-   EnterpriseBeansMetaData getEnterpriseBeans();
-
+   List<EnterpriseBeanMetaData> getEnterpriseBeans();
+   
    /**
-    * Sets the value of the enterpriseBeans property.
+    * Sets the enterprise beans in this ejb module
     * 
-    * @param value
-    *     allowed object is
-    *     {@link EnterpriseBeansMetaData }
-    *     
+    * @param enterpriseBeans
     */
-   void setEnterpriseBeans(EnterpriseBeansMetaData value);
+   void setEnterpriseBeans(List<EnterpriseBeanMetaData> enterpriseBeans);
 
    /**
-    * Gets the value of the assemblyDescriptor property.
+    * @return Returns the assembly-descriptor associated with this ejb module
     * 
-    * @return
-    *     possible object is
-    *     {@link AssemblyDescriptorMetaData }
-    *     
     */
    AssemblyDescriptorMetaData getAssemblyDescriptor();
 
    /**
-    * Sets the value of the assemblyDescriptor property.
+    * Sets the assembly-descriptor in this ejb-module
     * 
-    * @param value
-    *     allowed object is
-    *     {@link AssemblyDescriptorMetaData }
+    * @param assemblyDescriptor
     *     
     */
-   void setAssemblyDescriptor(AssemblyDescriptorMetaData value);
+   void setAssemblyDescriptor(AssemblyDescriptorMetaData assemblyDescriptor);
 
    /**
-    * Gets the value of the resourceManagers property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ResourceManagersMetaData }
+    * @return Returns the resource managers present in this ejb module
     *     
     */
-   ResourceManagersMetaData getResourceManagers();
+   List<ResourceManagerMetaData> getResourceManagers();
 
    /**
-    * Sets the value of the resourceManagers property.
+    * Sets the resource managers in this ejb module
     * 
-    * @param value
-    *     allowed object is
-    *     {@link ResourceManagersMetaData }
-    *     
+    * @param resourceManagers 
     */
-   void setResourceManagers(ResourceManagersMetaData value);
+   void setResourceManagers(List<ResourceManagerMetaData> resourceManagers);
 
    /**
-    * Gets the value of the metadataComplete property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
+    * @return Returns true if this ejb module is marked as metadata complete.
+    * Else returns false.
     */
-   Boolean isMetadataComplete();
+   boolean isMetadataComplete();
 
    /**
-    * Sets the value of the metadataComplete property.
+    * Set to true if the ejb module is metadata complete. Else set to false
     * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
+    * @param isMetadataComplete
     */
-   void setMetadataComplete(Boolean value);
+   void setMetadataComplete(Boolean isMetadataComplete);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMethodMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMethodMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossMethodMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -72,7 +72,7 @@
     * @return  Returns true if the method is idempotent, else returns false
     *
     */
-   Boolean isIdempotent();
+   boolean isIdempotent();
 
    /**
     * Set to true if the method is idempotent. Else set to false.
@@ -80,7 +80,7 @@
     * @param isIdempotent True if the method is idempotent, else false
     *
     */
-   void setIdempotent(Boolean isIdempotent);
+   void setIdempotent(boolean isIdempotent);
 
    /**
     *

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceContextRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceContextRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceContextRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -38,43 +38,34 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
+    * @return Returns the jndi name of this persistence context reference
     *
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this persistence context reference
     *
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceUnitRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceUnitRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPersistenceUnitRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -36,43 +36,34 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
+    * @return Returns the jndi name of this persistence unit reference
     *
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this persistence unit reference
     *
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPortComponentRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPortComponentRefMetaData.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossPortComponentRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -0,0 +1,167 @@
+//
+// 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.jboss;
+
+import java.util.List;
+
+/**
+ * <p>Java class for port-component-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="port-component-refType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="service-endpoint-interface" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="port-qname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="config-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="config-file" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="stub-property" type="{http://www.jboss.com/xml/ns/javaee}stub-propertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="call-property" type="{http://www.jboss.com/xml/ns/javaee}call-propertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public interface JBossPortComponentRefMetaData
+{
+
+   /**
+    * Gets the value of the serviceEndpointInterface property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   String getServiceEndpointInterface();
+
+   /**
+    * Sets the value of the serviceEndpointInterface property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   void setServiceEndpointInterface(String value);
+
+   /**
+    * Gets the value of the portQname property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   String getPortQname();
+
+   /**
+    * Sets the value of the portQname property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   void setPortQname(String value);
+
+   /**
+    * Gets the value of the configName property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   String getConfigName();
+
+   /**
+    * Sets the value of the configName property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   void setConfigName(String value);
+
+   /**
+    * Gets the value of the configFile property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   String getConfigFile();
+
+   /**
+    * Sets the value of the configFile property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   void setConfigFile(String value);
+
+   /**
+    * Gets the value of the stubProperty 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 stubProperty property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getStubProperty().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link StubPropertyMetaData }
+    * 
+    * 
+    */
+   List<StubPropertyMetaData> getStubProperty();
+
+   /**
+    * Gets the value of the callProperty 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 callProperty property.
+    * 
+    * <p>
+    * For example, to add a new item, do as follows:
+    * <pre>
+    *    getCallProperty().add(newItem);
+    * </pre>
+    * 
+    * 
+    * <p>
+    * Objects of the following type(s) are allowed in the list
+    * {@link CallPropertyMetaData }
+    * 
+    * 
+    */
+   List<CallPropertyMetaData> getCallProperty();
+
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossProducerMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossProducerMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossProducerMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -7,6 +7,8 @@
 
 package org.jboss.ejb3.metadata.spi.jboss;
 
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
+
 /**
  *  The producer element holds all of the information specific about a
  *             producer interface for a consumer bean Used in: consumer 
@@ -31,67 +33,34 @@
  * 
  * 
  */
-public interface JBossProducerMetaData
+public interface JBossProducerMetaData extends IdMetaData
 {
 
    /**
-    * Gets the value of the clazz property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link FullyQualifiedClassType }
+    * @return Returns the fully qualified classname of the producer
     *     
     */
-   String getClazz();
+   String getClassName();
 
    /**
-    * Sets the value of the clazz property.
+    * Sets the producer class name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link FullyQualifiedClassType }
+    * @param className Fully qualified class name of the producer
     *     
     */
-   void setClazz(String value);
+   void setClassName(String classname);
 
    /**
-    * Gets the value of the connectionFactory property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *     
+    * @return Returns the connection factory
     */
    String getConnectionFactory();
 
    /**
-    * Sets the value of the connectionFactory property.
+    * Sets the connection factory
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param connectionFactory
     *     
     */
-   void setConnectionFactory(String value);
+   void setConnectionFactory(String connectionFactory);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceEnvRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceEnvRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceEnvRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -36,43 +36,34 @@
 {
 
    /**
-    * Gets the value of the jndiName property.
+    * @return Returns the jndi name of this resource env-ref
     *
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of this resource env-ref
     *
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
+    * @param jndiName
     *
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossResourceRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -50,83 +50,61 @@
 {
 
    /**
-    * Gets the value of the resourceName property.
+    * @return Returns the resource name
     *
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *
     */
    String getResourceName();
 
    /**
-    * Sets the value of the resourceName property.
+    * Sets the resource name
     *
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param resourceName The resource name
     *
     */
-   void setResourceName(String value);
+   void setResourceName(String resourceName);
 
    /**
-    * Gets the value of the jndiName property.
-    *
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *
+    * Returns the jndi name of this resource ref
+    * 
     */
    String getJndiName();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the jndi name of the resource ref
     *
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param jndiName The jndi name
     *
     */
-   void setJndiName(String value);
+   void setJndiName(String jndiName);
 
    /**
-    * Gets the value of the resUrl property.
-    *
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *
+    * @return Returns the resource URL
     */
    String getResUrl();
 
    /**
-    * Sets the value of the resUrl property.
+    * Sets the resource URL
+    * 
+    * @param resourceURL 
     *
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
-    *
     */
-   void setResUrl(String value);
+   void setResUrl(String resourceURL);
 
    /**
-    * Gets the value of the ignoreDependency property.
-    *
-    * @return
-    *     possible object is
-    *     {@link EmptyType }
-    *
+    * @return Returns true if ignore dependency is set. Else
+    * returns false
+    * 
+    *     
     */
    boolean isIgnoreDependency();
 
    /**
-    * Sets the value of the ignoreDependency property.
-    *
-    * @param value
-    *     allowed object is
-    *     {@link EmptyType }
-    *
+    * Set to true if the dependencies are to be 
+    * ignored. Else set to false.
+    * 
+    * @param ignoreDependency
+    *     
     */
-   void setIgnoreDependency(boolean value);
+   void setIgnoreDependency(boolean ignoreDependency);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSecurityRoleMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSecurityRoleMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSecurityRoleMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -40,27 +40,16 @@
 {
 
    /**
-    * Gets the value of the principalName property.
+    * @return Returns a list of principal names associated with this
+    * security role
+    */
+   List<String> getPrincipalNames();
+   
+   /**
+    * Sets the principal names associated with this security role
     * 
-    * <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 principalName property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPrincipalName().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link PrincipalNameType }
-    * 
-    * 
+    * @param principalNames
     */
-   List<String> getPrincipalName();
+   void setPrincipalNames(List<String> principalNames);
 
 }

Added: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossServiceRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossServiceRefMetaData.java	                        (rev 0)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossServiceRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -0,0 +1,200 @@
+//
+// 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.jboss;
+
+import java.util.List;
+
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
+
+/**
+ * 
+ *                  
+ *   Runtime settings for a web service reference. In the simplest case,
+ *   there is no runtime information required for a service ref.  Runtime info
+ *   is only needed in the following cases :
+ * 
+ *   * to define the port that should be used to resolve a container-managed port
+ *   * to define default Stub property settings for Stub objects
+ *   * to define the URL of a final WSDL document to be used
+ * 
+ *   Example:
+ * 
+ *   <service-ref>
+ *    <service-ref-name>OrganizationService</service-ref-name>
+ *    <wsdl-override>file:/wsdlRepository/organization-service.wsdl</wsdl-override>
+ *   </service-ref>
+ * 
+ *   <service-ref>
+ *    <service-ref-name>OrganizationService</service-ref-name>
+ *    <config-name>Secure Client Config</config-name>
+ *    <config-file>META-INF/jbossws-client-config.xml</config-file>
+ *    <handler-chain>META-INF/jbossws-client-handlers.xml</handler-chain>
+ *   </service-ref>
+ * 
+ *   <service-ref>
+ *    <service-ref-name>SecureService</service-ref-name>
+ *    <service-impl-class>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class>
+ *    <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
+ *     <port-component-ref>
+ *      <service-endpoint-interface>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
+ *      <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
+ *      <stub-property>
+ *       <name>javax.xml.ws.security.auth.username</name>
+ *       <value>kermit</value>
+ *      </stub-property>
+ *      <stub-property>
+ *       <name>javax.xml.ws.security.auth.password</name>
+ *       <value>thefrog</value>
+ *      </stub-property>
+ *    </port-component-ref>
+ *   </service-ref>
+ *     
+ *          
+ * 
+ * <p>Java class for service-refType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="service-refType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="service-ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="service-impl-class" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="service-qname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="config-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="config-file" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="handler-chain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="port-component-ref" type="{http://www.jboss.com/xml/ns/javaee}port-component-refType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="wsdl-override" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public interface JBossServiceRefMetaData extends IdMetaData
+{
+
+   /**
+    * @return Returns the service reference name
+    *     
+    */
+   String getServiceRefName();
+
+   /**
+    * Sets the service ref name
+    * @param serviceRefName    
+    *     
+    */
+   void setServiceRefName(String serviceRefName);
+
+   /**
+    * 
+    * @return Returns the service implementation class
+    *     
+    */
+   String getServiceImplClass();
+
+   /**
+    * Sets the service implementation class
+    * @param serviceImplClass
+    */
+   void setServiceImplClass(String serviceImplClass);
+
+   /**
+    * @return Returns the service QName
+    *     
+    */
+   String getServiceQname();
+
+   /**
+    * Sets the service QName
+    * @param serviceQName
+    *     
+    */
+   void setServiceQname(String serviceQName);
+
+   /**
+    * @return Returns the config name
+    *     
+    */
+   String getConfigName();
+
+   /**
+    * Sets the config name
+    * 
+    * @param configName
+    *     
+    */
+   void setConfigName(String configName);
+
+   /**
+    * 
+    * @return Returns the service config file
+    *     
+    */
+   String getConfigFile();
+
+   /**
+    * Sets the value of the configFile property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   void setConfigFile(String configFile);
+
+   /**
+    * @return Returns the handler chain
+    *     
+    */
+   String getHandlerChain();
+
+   /**
+    * Sets the handler chain
+    * 
+    * @param handlerChain 
+    *     
+    */
+   void setHandlerChain(String handlerChain);
+
+   /**
+    * @return Returns the port component references
+    * 
+    * 
+    */
+   List<JBossPortComponentRefMetaData> getPortComponentRefs();
+   
+   /**
+    * Sets the port component refs
+    * 
+    * @param portComponentRefs
+    */
+   void setPortComponentRefs(List<JBossPortComponentRefMetaData> portComponentRefs);
+
+   /**
+    * @return Returns the wsdl override
+    */
+   String getWsdlOverride();
+
+   /**
+    * Sets the wsdl override
+    * @param wsdlOverride
+    *     
+    */
+   void setWsdlOverride(String wsdlOverride);
+
+   
+
+}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSessionBeanMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/JBossSessionBeanMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -62,7 +62,7 @@
 {
 
    //TODO
-   List<JBossMessageDestinationRefMetaData> getMessageDestinationRefs();
+//   List<JBossMessageDestinationRefMetaData> getMessageDestinationRefs();
 
    /**
     * @return Returns the local jndi bindings for this bean.
@@ -262,7 +262,7 @@
     * @return Returns a list of annotations that will be added to the bean class,
     * method or field.
     *
-    * Returns an empty list if there are no such dependencies.
+    * Returns an empty list if there are no such annotations.
     *
     * It's upto the implementation to return either a modifiable
     * or an unmodifiable list

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryConfigMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryConfigMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryConfigMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -60,26 +60,6 @@
    void setContent(String value);
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
-   /**
     * Gets the value of the configParserClass property.
     * 
     * @return

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/LoaderRepositoryMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -11,6 +11,8 @@
 import java.util.List;
 import javax.xml.bind.JAXBElement;
 
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
+
 /**
  * 
  *             
@@ -52,7 +54,7 @@
  * 
  * 
  */
-public interface LoaderRepositoryMetaData
+public interface LoaderRepositoryMetaData extends IdMetaData
 {
 
    /**
@@ -98,27 +100,9 @@
     */
    List<Serializable> getContent();
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
+  
 
    /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
-   /**
     * Gets the value of the loaderRepositoryClass property.
     * 
     * @return

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/MessagePropertiesMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/MessagePropertiesMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/MessagePropertiesMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -7,6 +7,8 @@
 
 package org.jboss.ejb3.metadata.spi.jboss;
 
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
+
 /**
  *  Element for defining JMS message properties (e.g. persistence, priority)
  *             for a consumer bean Used in: consumer 
@@ -33,107 +35,55 @@
  * 
  * 
  */
-public interface MessagePropertiesMetaData
+public interface MessagePropertiesMetaData extends IdMetaData
 {
 
    /**
-    * Gets the value of the clazz property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *     
+    * @return     
     */
-   String getClazz();
+   String getClassName();
 
    /**
-    * Sets the value of the clazz property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param className
     *     
     */
-   void setClazz(String value);
+   void setClassName(String className);
 
    /**
-    * Gets the value of the method property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JBossMethodMetaData }
+    * @return 
     *     
     */
    JBossMethodMetaData getMethod();
 
    /**
-    * Sets the value of the method property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link JBossMethodMetaData }
+    * @param
     *     
     */
    void setMethod(JBossMethodMetaData value);
 
    /**
-    * Gets the value of the delivery property.
-    * 
     * @return
-    *     possible object is
-    *     {@link XsdStringType }
     *     
     */
    String getDelivery();
 
    /**
-    * Sets the value of the delivery property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param 
     *     
     */
-   void setDelivery(String value);
+   void setDelivery(String delivery);
 
    /**
-    * Gets the value of the priority property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdIntegerType }
+    * @return Returns the message priority
     *     
     */
    int getPriority();
 
    /**
-    * Sets the value of the priority property.
+    * Sets the message priority
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdIntegerType }
-    *     
+    * @param priority
     */
-   void setPriority(int value);
+   void setPriority(int priority);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Deleted: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/PortComponentRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/PortComponentRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/PortComponentRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -1,167 +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.jboss;
-
-import java.util.List;
-
-/**
- * <p>Java class for port-component-refType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="port-component-refType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="service-endpoint-interface" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="port-qname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="config-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="config-file" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="stub-property" type="{http://www.jboss.com/xml/ns/javaee}stub-propertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="call-property" type="{http://www.jboss.com/xml/ns/javaee}call-propertyType" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public interface PortComponentRefMetaData
-{
-
-   /**
-    * Gets the value of the serviceEndpointInterface property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getServiceEndpointInterface();
-
-   /**
-    * Sets the value of the serviceEndpointInterface property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setServiceEndpointInterface(String value);
-
-   /**
-    * Gets the value of the portQname property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getPortQname();
-
-   /**
-    * Sets the value of the portQname property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setPortQname(String value);
-
-   /**
-    * Gets the value of the configName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getConfigName();
-
-   /**
-    * Sets the value of the configName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setConfigName(String value);
-
-   /**
-    * Gets the value of the configFile property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getConfigFile();
-
-   /**
-    * Sets the value of the configFile property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setConfigFile(String value);
-
-   /**
-    * Gets the value of the stubProperty 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 stubProperty property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getStubProperty().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link StubPropertyMetaData }
-    * 
-    * 
-    */
-   List<StubPropertyMetaData> getStubProperty();
-
-   /**
-    * Gets the value of the callProperty 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 callProperty property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getCallProperty().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link CallPropertyMetaData }
-    * 
-    * 
-    */
-   List<CallPropertyMetaData> getCallProperty();
-
-}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagerMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagerMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagerMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -71,103 +71,61 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the resName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * @return Returns the name of the resource
     *     
     */
    String getResName();
 
    /**
-    * Sets the value of the resName property.
+    * Sets the name of the resource
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param resName Resource name
     *     
     */
-   void setResName(String value);
+   void setResName(String resName);
 
    /**
-    * Gets the value of the resJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * @return Returns the resource jndi name
     *     
     */
    String getResJndiName();
 
    /**
-    * Sets the value of the resJndiName property.
+    * Sets the resource jndi name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param jndiName
     *     
     */
-   void setResJndiName(String value);
+   void setResJndiName(String jndiName);
 
    /**
-    * Gets the value of the resUrl property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
+    * @return Returns the resource URL
     *     
     */
    String getResUrl();
 
    /**
-    * Sets the value of the resUrl property.
+    * Sets the resource URL
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
+    * @param resURL
     *     
     */
-   void setResUrl(String value);
+   void setResUrl(String resURL);
 
    /**
-    * Gets the value of the id property.
+    * @return Returns the fully qualified classname of the resource
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * ex: javax.sql.DataSource
     *     
     */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
-   /**
-    * Gets the value of the resClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
    String getResClass();
 
    /**
-    * Sets the value of the resClass property.
+    * Sets the resource class name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * @param className Fully qualified classname of the resource (ex: javax.sql.DataSource)
     *     
     */
-   void setResClass(String value);
+   void setResClass(String className);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagersMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagersMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ResourceManagersMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -72,47 +72,17 @@
    List<DescriptionMetaData> getDescription();
 
    /**
-    * Gets the value of the resourceManager property.
+    * @return Returns a list of resource managers
     * 
-    * <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 resourceManager property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceManager().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ResourceManagerMetaData }
-    * 
-    * 
     */
-   List<ResourceManagerMetaData> getResourceManager();
-
+   List<ResourceManagerMetaData> getResourceManagers();
+   
    /**
-    * Gets the value of the id property.
+    * Sets the resource managers
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
+    * @param resourceManagers
     */
-   String getId();
+   void setResourceManagers(List<ResourceManagerMetaData> resourceManagers);
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceBeanMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceBeanMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceBeanMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -7,12 +7,9 @@
 
 package org.jboss.ejb3.metadata.spi.jboss;
 
-import java.util.List;
+import javax.management.ObjectName;
 
-import org.jboss.ejb3.metadata.spi.javaee.DescriptionMetaData;
-import org.jboss.ejb3.metadata.spi.javaee.DisplayNameMetaData;
-import org.jboss.ejb3.metadata.spi.javaee.IconType;
-import org.jboss.ejb3.metadata.spi.javaee.LifecycleCallbackMetaData;
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
 
 /**
  *  The service element holds all of the information specific about a service
@@ -67,951 +64,55 @@
  * 
  * 
  */
-public interface ServiceBeanMetaData
+public interface ServiceBeanMetaData extends IdMetaData, JBossSessionBeanMetaData
 {
 
    /**
-    * 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 ejbName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EjbNameType }
+    * @return Returns the objectname of the service bean
     *     
     */
-   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 businessLocal 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 businessLocal property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getBusinessLocal().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link FullyQualifiedClassType }
-    * 
-    * 
-    */
-   List<String> getBusinessLocal();
-
-   /**
-    * Gets the value of the businessRemote 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 businessRemote property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getBusinessRemote().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link FullyQualifiedClassType }
-    * 
-    * 
-    */
-   List<String> getBusinessRemote();
-
-   /**
-    * Gets the value of the ejbClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EjbClassType }
-    *     
-    */
-   String getEjbClass();
-
-   /**
-    * Sets the value of the ejbClass property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EjbClassType }
-    *     
-    */
-   void setEjbClass(String value);
-
-   /**
-    * Gets the value of the envEntry 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 envEntry property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEnvEntry().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEnvEntryMetaData }
-    * 
-    * 
-    */
-   List<JBossEnvEntryMetaData> getEnvEntry();
-
-   /**
-    * Gets the value of the ejbRef 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 ejbRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEjbRefMetaData }
-    * 
-    * 
-    */
-   List<JBossEjbRefMetaData> getEjbRef();
-
-   /**
-    * Gets the value of the ejbLocalRef 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 ejbLocalRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getEjbLocalRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossEjbLocalRefMetaData }
-    * 
-    * 
-    */
-   List<JBossEjbLocalRefMetaData> getEjbLocalRef();
-
-   /**
-    * Gets the value of the serviceRef 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 serviceRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getServiceRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ServiceRefMetaData }
-    * 
-    * 
-    */
-   List<ServiceRefMetaData> getServiceRef();
-
-   /**
-    * Gets the value of the resourceRef 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 resourceRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossResourceRefMetaData }
-    * 
-    * 
-    */
-   List<JBossResourceRefMetaData> getResourceRef();
-
-   /**
-    * Gets the value of the resourceEnvRef 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 resourceEnvRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getResourceEnvRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JBossResourceEnvRefMetaData }
-    * 
-    * 
-    */
-   List<JBossResourceEnvRefMetaData> getResourceEnvRef();
-
-   /**
-    * Gets the value of the messageDestinationRef 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 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 JBossMessageDestinationRefMetaData }
-    * 
-    * 
-    */
-   List<JBossMessageDestinationRefMetaData> getMessageDestinationRef();
-
-   /**
-    * Gets the value of the persistenceContextRef 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 persistenceContextRef property.
-    * 
-    * <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 JBossPersistenceContextRefMetaData }
-    * 
-    * 
-    */
-   List<JBossPersistenceContextRefMetaData> getPersistenceContextRef();
-
-   /**
-    * Gets the value of the persistenceUnitRef 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 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 JBossPersistenceUnitRefMetaData }
-    * 
-    * 
-    */
-   List<JBossPersistenceUnitRefMetaData> getPersistenceUnitRef();
-
-   /**
-    * Gets the value of the postConstruct 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 postConstruct property.
-    * 
-    * <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();
-
-   /**
-    * Gets the value of the preDestroy 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 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 }
-    * 
-    * 
-    */
-   List<LifecycleCallbackMetaData> getPreDestroy();
-
-   /**
-    * Gets the value of the securityIdentity property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JBossSecurityIdentityMetaData }
-    *     
-    */
-   JBossSecurityIdentityMetaData getSecurityIdentity();
-
-   /**
-    * Sets the value of the securityIdentity property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link JBossSecurityIdentityMetaData }
-    *     
-    */
-   void setSecurityIdentity(JBossSecurityIdentityMetaData value);
-
-   /**
-    * Gets the value of the objectName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JmxNameType }
-    *     
-    */
    String getObjectName();
 
    /**
     * Sets the value of the objectName property.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JmxNameType }
+    * @param objectName A valid {@link ObjectName}
     *     
     */
-   void setObjectName(String value);
+   void setObjectName(String objectName);
 
    /**
-    * Gets the value of the management property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ManagementType }
+    * @return Returns the fully qualified class name of the 
+    * management interface of this bean
     *     
     */
    String getManagement();
 
    /**
-    * Sets the value of the management property.
+    * Sets the fully qualified class name of the management
+    * interface of this bean
     * 
-    * @param value
-    *     allowed object is
-    *     {@link ManagementType }
-    *     
-    */
-   void setManagement(String value);
-
-   /**
-    * Gets the value of the xmbean property.
+    * @param managementInterface Fully qualified class name of the management 
+    * interface 
     * 
-    * @return
-    *     possible object is
-    *     {@link XmbeanType }
     *     
     */
-   String getXmbean();
+   void setManagement(String managementInterface);
 
    /**
-    * Sets the value of the xmbean property.
     * 
-    * @param value
-    *     allowed object is
-    *     {@link XmbeanType }
-    *     
-    */
-   void setXmbean(String value);
-
-   /**
-    * Gets the value of the localBinding 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 localBinding property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getLocalBinding().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalBindingMetaData }
-    * 
-    * 
-    */
-   List<LocalBindingMetaData> getLocalBinding();
-
-   /**
-    * Gets the value of the remoteBinding 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 remoteBinding property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getRemoteBinding().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link RemoteBindingMetaData }
-    * 
-    * 
-    */
-   List<RemoteBindingMetaData> getRemoteBinding();
-
-   /**
-    * Gets the value of the jndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
+    * @return Returns the URL to the XMBean metadata
     *     
     */
-   String getJndiName();
+   String getXmbean();
 
    /**
-    * Sets the value of the jndiName property.
+    * Sets the URL to the XMBean metadata
     * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *     
+    * @param xmbean URL to the XMBean metadata
     */
-   void setJndiName(String value);
+   void setXmbean(String xmbean);
 
-   /**
-    * Gets the value of the homeJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *     
-    */
-   String getHomeJndiName();
-
-   /**
-    * Sets the value of the homeJndiName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *     
-    */
-   void setHomeJndiName(String value);
-
-   /**
-    * Gets the value of the localJndiName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiNameType }
-    *     
-    */
-   String getLocalJndiName();
-
-   /**
-    * Sets the value of the localJndiName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiNameType }
-    *     
-    */
-   void setLocalJndiName(String value);
-
-   /**
-    * Gets the value of the jndiBindingPolicy property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JndiBindingPolicyType }
-    *     
-    */
-   String getJndiBindingPolicy();
-
-   /**
-    * Sets the value of the jndiBindingPolicy property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link JndiBindingPolicyType }
-    *     
-    */
-   void setJndiBindingPolicy(String value);
-
-   /**
-    * Gets the value of the clustered property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ClusteredType }
-    *     
-    */
-   boolean getClustered();
-
-   /**
-    * Sets the value of the clustered property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ClusteredType }
-    *     
-    */
-   void setClustered(boolean value);
-
-   /**
-    * Gets the value of the clusterConfig property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ClusterConfigMetaData }
-    *     
-    */
-   ClusterConfigMetaData getClusterConfig();
-
-   /**
-    * Sets the value of the clusterConfig property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ClusterConfigMetaData }
-    *     
-    */
-   void setClusterConfig(ClusterConfigMetaData value);
-
-   /**
-    * Gets the value of the securityDomain property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XsdStringType }
-    *     
-    */
-   String getSecurityDomain();
-
-   /**
-    * Sets the value of the securityDomain property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XsdStringType }
-    *     
-    */
-   void setSecurityDomain(String value);
-
-   /**
-    * Gets the value of the methodAttributes property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link MethodAttributesMetaData }
-    *     
-    */
-   MethodAttributesMetaData getMethodAttributes();
-
-   /**
-    * Sets the value of the methodAttributes property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link MethodAttributesMetaData }
-    *     
-    */
-   void setMethodAttributes(MethodAttributesMetaData value);
-
-   /**
-    * Gets the value of the depends 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 depends property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getDepends().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link XsdStringType }
-    * 
-    * 
-    */
-   List<String> getDepends();
-
-   /**
-    * Gets the value of the annotation 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 annotation property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAnnotation().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AnnotationMetaData }
-    * 
-    * 
-    */
-   List<AnnotationMetaData> getAnnotation();
-
-   /**
-    * Gets the value of the ignoreDependency property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link IgnoreDependencyMetaData }
-    *     
-    */
-   IgnoreDependencyMetaData getIgnoreDependency();
-
-   /**
-    * Sets the value of the ignoreDependency property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link IgnoreDependencyMetaData }
-    *     
-    */
-   void setIgnoreDependency(IgnoreDependencyMetaData value);
-
-   /**
-    * Gets the value of the aopDomainName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AopDomainNameType }
-    *     
-    */
-   String getAopDomainName();
-
-   /**
-    * Sets the value of the aopDomainName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link AopDomainNameType }
-    *     
-    */
-   void setAopDomainName(String value);
-
-   /**
-    * Gets the value of the poolConfig property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link PoolConfigMetaData }
-    *     
-    */
-   PoolConfigMetaData getPoolConfig();
-
-   /**
-    * Sets the value of the poolConfig property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link PoolConfigMetaData }
-    *     
-    */
-   void setPoolConfig(PoolConfigMetaData value);
-
-   /**
-    * Gets the value of the concurrent property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ConcurrentType }
-    *     
-    */
-   boolean getConcurrent();
-
-   /**
-    * Sets the value of the concurrent property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ConcurrentType }
-    *     
-    */
-   void setConcurrent(boolean value);
-
-   /**
-    * Gets the value of the jndiRef 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 jndiRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getJndiRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link JndiRefMetaData }
-    * 
-    * 
-    */
-   List<JndiRefMetaData> getJndiRef();
-
-   /**
-    * Gets the value of the portComponent property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link PortComponentMetaData }
-    *     
-    */
-   PortComponentMetaData getPortComponent();
-
-   /**
-    * Sets the value of the portComponent property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link PortComponentMetaData }
-    *     
-    */
-   void setPortComponent(PortComponentMetaData value);
-
-   /**
-    * Gets the value of the ejbTimeoutIdentity property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link JBossSecurityIdentityMetaData }
-    *     
-    */
-   JBossSecurityIdentityMetaData getEjbTimeoutIdentity();
-
-   /**
-    * Sets the value of the ejbTimeoutIdentity property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link JBossSecurityIdentityMetaData }
-    *     
-    */
-   void setEjbTimeoutIdentity(JBossSecurityIdentityMetaData value);
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Deleted: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceRefMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceRefMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/ServiceRefMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -1,270 +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.jboss;
-
-import java.util.List;
-
-/**
- * 
- *                  
- *   Runtime settings for a web service reference. In the simplest case,
- *   there is no runtime information required for a service ref.  Runtime info
- *   is only needed in the following cases :
- * 
- *   * to define the port that should be used to resolve a container-managed port
- *   * to define default Stub property settings for Stub objects
- *   * to define the URL of a final WSDL document to be used
- * 
- *   Example:
- * 
- *   <service-ref>
- *    <service-ref-name>OrganizationService</service-ref-name>
- *    <wsdl-override>file:/wsdlRepository/organization-service.wsdl</wsdl-override>
- *   </service-ref>
- * 
- *   <service-ref>
- *    <service-ref-name>OrganizationService</service-ref-name>
- *    <config-name>Secure Client Config</config-name>
- *    <config-file>META-INF/jbossws-client-config.xml</config-file>
- *    <handler-chain>META-INF/jbossws-client-handlers.xml</handler-chain>
- *   </service-ref>
- * 
- *   <service-ref>
- *    <service-ref-name>SecureService</service-ref-name>
- *    <service-impl-class>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class>
- *    <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
- *     <port-component-ref>
- *      <service-endpoint-interface>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
- *      <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
- *      <stub-property>
- *       <name>javax.xml.ws.security.auth.username</name>
- *       <value>kermit</value>
- *      </stub-property>
- *      <stub-property>
- *       <name>javax.xml.ws.security.auth.password</name>
- *       <value>thefrog</value>
- *      </stub-property>
- *    </port-component-ref>
- *   </service-ref>
- *     
- *          
- * 
- * <p>Java class for service-refType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="service-refType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="service-ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="service-impl-class" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="service-qname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="config-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="config-file" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="handler-chain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="port-component-ref" type="{http://www.jboss.com/xml/ns/javaee}port-component-refType" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="wsdl-override" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public interface ServiceRefMetaData
-{
-
-   /**
-    * Gets the value of the serviceRefName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getServiceRefName();
-
-   /**
-    * Sets the value of the serviceRefName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setServiceRefName(String value);
-
-   /**
-    * Gets the value of the serviceImplClass property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getServiceImplClass();
-
-   /**
-    * Sets the value of the serviceImplClass property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setServiceImplClass(String value);
-
-   /**
-    * Gets the value of the serviceQname property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getServiceQname();
-
-   /**
-    * Sets the value of the serviceQname property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setServiceQname(String value);
-
-   /**
-    * Gets the value of the configName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getConfigName();
-
-   /**
-    * Sets the value of the configName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setConfigName(String value);
-
-   /**
-    * Gets the value of the configFile property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getConfigFile();
-
-   /**
-    * Sets the value of the configFile property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setConfigFile(String value);
-
-   /**
-    * Gets the value of the handlerChain property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getHandlerChain();
-
-   /**
-    * Sets the value of the handlerChain property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setHandlerChain(String value);
-
-   /**
-    * Gets the value of the portComponentRef 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 portComponentRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getPortComponentRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link PortComponentRefMetaData }
-    * 
-    * 
-    */
-   List<PortComponentRefMetaData> getPortComponentRef();
-
-   /**
-    * Gets the value of the wsdlOverride property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getWsdlOverride();
-
-   /**
-    * Sets the value of the wsdlOverride property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setWsdlOverride(String value);
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
-}

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/StubPropertyMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/StubPropertyMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/StubPropertyMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -31,43 +31,35 @@
 {
 
    /**
-    * Gets the value of the propName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return Returns the property name
     *     
     */
    String getPropName();
 
    /**
-    * Sets the value of the propName property.
+    * Sets the property name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * @param propName
     *     
     */
-   void setPropName(String value);
+   void setPropName(String propName);
 
    /**
-    * Gets the value of the propValue property.
+    * Returns the property value
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return propValue 
+    * 
     *     
     */
    String getPropValue();
 
    /**
-    * Sets the value of the propValue property.
+    * Sets the property value
     * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * @param propValue
     *     
     */
-   void setPropValue(String value);
+   void setPropValue(String propValue);
 
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebserviceDescriptionMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebserviceDescriptionMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebserviceDescriptionMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -7,6 +7,8 @@
 
 package org.jboss.ejb3.metadata.spi.jboss;
 
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
+
 /**
  * 
  *             
@@ -39,107 +41,61 @@
  * 
  * 
  */
-public interface WebserviceDescriptionMetaData
+public interface WebserviceDescriptionMetaData extends IdMetaData
 {
 
    /**
-    * Gets the value of the webserviceDescriptionName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return Returns the webservice description name
     *     
     */
    String getWebserviceDescriptionName();
 
    /**
-    * Sets the value of the webserviceDescriptionName property.
+    * Sets the webservice description name
     * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * @param name
     *     
     */
-   void setWebserviceDescriptionName(String value);
+   void setWebserviceDescriptionName(String name);
 
    /**
-    * Gets the value of the configName property.
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return Returns the config name
     *     
     */
    String getConfigName();
 
    /**
-    * Sets the value of the configName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * Sets the config name
+    * @param configName
     *     
     */
-   void setConfigName(String value);
+   void setConfigName(String configName);
 
    /**
-    * Gets the value of the configFile property.
     * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return Returns the config file
     *     
     */
    String getConfigFile();
 
    /**
-    * Sets the value of the configFile property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
+    * Sets the config file
     *     
     */
-   void setConfigFile(String value);
+   void setConfigFile(String configFile);
 
    /**
-    * Gets the value of the wsdlPublishLocation property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
+    * @return Returns the wsdl publication location
     *     
     */
    String getWsdlPublishLocation();
 
    /**
-    * Sets the value of the wsdlPublishLocation property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
+    * Sets the wsdl publication location
+    * @param wsdlLocation
     */
-   void setWsdlPublishLocation(String value);
+   void setWsdlPublishLocation(String wsdlLocation);
 
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   String getId();
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   void setId(String value);
-
 }

Modified: projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebservicesMetaData.java
===================================================================
--- projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebservicesMetaData.java	2009-09-21 17:35:02 UTC (rev 93814)
+++ projects/ejb3/trunk/metadata-spi/src/main/java/org/jboss/ejb3/metadata/spi/jboss/WebservicesMetaData.java	2009-09-21 17:36:34 UTC (rev 93815)
@@ -9,6 +9,8 @@
 
 import java.util.List;
 
+import org.jboss.ejb3.metadata.spi.javaee.IdMetaData;
+
 /**
  * <p>Java class for webservicesType complex type.
  * 
@@ -30,71 +32,35 @@
  * 
  * 
  */
-public interface WebservicesMetaData
+public interface WebservicesMetaData extends IdMetaData
 {
 
    /**
-    * Gets the value of the contextRoot property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @return Returns the context root of this webservice
     *     
     */
    String getContextRoot();
 
    /**
-    * Sets the value of the contextRoot property.
+    * Sets the context root of this webservice
     * 
-    * @param value
-    *     allowed object is
-    *     {@link com.sun.java.xml.ns.javaee.String }
+    * @param contextRoot Context root of the webservice
     *     
     */
-   void setContextRoot(String value);
+   void setContextRoot(String contextRoot);
 
    /**
-    * Gets the value of the webserviceDescription property.
+    * @return Returns the webservice descriptions
     * 
-    * <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 webserviceDescription property.
     * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getWebserviceDescription().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link WebserviceDescriptionMetaData }
-    * 
-    * 
     */
-   List<WebserviceDescriptionMetaData> getWebserviceDescription();
+   List<WebserviceDescriptionMetaData> getWebserviceDescriptions();
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link java.lang.String }
-    *     
+    * Sets the webservice descriptions
+    *  
+    * @param webserviceDescriptions
     */
-   java.lang.String getId();
+   void setWebServiceDescriptions(List<WebserviceDescriptionMetaData> webserviceDescriptions);
 
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link java.lang.String }
-    *     
-    */
-   void setId(java.lang.String value);
-
 }




More information about the jboss-cvs-commits mailing list