[jboss-svn-commits] JBoss Common SVN: r2460 - in jbossxb-builder/trunk/src/test/java/org/jboss: javaee/metadata/spec and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2007-07-25 10:04:17 -0400 (Wed, 25 Jul 2007)
New Revision: 2460

Modified:
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeanMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeansMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java
Log:
fix annotations

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java	2007-07-25 14:03:01 UTC (rev 2459)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java	2007-07-25 14:04:17 UTC (rev 2460)
@@ -40,7 +40,7 @@
       elementFormDefault=XmlNsForm.QUALIFIED)
 @XmlType(name="ejb-jarType",
       namespace=JavaEEMetaDataConstants.J2EE_NS,
-      propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar", "version", "id"})
+      propOrder={"descriptionGroup", "enterpriseBeans", "relationships", "assemblyDescriptor", "ejbClientJar"})
 /*@XmlTypeImpls
 ({
    @XmlTypeImpl(name="fully-qualified-classType", startElementCreatesObject=false),

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeanMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeanMetaData.java	2007-07-25 14:03:01 UTC (rev 2459)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeanMetaData.java	2007-07-25 14:04:17 UTC (rev 2460)
@@ -51,6 +51,7 @@
 import org.jboss.xb.annotations.JBossXmlModelGroup;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 /**
  * EnterpriseBean.
@@ -103,6 +104,7 @@
     * 
     * @param enterpriseBeansMetaData the enterpriseBeansMetaData.
     */
+   @XmlTransient
    void setEnterpriseBeansMetaData(EnterpriseBeansMetaData enterpriseBeansMetaData)
    {
       this.enterpriseBeansMetaData = enterpriseBeansMetaData;
@@ -113,6 +115,7 @@
     * 
     * @return the ejbJarMetaData.
     */
+   @XmlTransient
    public EjbJarMetaData getEjbJarMetaData()
    {
       if (enterpriseBeansMetaData == null)

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeansMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeansMetaData.java	2007-07-25 14:03:01 UTC (rev 2459)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EnterpriseBeansMetaData.java	2007-07-25 14:04:17 UTC (rev 2460)
@@ -22,6 +22,8 @@
 package org.jboss.ejb.metadata.spec;
 
 import org.jboss.javaee.metadata.support.AbstractMappedMetaData;
+
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -63,6 +65,7 @@
     * @param ejbJarMetaData the ejbJarMetaData.
     * @throws IllegalArgumentException for a null ejbJarMetaData
     */
+   @XmlTransient
    void setEjbJarMetaData(EjbJarMetaData ejbJarMetaData)
    {
       if (ejbJarMetaData == null)

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java	2007-07-25 14:03:01 UTC (rev 2459)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java	2007-07-25 14:04:17 UTC (rev 2460)
@@ -37,7 +37,7 @@
  * @version $Revision: 1.1 $
  */
 //@JBossXmlGroup(name="descriptionGroup")
- at JBossXmlModelGroup(name="descriptionGroup")
+ at JBossXmlModelGroup(name="descriptionGroup", propOrder={"descriptions", "displayNames", "icons"})
 public class DescriptionGroupMetaData implements Serializable
 {
    /** The serialVersionUID */