[jboss-svn-commits] JBoss Common SVN: r2636 - in jbossxb/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-10-11 17:22:51 -0400 (Thu, 11 Oct 2007)
New Revision: 2636

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
   jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java
Log:
use 'all' group for description metadata to re-use the same class for new schemas and web-app_2_3.dtd

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-10-11 18:27:37 UTC (rev 2635)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-10-11 21:22:51 UTC (rev 2636)
@@ -1081,17 +1081,31 @@
             {
                if (trace)
                   log.trace("Property " + property.getName() + " is bound to " + xmlModelGroup.kind());
-
-               ModelGroupBinding propertyGroup = new SequenceBinding(schemaBinding);
+               
+               ModelGroupBinding propertyGroup;
+               if(xmlModelGroup.kind().equals(JBossXmlConstants.MODEL_GROUP_SEQUENCE))
+               {
+                  propertyGroup = new SequenceBinding(schemaBinding);
+               }
+               else if(xmlModelGroup.kind().equals(JBossXmlConstants.MODEL_GROUP_CHOICE))
+               {
+                  propertyGroup = new ChoiceBinding(schemaBinding);
+               }
+               else if(xmlModelGroup.kind().equals(JBossXmlConstants.MODEL_GROUP_ALL))
+               {
+                  propertyGroup = new AllBinding(schemaBinding);
+               }
+               else
+               {
+                  throw new IllegalStateException("Unexpected JBossXmlModelGroup.kind=" + xmlModelGroup.kind());
+               }
+               
                if (!JBossXmlConstants.DEFAULT.equals(xmlModelGroup.name()))
                {
                   // TODO what if it doesn't have a name? should an artificial one be created?
                   propertyGroup.setQName(new QName(name));
                }
 
-               //ClassMetaData classMd = new ClassMetaData();
-               //classMd.setImpl(propClassInfo.getName());
-               //localModel.setClassMetaData(classMd);
                propertyGroup.setSkip(Boolean.FALSE);
                model.addParticle(new ParticleBinding(propertyGroup));
 

Modified: jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java	2007-10-11 18:27:37 UTC (rev 2635)
+++ jbossxb/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java	2007-10-11 21:22:51 UTC (rev 2636)
@@ -28,6 +28,7 @@
 import org.jboss.javaee.annotation.Descriptions;
 import org.jboss.javaee.annotation.DisplayNames;
 import org.jboss.javaee.annotation.Icons;
+import org.jboss.xb.annotations.JBossXmlConstants;
 import org.jboss.xb.annotations.JBossXmlModelGroup;
 import org.jboss.xb.annotations.JBossXmlNsPrefix;
 
@@ -38,7 +39,7 @@
  * @version $Revision: 1.1 $
  */
 //@JBossXmlGroup(name="descriptionGroup")
- at JBossXmlModelGroup(name="descriptionGroup", propOrder={"descriptions", "displayNames", "icons"})
+ at JBossXmlModelGroup(name="descriptionGroup", propOrder={"descriptions", "displayNames", "icons"}, kind=JBossXmlConstants.MODEL_GROUP_ALL)
 public class DescriptionGroupMetaData implements Serializable
 {
    /** The serialVersionUID */