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

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

Author: alex.loubyansky at jboss.com
Date: 2007-07-26 04:55:07 -0400 (Thu, 26 Jul 2007)
New Revision: 2466

Modified:
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorOrderMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorsMetaData.java
   jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java
Log:
making ejb3 tests run w/o errors

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java	2007-07-26 08:54:15 UTC (rev 2465)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java	2007-07-26 08:55:07 UTC (rev 2466)
@@ -23,6 +23,9 @@
 
 import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
 import org.jboss.xb.annotations.JBossXmlSchema;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -31,8 +34,13 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false)
- at XmlType(name="ejb-jarType", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlType(name="ejb-jarType",
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+      propOrder={"descriptionGroup", "enterpriseBeans", "interceptors", "relationships", "assemblyDescriptor", "ejbClientJar"})
 /*@XmlTypeImpls
 ({
    @XmlTypeImpl(name="fully-qualified-classType", startElementCreatesObject=false),

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorMetaData.java	2007-07-26 08:54:15 UTC (rev 2465)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorMetaData.java	2007-07-26 08:55:07 UTC (rev 2466)
@@ -95,7 +95,6 @@
     * @param environment the environment.
     * @throws IllegalArgumentException for a null environment
     */
-   @XmlElement(/*noInterceptor=true*/)
    public void setJndiEnvironmentRefsGroup(EnvironmentRefsGroupMetaData environment)
    {
       if (environment == null)

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorOrderMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorOrderMetaData.java	2007-07-26 08:54:15 UTC (rev 2465)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorOrderMetaData.java	2007-07-26 08:55:07 UTC (rev 2466)
@@ -23,6 +23,8 @@
 
 import javax.xml.bind.annotation.XmlType;
 
+import org.jboss.xb.annotations.JBossXmlChild;
+
 /**
  * InterceptorClassesMetaData.
  * 
@@ -30,6 +32,7 @@
  * @version $Revision: 1.1 $
  */
 @XmlType(name="interceptor-orderType")
+ at JBossXmlChild(name="interceptor-class", type=String.class, unbounded=true)
 public class InterceptorOrderMetaData extends InterceptorClassesMetaData
 {
    /** The serialVersionUID */

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorsMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorsMetaData.java	2007-07-26 08:54:15 UTC (rev 2465)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/InterceptorsMetaData.java	2007-07-26 08:55:07 UTC (rev 2466)
@@ -22,6 +22,8 @@
 package org.jboss.ejb.metadata.spec;
 
 import org.jboss.javaee.metadata.support.MappedMetaDataWithDescriptions;
+import org.jboss.xb.annotations.JBossXmlChild;
+
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -31,6 +33,7 @@
  * @version $Revision: 1.1 $
  */
 @XmlType(name="interceptorsType")
+ at JBossXmlChild(name="interceptor", type=InterceptorMetaData.class, unbounded=true)
 public class InterceptorsMetaData extends MappedMetaDataWithDescriptions<InterceptorMetaData>
 {
    /** The serialVersionUID */

Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java	2007-07-26 08:54:15 UTC (rev 2465)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java	2007-07-26 08:55:07 UTC (rev 2466)
@@ -77,7 +77,8 @@
    
    public static SchemaBindingResolver initResolver()
    {
-      return initResolverJavaEE(EjbJar30MetaData.class);
+      return schemaResolverForClass(EjbJar30MetaData.class);
+      //return initResolverJavaEE(EjbJar30MetaData.class);
    }
    
    public EjbJar3xEverythingUnitTestCase(String name)
@@ -93,7 +94,7 @@
    public void testEverything() throws Exception
    {
       //enableTrace("org.jboss.xb");
-      //enableTrace("org.jboss.xb.binding.builder");
+      enableTrace("org.jboss.xb.builder");
       EjbJar3xMetaData ejbJarMetaData = unmarshal();
       //ApplicationMetaData applicationMetaData = new ApplicationMetaData(ejbJarMetaData); 
       assertVersion(ejbJarMetaData);