committing choice based

git-svn-id: https://mobicents.googlecode.com/svn/trunk/servers/sip-servlets@5786 bf0df8d0-2c1f-0410-b170-bd30377b63dc

Author: jean.deruelle

sip-servlets-jboss5-metadata/src/main/java/org/jboss/metadata/sip/spec/AndMetaData.java

@@ -24,6 +24,11 @@
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 /**
  * @author [email protected]
@@ -35,7 +40,15 @@ public class AndMetaData extends ConditionMetaData {
 	/**
 	 * @param condition the condition to set
 	 */
-	@XmlElement(name="condition")
+	@XmlElementWrapper(name = "condition")
+	@XmlElements( {
+			@XmlElement(name = "and", type = AndMetaData.class),
+			@XmlElement(name = "contains", type = ContainsMetaData.class),
+			@XmlElement(name = "equal", type = EqualMetaData.class),
+			@XmlElement(name = "exists", type = ExistsMetaData.class),
+			@XmlElement(name = "not", type = NotMetaData.class),
+			@XmlElement(name = "or", type = OrMetaData.class),
+			@XmlElement(name = "subdomain-of", type = SubdomainOfMetaData.class)})
 	public void setConditions(List<ConditionMetaData> conditions) {
 		this.conditions = conditions;
 	}

sip-servlets-jboss5-metadata/src/main/java/org/jboss/metadata/sip/spec/ConditionMetaData.java

@@ -21,12 +21,15 @@
  */
 package org.jboss.metadata.sip.spec;
 
+import javax.xml.bind.annotation.XmlType;
+
 import org.jboss.metadata.javaee.support.IdMetaDataImplWithOverride;
 
 /**
  * @author deruelle
  *
  */
+@XmlType(name="condition")
 public abstract class ConditionMetaData extends IdMetaDataImplWithOverride<ConditionMetaData>{
 
 

sip-servlets-jboss5-metadata/src/main/java/org/jboss/metadata/sip/spec/NotMetaData.java

@@ -22,6 +22,8 @@
 package org.jboss.metadata.sip.spec;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
 
 /**
  * @author [email protected]
@@ -33,7 +35,15 @@ public class NotMetaData extends ConditionMetaData {
 	/**
 	 * @param condition the condition to set
 	 */
-	@XmlElement(name="condition")
+	@XmlElementWrapper(name = "condition")
+	@XmlElements( {
+			@XmlElement(name = "and", type = AndMetaData.class),
+			@XmlElement(name = "contains", type = ContainsMetaData.class),
+			@XmlElement(name = "equal", type = EqualMetaData.class),
+			@XmlElement(name = "exists", type = ExistsMetaData.class),
+			@XmlElement(name = "not", type = NotMetaData.class),
+			@XmlElement(name = "or", type = OrMetaData.class),
+			@XmlElement(name = "subdomain-of", type = SubdomainOfMetaData.class)})
 	public void setCondition(ConditionMetaData condition) {
 		this.condition = condition;
 	}

sip-servlets-jboss5-metadata/src/main/java/org/jboss/metadata/sip/spec/ObjectFactory.java

@@ -0,0 +1,14 @@
+package org.jboss.metadata.sip.spec;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+
+@XmlRegistry
+class ObjectFactory {
+//    @XmlElementDecl(name="and",substitutionHeadName="condition")
+//    JAXBElement<AndMetaData> createAnd(AndMetaData o) {...}
+//    @XmlElementDecl(name="sub",substitutionHeadName="operator")
+//    JAXBElement<Operator> createSub(Operator o) {...}
+}
+

sip-servlets-jboss5-metadata/src/main/java/org/jboss/metadata/sip/spec/OrMetaData.java

@@ -24,6 +24,9 @@
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
 
 /**
  * @author [email protected]
@@ -35,7 +38,15 @@ public class OrMetaData extends ConditionMetaData {
 	/**
 	 * @param condition the condition to set
 	 */
-	@XmlElement(name="condition")
+	@XmlElementWrapper(name = "condition")
+	@XmlElements( {
+			@XmlElement(name = "and", type = AndMetaData.class),
+			@XmlElement(name = "contains", type = ContainsMetaData.class),
+			@XmlElement(name = "equal", type = EqualMetaData.class),
+			@XmlElement(name = "exists", type = ExistsMetaData.class),
+			@XmlElement(name = "not", type = NotMetaData.class),
+			@XmlElement(name = "or", type = OrMetaData.class),
+			@XmlElement(name = "subdomain-of", type = SubdomainOfMetaData.class)})
 	public void setConditions(List<ConditionMetaData> conditions) {
 		this.conditions = conditions;
 	}

sip-servlets-jboss5-metadata/src/main/java/org/jboss/metadata/sip/spec/PatternMetaData.java

@@ -22,6 +22,9 @@
 package org.jboss.metadata.sip.spec;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
 
 import org.jboss.metadata.javaee.support.IdMetaDataImpl;
 
@@ -31,23 +34,34 @@
  * @author [email protected]
  * @version $Revision$
  */
+@XmlType(name = "patternType")
 public class PatternMetaData extends IdMetaDataImpl {
-	
+
 	private static final long serialVersionUID = 1;
 	private ConditionMetaData condition;
-	
+
 	/**
-	 * @param condition the condition to set
+	 * @param condition
+	 *            the condition to set
 	 */
+	@XmlElementWrapper(name = "condition")
+	@XmlElements( {
+			@XmlElement(name = "and", type = AndMetaData.class),
+			@XmlElement(name = "contains", type = ContainsMetaData.class),
+			@XmlElement(name = "equal", type = EqualMetaData.class),
+			@XmlElement(name = "exists", type = ExistsMetaData.class),
+			@XmlElement(name = "not", type = NotMetaData.class),
+			@XmlElement(name = "or", type = OrMetaData.class),
+			@XmlElement(name = "subdomain-of", type = SubdomainOfMetaData.class)})
 	public void setCondition(ConditionMetaData condition) {
 		this.condition = condition;
 	}
+
 	/**
 	 * @return the condition
 	 */
-	@XmlElement(name="condition")
 	public ConditionMetaData getCondition() {
 		return condition;
 	}
-	
+
 }