[jboss-svn-commits] JBoss Common SVN: r2471 - in jbossxb-builder/trunk/src: test/java/org/jboss/ejb/metadata/jboss and 1 other directories.

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

Author: alex.loubyansky at jboss.com
Date: 2007-07-26 09:00:47 -0400 (Thu, 26 Jul 2007)
New Revision: 2471

Modified:
   jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnterpriseBeanMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
Log:
getting jboss-specific metadata tests to pass

Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-07-26 12:59:45 UTC (rev 2470)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-07-26 13:00:47 UTC (rev 2471)
@@ -37,7 +37,6 @@
 import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlNsForm;

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java	2007-07-26 12:59:45 UTC (rev 2470)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java	2007-07-26 13:00:47 UTC (rev 2471)
@@ -22,6 +22,9 @@
 package org.jboss.ejb.metadata.jboss;
 
 import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.xb.annotations.JBossXmlSchema;
@@ -34,7 +37,10 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false)
+ at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED)
 @XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
 /*@XmlTypeImpls
 ({

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnterpriseBeanMetaData.java	2007-07-26 12:59:45 UTC (rev 2470)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossEnterpriseBeanMetaData.java	2007-07-26 13:00:47 UTC (rev 2471)
@@ -27,11 +27,14 @@
 import java.util.Set;
 
 import org.jboss.ejb.metadata.spec.EnterpriseBeanMetaData;
+import org.jboss.ejb.metadata.spec.EntityBeanMetaData;
 import org.jboss.ejb.metadata.spec.ExcludeListMetaData;
+import org.jboss.ejb.metadata.spec.MessageDrivenBeanMetaData;
 import org.jboss.ejb.metadata.spec.MethodInterfaceType;
 import org.jboss.ejb.metadata.spec.MethodPermissionMetaData;
 import org.jboss.ejb.metadata.spec.MethodPermissionsMetaData;
 import org.jboss.ejb.metadata.spec.SecurityIdentityMetaData;
+import org.jboss.ejb.metadata.spec.SessionBeanMetaData;
 import org.jboss.javaee.metadata.jboss.AnnotationsMetaData;
 import org.jboss.javaee.metadata.jboss.IgnoreDependencyMetaData;
 import org.jboss.javaee.metadata.jboss.JndiRefsMetaData;
@@ -59,6 +62,9 @@
 import org.jboss.javaee.metadata.support.AbstractMappedMetaData;
 import org.jboss.javaee.metadata.support.NamedMetaDataWithDescriptionGroupWithOverride;
 import org.jboss.javaee.metadata.support.NonNullLinkedHashSet;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
+
 import javax.xml.bind.annotation.XmlElement;
 
 /**
@@ -67,6 +73,12 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
+ at JBossXmlModelGroup(
+      kind=JBossXmlConstants.MODEL_GROUP_CHOICE,
+      particles={
+            @JBossXmlModelGroup.Particle(element=@XmlElement(name="session"), type=SessionBeanMetaData.class),
+            @JBossXmlModelGroup.Particle(element=@XmlElement(name="entity"), type=EntityBeanMetaData.class),
+            @JBossXmlModelGroup.Particle(element=@XmlElement(name="message-driven"), type=MessageDrivenBeanMetaData.class)})
 //@SchemaImpl({JBossSessionBeanMetaData.class, JBossEntityBeanMetaData.class, JBossMessageDrivenBeanMetaData.class})
 public abstract class JBossEnterpriseBeanMetaData extends NamedMetaDataWithDescriptionGroupWithOverride<EnterpriseBeanMetaData> implements Environment
 {

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossMetaData.java	2007-07-26 12:59:45 UTC (rev 2470)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBossMetaData.java	2007-07-26 13:00:47 UTC (rev 2471)
@@ -25,6 +25,7 @@
 import org.jboss.javaee.metadata.support.IdMetaDataImplWithDescriptionGroupWithOverride;
 import org.jboss.logging.Logger;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 /**
  * JBossMetaData.
@@ -255,6 +256,7 @@
     * 
     * @return the merged enterpriseBeans.
     */
+   @XmlTransient
    public JBossEnterpriseBeansMetaData getMergedEnterpriseBeans()
    {
       if (mergedEnterpriseBeans != null)
@@ -270,6 +272,7 @@
     * @param name the name
     * @return the container configuration
     */
+   @XmlTransient
    public JBossEnterpriseBeanMetaData getMergedEnterpriseBean(String name)
    {
       return getMergedEnterpriseBeans().get(name);
@@ -459,6 +462,7 @@
     * 
     * @return the merged assembly descriptor.
     */
+   @XmlTransient
    public JBossAssemblyDescriptorMetaData getMergedAssemblyDescriptor()
    {
       if (mergedAssemblyDescriptor != null)

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java	2007-07-26 12:59:45 UTC (rev 2470)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java	2007-07-26 13:00:47 UTC (rev 2471)
@@ -95,7 +95,8 @@
    
    public static SchemaBindingResolver initResolver()
    {
-      return AbstractJavaEEMetaDataTest.initResolverJavaEE(JBoss50MetaData.class);
+      return schemaResolverForClass(JBoss50MetaData.class);
+      //return AbstractJavaEEMetaDataTest.initResolverJavaEE(JBoss50MetaData.class);
    }
    
    public JBoss5xEverythingUnitTestCase(String name)
@@ -111,7 +112,7 @@
    public void testEverything() throws Exception
    {
       //enableTrace("org.jboss.xb");
-      //enableTrace("org.jboss.xb.binding.builder");
+      enableTrace("org.jboss.xb.builder");
       JBoss50MetaData jbossMetaData = unmarshal();
       assertVersion(jbossMetaData);
       assertId("jboss", jbossMetaData);