svn commit: r1136453 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/model: ResequenceDefinition.java dataformat/CustomDataFormat.java loadbalancer/CustomLoadBalancerDefinition.java loadbalancer/StickyLoadBalancerDefinition.java

[davsclaus]

Author: davsclaus
Date: Thu Jun 16 14:23:15 2011
New Revision: 1136453

URL: http://svn.apache.org/viewvc?rev=1136453&view=rev
Log:
Tidy up model with details about required attributes

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java?rev=1136453&r1=1136452&r2=1136453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
 Thu Jun 16 14:23:15 2011
@@ -35,6 +35,7 @@ import org.apache.camel.model.language.E
 import org.apache.camel.processor.Resequencer;
 import org.apache.camel.processor.StreamResequencer;
 import org.apache.camel.processor.resequencer.ExpressionResultComparator;
+import org.apache.camel.spi.Required;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.ObjectHelper;
 
@@ -56,6 +57,7 @@ public class ResequenceDefinition extend
     @XmlTransient
     private StreamResequencerConfig streamConfig;
     @XmlElementRef
+    @Required
     private ExpressionDefinition expression;
     @XmlElementRef
     private List<ProcessorDefinition> outputs = new 
ArrayList<ProcessorDefinition>();

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java?rev=1136453&r1=1136452&r2=1136453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
 Thu Jun 16 14:23:15 2011
@@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext
 @XmlRootElement(name = "customDataFormat")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CustomDataFormat extends DataFormatDefinition {
-    @XmlAttribute
+    @XmlAttribute(required = true)
     private String ref;
 
     public CustomDataFormat() {

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java?rev=1136453&r1=1136452&r2=1136453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
 Thu Jun 16 14:23:15 2011
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelpe
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CustomLoadBalancerDefinition extends LoadBalancerDefinition {
 
-    @XmlAttribute
+    @XmlAttribute(required = true)
     private String ref;
 
     public CustomLoadBalancerDefinition() {

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java?rev=1136453&r1=1136452&r2=1136453&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
 Thu Jun 16 14:23:15 2011
@@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext
 @XmlRootElement(name = "sticky")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class StickyLoadBalancerDefinition extends LoadBalancerDefinition {
-    @XmlElement(name = "correlationExpression")
+    @XmlElement(name = "correlationExpression", required = true)
     private ExpressionSubElementDefinition correlationExpression;
 
     public StickyLoadBalancerDefinition() {