You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/02/24 16:16:04 UTC
svn commit: r1074186 [2/2] - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model: ./ config/
dataformat/ language/ loadbalancer/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java Thu Feb 24 15:15:53 2011
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement(name = "language")
@XmlAccessorType(XmlAccessType.FIELD)
public class LanguageExpression extends ExpressionDefinition {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String language;
public LanguageExpression() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Thu Feb 24 15:15:53 2011
@@ -43,14 +43,14 @@ import org.apache.camel.util.OgnlHelper;
@XmlRootElement(name = "method")
@XmlAccessorType(XmlAccessType.FIELD)
public class MethodCallExpression extends ExpressionDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute
@Deprecated
private String bean;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String ref;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String method;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Class<?> beanType;
@XmlTransient
private Object instance;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "mvel")
+@XmlAccessorType(XmlAccessType.FIELD)
public class MvelExpression extends ExpressionDefinition {
+
public MvelExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "ognl")
+@XmlAccessorType(XmlAccessType.FIELD)
public class OgnlExpression extends ExpressionDefinition {
+
public OgnlExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "php")
+@XmlAccessorType(XmlAccessType.FIELD)
public class PhpExpression extends ExpressionDefinition {
+
public PhpExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "property")
+@XmlAccessorType(XmlAccessType.FIELD)
public class PropertyExpression extends ExpressionDefinition {
+
public PropertyExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "python")
+@XmlAccessorType(XmlAccessType.FIELD)
public class PythonExpression extends ExpressionDefinition {
+
public PythonExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "ruby")
+@XmlAccessorType(XmlAccessType.FIELD)
public class RubyExpression extends ExpressionDefinition {
+
public RubyExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -25,7 +27,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "simple")
+@XmlAccessorType(XmlAccessType.FIELD)
public class SimpleExpression extends ExpressionDefinition {
+
public SimpleExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,6 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "spel")
+@XmlAccessorType(XmlAccessType.FIELD)
public class SpELExpression extends ExpressionDefinition {
public SpELExpression() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -24,7 +26,9 @@ import javax.xml.bind.annotation.XmlRoot
* @version
*/
@XmlRootElement(name = "sql")
+@XmlAccessorType(XmlAccessType.FIELD)
public class SqlExpression extends ExpressionDefinition {
+
public SqlExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java Thu Feb 24 15:15:53 2011
@@ -35,9 +35,9 @@ import org.apache.camel.language.tokeniz
public class TokenizerExpression extends ExpressionDefinition {
@XmlAttribute(required = true)
private String token;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String headerName;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean regex;
public TokenizerExpression() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java Thu Feb 24 15:15:53 2011
@@ -36,7 +36,6 @@ import org.apache.camel.spi.ClassResolve
@XmlRootElement(name = "xquery")
@XmlAccessorType(XmlAccessType.FIELD)
public class XQueryExpression extends NamespaceAwareExpression {
-
@XmlAttribute(required = false)
private String type;
@XmlTransient
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java Thu Feb 24 15:15:53 2011
@@ -35,7 +35,6 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "failover")
@XmlAccessorType(XmlAccessType.FIELD)
public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition {
-
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlAttribute
@@ -43,6 +42,9 @@ public class FailoverLoadBalancerDefinit
@XmlAttribute
private Integer maximumFailoverAttempts;
+ public FailoverLoadBalancerDefinition() {
+ }
+
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
FailOverLoadBalancer answer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.loadbalancer;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
@@ -26,8 +28,12 @@ import org.apache.camel.spi.RouteContext
* Represents an XML <random/> element
*/
@XmlRootElement(name = "random")
+@XmlAccessorType(XmlAccessType.FIELD)
public class RandomLoadBalancerDefinition extends LoadBalancerDefinition {
+ public RandomLoadBalancerDefinition() {
+ }
+
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
return new org.apache.camel.processor.loadbalancer.RandomLoadBalancer();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.loadbalancer;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
@@ -26,8 +28,12 @@ import org.apache.camel.spi.RouteContext
* Represents an XML <roundRobin/> element
*/
@XmlRootElement(name = "roundRobin")
+@XmlAccessorType(XmlAccessType.FIELD)
public class RoundRobinLoadBalancerDefinition extends LoadBalancerDefinition {
+ public RoundRobinLoadBalancerDefinition() {
+ }
+
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
return new org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer();
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=1074186&r1=1074185&r2=1074186&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 Feb 24 15:15:53 2011
@@ -33,10 +33,12 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "sticky")
@XmlAccessorType(XmlAccessType.FIELD)
public class StickyLoadBalancerDefinition extends LoadBalancerDefinition {
-
- @XmlElement(name = "correlationExpression", required = false)
+ @XmlElement(name = "correlationExpression")
private ExpressionSubElementDefinition correlationExpression;
+ public StickyLoadBalancerDefinition() {
+ }
+
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
return new StickyLoadBalancer(correlationExpression.createExpression(routeContext));
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java Thu Feb 24 15:15:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model.loadbalancer;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.model.LoadBalancerDefinition;
@@ -27,8 +29,12 @@ import org.apache.camel.spi.RouteContext
*
*/
@XmlRootElement(name = "topic")
+@XmlAccessorType(XmlAccessType.FIELD)
public class TopicLoadBalancerDefinition extends LoadBalancerDefinition {
+ public TopicLoadBalancerDefinition() {
+ }
+
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
return new org.apache.camel.processor.loadbalancer.TopicLoadBalancer();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java Thu Feb 24 15:15:53 2011
@@ -38,14 +38,16 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "weighted")
@XmlAccessorType(XmlAccessType.FIELD)
public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {
-
@XmlAttribute
private Boolean roundRobin;
@XmlAttribute(required = true)
private String distributionRatio;
@XmlAttribute
private String distributionRatioDelimiter;
-
+
+ public WeightedLoadBalancerDefinition() {
+ }
+
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
WeightedLoadBalancer loadBalancer;