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 [1/2] - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model: ./ config/
dataformat/ language/ loadbalancer/
Author: davsclaus
Date: Thu Feb 24 15:15:53 2011
New Revision: 1074186
URL: http://svn.apache.org/viewvc?rev=1074186&view=rev
Log:
Polished and aligned model classes to be consistent. Added missing data formats to marhsal/unmarshal.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java Thu Feb 24 15:15:53 2011
@@ -38,11 +38,11 @@ import org.apache.camel.spi.RouteContext
@Deprecated
public class AOPDefinition extends OutputDefinition<AOPDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String beforeUri;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String afterUri;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String afterFinallyUri;
public AOPDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java Thu Feb 24 15:15:53 2011
@@ -40,11 +40,11 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "bean")
@XmlAccessorType(XmlAccessType.FIELD)
public class BeanDefinition extends OutputDefinition<BeanDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String ref;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String method;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Class<?> beanType;
@XmlTransient
private Object bean;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java Thu Feb 24 15:15:53 2011
@@ -47,9 +47,9 @@ import static org.apache.camel.builder.P
public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
- @XmlElement(name = "onWhen", required = false)
+ @XmlElement(name = "onWhen")
private WhenDefinition onWhen;
- @XmlElement(name = "handled", required = false)
+ @XmlElement(name = "handled")
private ExpressionSubElementDefinition handled;
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java Thu Feb 24 15:15:53 2011
@@ -42,12 +42,14 @@ import org.apache.camel.util.CollectionS
@XmlRootElement(name = "choice")
@XmlAccessorType(XmlAccessType.FIELD)
public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
-
@XmlElementRef
private List<WhenDefinition> whenClauses = new ArrayList<WhenDefinition>();
- @XmlElement(required = false)
+ @XmlElement
private OtherwiseDefinition otherwise;
+ public ChoiceDefinition() {
+ }
+
@Override
public String toString() {
if (getOtherwise() != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java Thu Feb 24 15:15:53 2011
@@ -29,13 +29,14 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement(name = "contextScan")
@XmlAccessorType(XmlAccessType.FIELD)
public class ContextScanDefinition {
-
- @XmlElement(name = "excludes", required = false)
+ @XmlElement(name = "excludes")
private List<String> excludes = new ArrayList<String>();
-
- @XmlElement(name = "includes", required = false)
+ @XmlElement(name = "includes")
private List<String> includes = new ArrayList<String>();
+ public ContextScanDefinition() {
+ }
+
public List<String> getExcludes() {
return excludes;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java Thu Feb 24 15:15:53 2011
@@ -35,9 +35,9 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "convertBodyTo")
@XmlAccessorType(XmlAccessType.FIELD)
public class ConvertBodyDefinition extends NoOutputDefinition<ConvertBodyDefinition> {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String type;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String charset;
@XmlTransient
private Class<?> typeClass;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java Thu Feb 24 15:15:53 2011
@@ -46,7 +46,7 @@ public class DelayDefinition extends Exp
@XmlTransient
private ExecutorService executorService;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String executorServiceRef;
@XmlAttribute
private Boolean asyncDelayed;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java Thu Feb 24 15:15:53 2011
@@ -30,17 +30,16 @@ import javax.xml.bind.annotation.XmlValu
@XmlRootElement(name = "description")
@XmlAccessorType(XmlAccessType.FIELD)
public class DescriptionDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String lang;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Double layoutX;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Double layoutY;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Double layoutWidth;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Double layoutHeight;
-
@XmlValue
private String text;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java Thu Feb 24 15:15:53 2011
@@ -37,12 +37,11 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "enrich")
@XmlAccessorType(XmlAccessType.FIELD)
public class EnrichDefinition extends NoOutputDefinition<EnrichDefinition> {
-
@XmlAttribute(name = "uri")
private String resourceUri;
@XmlAttribute(name = "ref")
private String resourceRef;
- @XmlAttribute(name = "strategyRef", required = false)
+ @XmlAttribute(name = "strategyRef")
private String aggregationStrategyRef;
@XmlTransient
private AggregationStrategy aggregationStrategy;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java Thu Feb 24 15:15:53 2011
@@ -38,10 +38,8 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "intercept")
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptDefinition extends OutputDefinition<InterceptDefinition> {
-
@XmlTransient
protected Processor output;
-
@XmlTransient
protected final List<Processor> intercepted = new ArrayList<Processor>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java Thu Feb 24 15:15:53 2011
@@ -34,8 +34,7 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "interceptFrom")
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptFromDefinition extends InterceptDefinition {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
protected String uri;
public InterceptFromDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java Thu Feb 24 15:15:53 2011
@@ -49,7 +49,7 @@ public class InterceptSendToEndpointDefi
@XmlAttribute(required = true)
private String uri;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean skipSendToOriginalEndpoint;
public InterceptSendToEndpointDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java Thu Feb 24 15:15:53 2011
@@ -46,7 +46,6 @@ import org.apache.camel.processor.loadba
import org.apache.camel.processor.loadbalancer.WeightedLoadBalancer;
import org.apache.camel.processor.loadbalancer.WeightedRandomLoadBalancer;
import org.apache.camel.processor.loadbalancer.WeightedRoundRobinLoadBalancer;
-import org.apache.camel.spi.Required;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CollectionStringBuffer;
@@ -56,9 +55,8 @@ import org.apache.camel.util.CollectionS
@XmlRootElement(name = "loadBalance")
@XmlAccessorType(XmlAccessType.FIELD)
public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String ref;
-
@XmlElements({
@XmlElement(required = false, name = "failover", type = FailoverLoadBalancerDefinition.class),
@XmlElement(required = false, name = "random", type = RandomLoadBalancerDefinition.class),
@@ -68,7 +66,6 @@ public class LoadBalanceDefinition exten
@XmlElement(required = false, name = "weighted", type = WeightedLoadBalancerDefinition.class)}
)
private LoadBalancerDefinition loadBalancerType;
-
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@@ -101,7 +98,6 @@ public class LoadBalanceDefinition exten
return ref;
}
- @Required
public void setRef(String ref) {
this.ref = ref;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java Thu Feb 24 15:15:53 2011
@@ -37,7 +37,6 @@ import org.apache.camel.util.ObjectHelpe
@XmlType(name = "loadBalancer")
@XmlAccessorType(XmlAccessType.FIELD)
public class LoadBalancerDefinition extends IdentifiedType implements LoadBalancer {
-
@XmlTransient
private LoadBalancer loadBalancer;
@XmlTransient
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java Thu Feb 24 15:15:53 2011
@@ -37,8 +37,7 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "log")
@XmlAccessorType(XmlAccessType.FIELD)
public class LogDefinition extends NoOutputDefinition {
-
- @XmlAttribute
+ @XmlAttribute(required = true)
private String message;
@XmlAttribute
private LoggingLevel loggingLevel;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java Thu Feb 24 15:15:53 2011
@@ -34,10 +34,13 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
+import org.apache.camel.model.dataformat.ProtobufDataFormat;
import org.apache.camel.model.dataformat.RssDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
+import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.SyslogDataFormat;
+import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
@@ -55,25 +58,28 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "marshal")
@XmlAccessorType(XmlAccessType.FIELD)
public class MarshalDefinition extends OutputDefinition<MarshalDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String ref;
// cannot use @XmlElementRef as it doesn't allow optional properties
@XmlElements({
@XmlElement(required = false, name = "bindy", type = BindyDataFormat.class),
@XmlElement(required = false, name = "castor", type = CastorDataFormat.class),
- @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
@XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
+ @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
+ @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
@XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
+ @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java Thu Feb 24 15:15:53 2011
@@ -39,23 +39,25 @@ import org.apache.camel.util.concurrent.
@XmlRootElement(name = "multicast")
@XmlAccessorType(XmlAccessType.FIELD)
public class MulticastDefinition extends OutputDefinition<MulticastDefinition> implements ExecutorServiceAwareDefinition<MulticastDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean parallelProcessing;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String strategyRef;
@XmlTransient
private ExecutorService executorService;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String executorServiceRef;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean streaming;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean stopOnException;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Long timeout;
@XmlTransient
private AggregationStrategy aggregationStrategy;
+ public MulticastDefinition() {
+ }
@Override
public String toString() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java Thu Feb 24 15:15:53 2011
@@ -44,21 +44,20 @@ import org.apache.camel.util.concurrent.
@XmlRootElement(name = "onCompletion")
@XmlAccessorType(XmlAccessType.FIELD)
public class OnCompletionDefinition extends ProcessorDefinition<OnCompletionDefinition> implements ExecutorServiceAwareDefinition<OnCompletionDefinition> {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean onCompleteOnly;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean onFailureOnly;
- @XmlElement(name = "onWhen", required = false)
+ @XmlElement(name = "onWhen")
private WhenDefinition onWhen;
+ @XmlAttribute
+ private String executorServiceRef;
+ @XmlAttribute(name = "useOriginalMessage")
+ private Boolean useOriginalMessagePolicy;
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
private ExecutorService executorService;
- @XmlAttribute(required = false)
- private String executorServiceRef;
- @XmlAttribute(name = "useOriginalMessage", required = false)
- private Boolean useOriginalMessagePolicy;
public OnCompletionDefinition() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Thu Feb 24 15:15:53 2011
@@ -53,7 +53,6 @@ import static org.apache.camel.builder.P
@XmlRootElement(name = "onException")
@XmlAccessorType(XmlAccessType.FIELD)
public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefinition> {
-
@XmlElement(name = "exception", required = true)
private List<String> exceptions = new ArrayList<String>();
@XmlElement(name = "onWhen")
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java Thu Feb 24 15:15:53 2011
@@ -36,13 +36,13 @@ import org.apache.camel.spi.NodeIdFactor
@XmlType(name = "optionalIdentifiedDefinition")
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedDefinition<T>> {
- @XmlAttribute(required = false)
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
private String id;
@XmlTransient
private boolean customId;
- @XmlElement(required = false)
+ @XmlElement
private DescriptionDefinition description;
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java Thu Feb 24 15:15:53 2011
@@ -34,6 +34,9 @@ import org.apache.camel.util.CollectionS
@XmlAccessorType(XmlAccessType.FIELD)
public class OtherwiseDefinition extends OutputDefinition<OtherwiseDefinition> implements Block {
+ public OtherwiseDefinition() {
+ }
+
@Override
public String toString() {
return "Otherwise[" + getOutputs() + "]";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java Thu Feb 24 15:15:53 2011
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType
*/
@XmlType(name = "output")
@XmlAccessorType(XmlAccessType.FIELD)
-public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
+public abstract class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
@XmlElementRef
protected List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java Thu Feb 24 15:15:53 2011
@@ -30,16 +30,16 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement(name = "packageScan")
@XmlAccessorType(XmlAccessType.FIELD)
public class PackageScanDefinition {
-
@XmlElement(name = "package", required = true)
private List<String> packages = new ArrayList<String>();
-
- @XmlElement(name = "excludes", required = false)
+ @XmlElement
private List<String> excludes = new ArrayList<String>();
-
- @XmlElement(name = "includes", required = false)
+ @XmlElement
private List<String> includes = new ArrayList<String>();
+ public PackageScanDefinition() {
+ }
+
public List<String> getExcludes() {
return excludes;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java Thu Feb 24 15:15:53 2011
@@ -33,6 +33,9 @@ import org.apache.camel.spi.RouteContext
@XmlAccessorType(XmlAccessType.FIELD)
public class PipelineDefinition extends OutputDefinition<PipelineDefinition> {
+ public PipelineDefinition() {
+ }
+
@Override
public String getShortName() {
return "pipeline";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java Thu Feb 24 15:15:53 2011
@@ -37,12 +37,11 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "pollEnrich")
@XmlAccessorType(XmlAccessType.FIELD)
public class PollEnrichDefinition extends NoOutputDefinition<PollEnrichDefinition> {
-
@XmlAttribute(name = "uri")
private String resourceUri;
@XmlAttribute(name = "ref")
private String resourceRef;
- @XmlAttribute(name = "timeout")
+ @XmlAttribute
private Long timeout;
@XmlAttribute(name = "strategyRef")
private String aggregationStrategyRef;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java Thu Feb 24 15:15:53 2011
@@ -40,26 +40,25 @@ import org.apache.camel.util.concurrent.
@XmlRootElement(name = "recipientList")
@XmlAccessorType(XmlAccessType.FIELD)
public class RecipientListDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode implements ExecutorServiceAwareDefinition<RecipientListDefinition> {
-
@XmlTransient
private AggregationStrategy aggregationStrategy;
@XmlTransient
private ExecutorService executorService;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String delimiter;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean parallelProcessing;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String strategyRef;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String executorServiceRef;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean stopOnException;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean ignoreInvalidEndpoints;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean streaming;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Long timeout;
public RecipientListDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java Thu Feb 24 15:15:53 2011
@@ -35,7 +35,7 @@ import org.apache.camel.util.ObjectHelpe
public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDefinition> {
@XmlAttribute(required = true)
private String pattern;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String excludePattern;
// in XML we cannot use String[] for attributes, so we provide a single attribute instead
@XmlTransient
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=1074186&r1=1074185&r2=1074186&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 Feb 24 15:15:53 2011
@@ -44,10 +44,9 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "resequence")
@XmlAccessorType(XmlAccessType.FIELD)
public class ResequenceDefinition extends ProcessorDefinition<ResequenceDefinition> {
-
- @XmlElement(name = "batch-config", required = false)
+ @XmlElement(name = "batch-config")
private BatchResequencerConfig batchConfig;
- @XmlElement(name = "stream-config", required = false)
+ @XmlElement(name = "stream-config")
private StreamResequencerConfig streamConfig;
@XmlElementRef
private ExpressionDefinition expression;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java Thu Feb 24 15:15:53 2011
@@ -31,7 +31,6 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "rollback")
@XmlAccessorType(XmlAccessType.FIELD)
public class RollbackDefinition extends NoOutputDefinition<RollbackDefinition> {
-
@XmlAttribute
private Boolean markRollbackOnly;
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java Thu Feb 24 15:15:53 2011
@@ -34,7 +34,6 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "routeContextRef")
@XmlAccessorType(XmlAccessType.FIELD)
public class RouteContextRefDefinition {
-
@XmlAttribute(required = true)
private String ref;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java Thu Feb 24 15:15:53 2011
@@ -54,6 +54,9 @@ public class RoutesDefinition extends Op
@XmlTransient
private ErrorHandlerBuilder errorHandlerBuilder;
+ public RoutesDefinition() {
+ }
+
@Override
public String toString() {
return "Routes: " + routes;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java Thu Feb 24 15:15:53 2011
@@ -43,10 +43,8 @@ public class SamplingDefinition extends
@XmlAttribute
private Long samplePeriod;
-
@XmlAttribute
private Long messageFrequency;
-
@XmlAttribute
@XmlJavaTypeAdapter(TimeUnitAdapter.class)
private TimeUnit units;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java Thu Feb 24 15:15:53 2011
@@ -36,9 +36,9 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class SendDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputDefinition<Type> {
- @XmlAttribute(required = false)
+ @XmlAttribute
protected String uri;
- @XmlAttribute(required = false)
+ @XmlAttribute
protected String ref;
@XmlTransient
protected Endpoint endpoint;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java Thu Feb 24 15:15:53 2011
@@ -45,17 +45,17 @@ public class SplitDefinition extends Exp
private AggregationStrategy aggregationStrategy;
@XmlTransient
private ExecutorService executorService;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean parallelProcessing;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String strategyRef;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String executorServiceRef;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean streaming;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean stopOnException;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Long timeout;
public SplitDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java Thu Feb 24 15:15:53 2011
@@ -33,6 +33,9 @@ import org.apache.camel.spi.RouteContext
@XmlAccessorType(XmlAccessType.FIELD)
public class StopDefinition extends NoOutputDefinition<StopDefinition> {
+ public StopDefinition() {
+ }
+
@Override
public String getShortName() {
return "stop";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java Thu Feb 24 15:15:53 2011
@@ -36,20 +36,19 @@ import org.apache.camel.spi.ThreadPoolPr
@XmlRootElement(name = "threadPoolProfile")
@XmlAccessorType(XmlAccessType.FIELD)
public class ThreadPoolProfileDefinition extends OptionalIdentifiedDefinition implements ThreadPoolProfile {
-
- @XmlAttribute()
+ @XmlAttribute
private Boolean defaultProfile;
- @XmlAttribute()
+ @XmlAttribute
private Integer poolSize;
- @XmlAttribute()
+ @XmlAttribute
private Integer maxPoolSize;
- @XmlAttribute()
+ @XmlAttribute
private Long keepAliveTime;
@XmlJavaTypeAdapter(TimeUnitAdapter.class)
private TimeUnit timeUnit;
- @XmlAttribute()
+ @XmlAttribute
private Integer maxQueueSize;
- @XmlAttribute()
+ @XmlAttribute
private ThreadPoolRejectedPolicy rejectedPolicy;
public ThreadPoolProfileDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java Thu Feb 24 15:15:53 2011
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.Processor;
import org.apache.camel.processor.ThrowExceptionProcessor;
-import org.apache.camel.spi.Required;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -34,8 +33,7 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "throwException")
@XmlAccessorType(XmlAccessType.FIELD)
public class ThrowExceptionDefinition extends NoOutputDefinition<ThrowExceptionDefinition> {
- @Required
- @XmlAttribute(name = "ref", required = true)
+ @XmlAttribute(required = true)
// the ref is required from tooling and XML DSL
private String ref;
@XmlTransient
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java Thu Feb 24 15:15:53 2011
@@ -32,7 +32,7 @@ import org.apache.camel.ExchangePattern;
@XmlRootElement(name = "to")
@XmlAccessorType(XmlAccessType.FIELD)
public class ToDefinition extends SendDefinition<ToDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private ExchangePattern pattern;
public ToDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java Thu Feb 24 15:15:53 2011
@@ -55,6 +55,9 @@ public class TryDefinition extends Outpu
@XmlTransient
private List<ProcessorDefinition> outputsWithoutCatches;
+ public TryDefinition() {
+ }
+
@Override
public String toString() {
return "DoTry[" + getOutputs() + "]";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Thu Feb 24 15:15:53 2011
@@ -34,8 +34,10 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
+import org.apache.camel.model.dataformat.ProtobufDataFormat;
import org.apache.camel.model.dataformat.RssDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
+import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.SyslogDataFormat;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
@@ -56,23 +58,25 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "unmarshal")
@XmlAccessorType(XmlAccessType.FIELD)
public class UnmarshalDefinition extends OutputDefinition<UnmarshalDefinition> {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String ref;
// cannot use @XmlElementRef as it doesn't allow optional properties
@XmlElements({
@XmlElement(required = false, name = "bindy", type = BindyDataFormat.class),
@XmlElement(required = false, name = "castor", type = CastorDataFormat.class),
- @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
@XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
+ @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
+ @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
@XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
+ @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java Thu Feb 24 15:15:53 2011
@@ -34,7 +34,6 @@ import org.apache.camel.spi.RouteContext
public class ValidateDefinition extends NoOutputExpressionNode {
public ValidateDefinition() {
- super();
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java Thu Feb 24 15:15:53 2011
@@ -40,7 +40,6 @@ import org.apache.camel.util.concurrent.
@XmlRootElement(name = "wireTap")
@XmlAccessorType(XmlAccessType.FIELD)
public class WireTapDefinition extends SendDefinition<WireTapDefinition> implements ExecutorServiceAwareDefinition<ProcessorDefinition> {
-
@XmlTransient
private Processor newExchangeProcessor;
@XmlAttribute(name = "processorRef")
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java Thu Feb 24 15:15:53 2011
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class BatchResequencerConfig {
-
@XmlAttribute
private Integer batchSize;
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java Thu Feb 24 15:15:53 2011
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement(name = "properties")
@XmlAccessorType(XmlAccessType.FIELD)
public class PropertiesDefinition {
- @XmlElement(name = "property", required = false)
+ @XmlElement(name = "property")
private List<PropertyDefinition> properties;
public PropertiesDefinition() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java Thu Feb 24 15:15:53 2011
@@ -33,7 +33,6 @@ import org.apache.camel.processor.resequ
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class StreamResequencerConfig {
-
@XmlAttribute
private Integer capacity;
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java Thu Feb 24 15:15:53 2011
@@ -33,16 +33,16 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "bindy")
@XmlAccessorType(XmlAccessType.FIELD)
public class BindyDataFormat extends DataFormatDefinition {
-
@XmlAttribute(required = true)
private BindyType type;
-
@XmlAttribute(required = true)
private String[] packages;
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private String locale;
+ public BindyDataFormat() {
+ }
+
public void setPackages(String[] packages) {
this.packages = packages;
}
@@ -51,6 +51,10 @@ public class BindyDataFormat extends Dat
this.type = type;
}
+ public void setLocale(String locale) {
+ this.locale = locale;
+ }
+
protected DataFormat createDataFormat(RouteContext routeContext) {
if (type == BindyType.Csv) {
setDataFormatName("bindy-csv");
@@ -60,7 +64,6 @@ public class BindyDataFormat extends Dat
return super.createDataFormat(routeContext);
}
-
@Override
protected void configureDataFormat(DataFormat dataFormat) {
setProperty(dataFormat, "packages", packages);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java Thu Feb 24 15:15:53 2011
@@ -32,16 +32,15 @@ import org.apache.camel.spi.DataFormat;
@XmlRootElement(name = "castor")
@XmlAccessorType(XmlAccessType.FIELD)
public class CastorDataFormat extends DataFormatDefinition {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private String mappingFile;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean validation;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String encoding;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String[] packages;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String[] classes;
public CastorDataFormat() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java Thu Feb 24 15:15:53 2011
@@ -32,7 +32,7 @@ import org.apache.camel.spi.DataFormat;
@XmlRootElement(name = "csv")
@XmlAccessorType(XmlAccessType.FIELD)
public class CsvDataFormat extends DataFormatDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String delimiter;
public CsvDataFormat() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java Thu Feb 24 15:15:53 2011
@@ -29,6 +29,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "gzip")
public class GzipDataFormat extends DataFormatDefinition {
+
@Override
protected DataFormat createDataFormat(RouteContext routeContext) {
return new org.apache.camel.impl.GzipDataFormat();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java Thu Feb 24 15:15:53 2011
@@ -32,8 +32,7 @@ import org.apache.camel.spi.DataFormat;
@XmlRootElement(name = "hl7")
@XmlAccessorType(XmlAccessType.FIELD)
public class HL7DataFormat extends DataFormatDefinition {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean validate;
public HL7DataFormat() {
@@ -58,6 +57,4 @@ public class HL7DataFormat extends DataF
setProperty(dataFormat, "validate", isValidate());
}
-
-
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java Thu Feb 24 15:15:53 2011
@@ -34,21 +34,20 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "jaxb")
@XmlAccessorType(XmlAccessType.FIELD)
public class JaxbDataFormat extends DataFormatDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute(required = true)
private String contextPath;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean prettyPrint;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean ignoreJAXBElement;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean filterNonXmlChars;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String encoding;
-
// Partial encoding
- @XmlAttribute(required = false)
+ @XmlAttribute
private String partClass;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String partNamespace;
public JaxbDataFormat() {
@@ -104,6 +103,14 @@ public class JaxbDataFormat extends Data
this.partNamespace = partNamespace;
}
+ public String getEncoding() {
+ return encoding;
+ }
+
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+
@Override
protected void configureDataFormat(DataFormat dataFormat) {
Boolean answer = ObjectHelper.toBoolean(getPrettyPrint());
@@ -135,4 +142,5 @@ public class JaxbDataFormat extends Data
}
setProperty(dataFormat, "contextPath", contextPath);
}
+
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java Thu Feb 24 15:15:53 2011
@@ -32,7 +32,6 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "jibx")
@XmlAccessorType(XmlAccessType.NONE)
public class JibxDataFormat extends DataFormatDefinition {
-
@XmlAttribute
private Class unmarshallClass;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java Thu Feb 24 15:15:53 2011
@@ -35,16 +35,12 @@ import org.apache.camel.util.ObjectHelpe
@XmlRootElement(name = "json")
@XmlAccessorType(XmlAccessType.FIELD)
public class JsonDataFormat extends DataFormatDefinition {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean prettyPrint;
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private JsonLibrary library = JsonLibrary.XStream;
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private String unmarshalTypeName;
-
@XmlTransient
private Class<?> unmarshalType;
@@ -63,6 +59,14 @@ public class JsonDataFormat extends Data
this.prettyPrint = prettyPrint;
}
+ public String getUnmarshalTypeName() {
+ return unmarshalTypeName;
+ }
+
+ public void setUnmarshalTypeName(String unmarshalTypeName) {
+ this.unmarshalTypeName = unmarshalTypeName;
+ }
+
public Class<?> getUnmarshalType() {
return unmarshalType;
}
@@ -86,6 +90,7 @@ public class JsonDataFormat extends Data
throw ObjectHelper.wrapRuntimeCamelException(e);
}
}
+ Boolean answer = ObjectHelper.toBoolean(getPrettyPrint());
return super.createDataFormat(routeContext);
}
@@ -95,6 +100,9 @@ public class JsonDataFormat extends Data
if (unmarshalType != null) {
setProperty(dataFormat, "unmarshalType", unmarshalType);
}
+ if (prettyPrint != null) {
+ setProperty(dataFormat, "prettyPrint", unmarshalType);
+ }
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java Thu Feb 24 15:15:53 2011
@@ -26,17 +26,15 @@ import org.apache.camel.model.DataFormat
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ObjectHelper;
-
/**
* Represents a protobuf DataFormat {@link org.apache.camel.spi.DataFormat}
*
* @version
*/
-
@XmlRootElement(name = "protobuf")
@XmlAccessorType(XmlAccessType.FIELD)
public class ProtobufDataFormat extends DataFormatDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute
private String instanceClass;
@XmlTransient
private Object defaultInstance;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java Thu Feb 24 15:15:53 2011
@@ -20,22 +20,21 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.namespace.QName;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.util.ObjectHelper;
@XmlRootElement(name = "soapjaxb")
@XmlAccessorType(XmlAccessType.FIELD)
public class SoapJaxbDataFormat extends DataFormatDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute(required = true)
private String contextPath;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String encoding;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String elementNameStrategyRef;
-
+ @XmlTransient
private Object elementNameStrategy;
public SoapJaxbDataFormat() {
@@ -94,15 +93,12 @@ public class SoapJaxbDataFormat extends
if (elementNameStrategy != null) {
setProperty(dataFormat, "elementNameStrategy", elementNameStrategy);
}
-
if (elementNameStrategyRef != null) {
setProperty(dataFormat, "elementNameStrategyRef", elementNameStrategyRef);
}
-
if (encoding != null) {
setProperty(dataFormat, "encoding", encoding);
}
-
setProperty(dataFormat, "contextPath", contextPath);
}
@@ -111,7 +107,6 @@ public class SoapJaxbDataFormat extends
this.elementNameStrategy = elementNameStrategy;
}
-
public Object getElementNameStrategy() {
return elementNameStrategy;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java Thu Feb 24 15:15:53 2011
@@ -33,8 +33,7 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "string")
@XmlAccessorType(XmlAccessType.FIELD)
public class StringDataFormat extends DataFormatDefinition {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private String charset;
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java Thu Feb 24 15:15:53 2011
@@ -26,16 +26,13 @@ import org.w3c.dom.Node;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.spi.DataFormat;
-
/**
* Represents a wellformed HTML document (XML well Formed) {@link DataFormat}
- *
*/
@XmlRootElement(name = "tidyMarkup")
@XmlAccessorType(XmlAccessType.FIELD)
public class TidyMarkupDataFormat extends DataFormatDefinition {
-
- @XmlAttribute(required = false)
+ @XmlAttribute
private Class<?> dataObjectType;
public TidyMarkupDataFormat() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java Thu Feb 24 15:15:53 2011
@@ -31,7 +31,7 @@ import org.apache.camel.model.DataFormat
@XmlRootElement(name = "xmlBeans")
@XmlAccessorType(XmlAccessType.FIELD)
public class XMLBeansDataFormat extends DataFormatDefinition {
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean prettyPrint;
public XMLBeansDataFormat() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java Thu Feb 24 15:15:53 2011
@@ -33,13 +33,13 @@ public class XMLSecurityDataFormat exten
private static final transient String TRIPLEDES = "http://www.w3.org/2001/04/xmlenc#tripledes-cbc";
- @XmlAttribute(required = false)
+ @XmlAttribute
private String xmlCipherAlgorithm;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String passPhrase;
- @XmlAttribute(required = false)
+ @XmlAttribute
private String secureTag;
- @XmlAttribute(required = false)
+ @XmlAttribute
private Boolean secureTagContents;
public XMLSecurityDataFormat() {
@@ -90,7 +90,6 @@ public class XMLSecurityDataFormat exten
}
}
-
public String getXmlCipherAlgorithm() {
return xmlCipherAlgorithm;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java Thu Feb 24 15:15:53 2011
@@ -48,30 +48,23 @@ import org.apache.camel.util.ObjectHelpe
public class XStreamDataFormat extends DataFormatDefinition {
@XmlAttribute
private String encoding;
-
@XmlAttribute
private String driver = "xml";
-
@XmlAttribute
private String driverRef;
-
@XmlJavaTypeAdapter(ConvertersAdapter.class)
@XmlElement(name = "converters")
private List<String> converters;
-
@XmlJavaTypeAdapter(AliasAdapter.class)
@XmlElement(name = "aliases")
private Map<String, String> aliases;
-
@XmlJavaTypeAdapter(OmitFieldsAdapter.class)
@XmlElement(name = "omitFields")
private Map<String, String[]> omitFields;
-
@XmlJavaTypeAdapter(ImplicitCollectionsAdapter.class)
@XmlElement(name = "implicitCollections")
private Map<String, String[]> implicitCollections;
-
public XStreamDataFormat() {
super("xstream");
}
@@ -221,7 +214,6 @@ public class XStreamDataFormat extends D
public void setClsName(String clsName) {
this.clsName = clsName;
}
-
}
@XmlTransient
@@ -330,7 +322,6 @@ public class XStreamDataFormat extends D
}
return answer;
}
-
}
@XmlAccessorType(XmlAccessType.NONE)
@@ -466,4 +457,5 @@ public class XStreamDataFormat extends D
return "OmitField[" + clsName + ", fields=" + Arrays.asList(this.fields) + "]";
}
}
+
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java Thu Feb 24 15:15:53 2011
@@ -17,7 +17,6 @@
package org.apache.camel.model.dataformat;
import java.util.zip.Deflater;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -33,9 +32,8 @@ import org.apache.camel.spi.RouteContext
@XmlRootElement(name = "zip")
@XmlAccessorType(XmlAccessType.FIELD)
public class ZipDataFormat extends DataFormatDefinition {
-
- @XmlAttribute(required = false)
- private int compressionLevel = Deflater.BEST_SPEED;
+ @XmlAttribute
+ private Integer compressionLevel;
public ZipDataFormat() {
}
@@ -46,14 +44,18 @@ public class ZipDataFormat extends DataF
@Override
protected DataFormat createDataFormat(RouteContext routeContext) {
- return new org.apache.camel.impl.ZipDataFormat(compressionLevel);
+ if (compressionLevel == null) {
+ return new org.apache.camel.impl.ZipDataFormat(Deflater.DEFAULT_COMPRESSION);
+ } else {
+ return new org.apache.camel.impl.ZipDataFormat(compressionLevel);
+ }
}
- public int getCompressionLevel() {
+ public Integer getCompressionLevel() {
return compressionLevel;
}
- public void setCompressionLevel(int compressionLevel) {
+ public void setCompressionLevel(Integer compressionLevel) {
this.compressionLevel = compressionLevel;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java Thu Feb 24 15:15:53 2011
@@ -16,12 +16,15 @@
*/
package org.apache.camel.model.language;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
/**
* For expressions and predicates using a constant
*/
@XmlRootElement(name = "constant")
+@XmlAccessorType(XmlAccessType.FIELD)
public class ConstantExpression extends ExpressionDefinition {
public ConstantExpression() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.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 = "el")
+@XmlAccessorType(XmlAccessType.FIELD)
public class ELExpression extends ExpressionDefinition {
+
public ELExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.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 = "groovy")
+@XmlAccessorType(XmlAccessType.FIELD)
public class GroovyExpression extends ExpressionDefinition {
+
public GroovyExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.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 = "header")
+@XmlAccessorType(XmlAccessType.FIELD)
public class HeaderExpression extends ExpressionDefinition {
+
public HeaderExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.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 = "jxpath")
+@XmlAccessorType(XmlAccessType.FIELD)
public class JXPathExpression extends ExpressionDefinition {
+
public JXPathExpression() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java?rev=1074186&r1=1074185&r2=1074186&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.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 = "javaScript")
+@XmlAccessorType(XmlAccessType.FIELD)
public class JavaScriptExpression extends ExpressionDefinition {
+
public JavaScriptExpression() {
}