You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/03/06 09:20:11 UTC
svn commit: r750806 [1/7] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/management/ camel-core/...
Author: hadrian
Date: Fri Mar 6 08:20:00 2009
New Revision: 750806
URL: http://svn.apache.org/viewvc?rev=750806&view=rev
Log:
CAMEL-1395
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java
- copied, changed from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ExchangeDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ExchangeType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/HeaderDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/HeaderType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/PropertyDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/PropertyType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterDefinition.java
- copied, changed from r750590, camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ExchangeType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/HeaderType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageType.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/PropertyType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelJMXAgentType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSDataFormat.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/FlatpackDataFormat.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/JsonDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.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/NamespaceAwareExpression.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/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/loadbalancer/FailOverLoadBalanceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalanceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debugger.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DelayInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Delayer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCachingInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ErrorHandlerWrappingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProcessorTypeHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/config/jaxb.index
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/loadbalancer/jaxb.index
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmFromCamelContextlTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThreadTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceFormatterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorTest.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
camel/trunk/components/camel-groovy/src/main/resources/org/apache/camel/language/groovy/ConfigureCamel.groovy
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/IntegerHeader.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbConverter.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/LongHeader.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ObjectHeader.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/StringHeader.java
camel/trunk/components/camel-jaxb/src/main/resources/org/apache/camel/converter/jaxb/jaxb.index
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConverterMessageTypeTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayerType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SExceptionType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequencerType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottlerType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryType.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SimpleRouteBuilder.java
camel/trunk/components/camel-spring/src/main/resources/org/apache/camel/spring/jaxb.index
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/debug/DebugTest.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Fri Mar 6 08:20:00 2009
@@ -22,8 +22,8 @@
import java.util.concurrent.Callable;
import org.apache.camel.builder.ErrorHandlerBuilder;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.DataFormatDefinition;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ExchangeConverter;
import org.apache.camel.spi.Injector;
@@ -181,7 +181,7 @@
*
* @return list of the current route definitions
*/
- List<RouteType> getRouteDefinitions();
+ List<RouteDefinition> getRouteDefinitions();
/**
* Returns the current routes in this context
@@ -205,24 +205,24 @@
* @param routeDefinitions the route definitions to add
* @throws Exception if the route definition could not be created for whatever reason
*/
- void addRouteDefinitions(Collection<RouteType> routeDefinitions) throws Exception;
+ void addRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception;
/**
* Removes a collection of route definitions from the context - stopping any previously running
* routes if any of them are actively running
*/
- void removeRouteDefinitions(Collection<RouteType> routeDefinitions) throws Exception;
+ void removeRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception;
/**
* Starts the given route if it has been previously stopped
*/
- void startRoute(RouteType route) throws Exception;
+ void startRoute(RouteDefinition route) throws Exception;
/**
* Stops the given route. It will remain in the list of route definitions return by {@link #getRouteDefinitions()}
* unless you use the {@link #removeRouteDefinitions(java.util.Collection)}
*/
- void stopRoute(RouteType route) throws Exception;
+ void stopRoute(RouteDefinition route) throws Exception;
// Properties
@@ -321,14 +321,14 @@
* Sets the data formats that can be referenced in the routes.
* @param dataFormats the data formats
*/
- void setDataFormats(Map<String, DataFormatType> dataFormats);
+ void setDataFormats(Map<String, DataFormatDefinition> dataFormats);
/**
* Gets the data formats that can be referenced in the routes.
*
* @return the data formats available
*/
- Map<String, DataFormatType> getDataFormats();
+ Map<String, DataFormatDefinition> getDataFormats();
/**
* Sets the properties that can be referenced in the camel context
@@ -356,7 +356,7 @@
/**
* Returns the current status of the given route
*/
- ServiceStatus getRouteStatus(RouteType route);
+ ServiceStatus getRouteStatus(RouteDefinition route);
/**
* Returns the class resolver to be used for loading/lookup of classes.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Fri Mar 6 08:20:00 2009
@@ -20,11 +20,11 @@
import org.w3c.dom.Node;
-import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.dataformat.ArtixDSContentType;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.CsvDataFormat;
-import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.dataformat.DataFormatDefinition;
import org.apache.camel.model.dataformat.HL7DataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
@@ -44,7 +44,7 @@
*
* @version $Revision$
*/
-public class DataFormatClause<T extends ProcessorType> {
+public class DataFormatClause<T extends ProcessorDefinition> {
private final T processorType;
private final Operation operation;
@@ -245,7 +245,7 @@
}
@SuppressWarnings("unchecked")
- private T dataFormat(DataFormatType dataFormatType) {
+ private T dataFormat(DataFormatDefinition dataFormatType) {
switch (operation) {
case Unmarshal:
return (T)processorType.unmarshal(dataFormatType);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Fri Mar 6 08:20:00 2009
@@ -267,7 +267,7 @@
}
/**
- * Sets the exception policy strategy to use for resolving the {@link org.apache.camel.model.ExceptionType}
+ * Sets the exception policy strategy to use for resolving the {@link org.apache.camel.model.ExceptionDefinition}
* to use for a given thrown exception
*/
public ExceptionPolicyStrategy getExceptionPolicyStrategy() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java Fri Mar 6 08:20:00 2009
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.camel.Processor;
-import org.apache.camel.model.ExceptionType;
+import org.apache.camel.model.ExceptionDefinition;
import org.apache.camel.spi.RouteContext;
/**
@@ -43,12 +43,12 @@
* Adds error handler for the given exception type
* @param exception the exception to handle
*/
- void addErrorHandlers(ExceptionType exception);
+ void addErrorHandlers(ExceptionDefinition exception);
/**
* Adds the error handlers for the given list of exception types
* @param exceptions the list of exceptions to handle
*/
- void setErrorHandlers(List<ExceptionType> exceptions);
+ void setErrorHandlers(List<ExceptionDefinition> exceptions);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java Fri Mar 6 08:20:00 2009
@@ -19,7 +19,7 @@
import java.util.List;
import org.apache.camel.Processor;
-import org.apache.camel.model.ExceptionType;
+import org.apache.camel.model.ExceptionDefinition;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -41,7 +41,7 @@
}
@Override
- public void addErrorHandlers(ExceptionType exception) {
+ public void addErrorHandlers(ExceptionDefinition exception) {
if (handler != null) {
handler.addErrorHandlers(exception);
}
@@ -52,8 +52,8 @@
if (handler == null) {
handler = routeContext.lookup(ref, ErrorHandlerBuilder.class);
ObjectHelper.notNull(handler, "error handler '" + ref + "'");
- List<ExceptionType> list = getExceptions();
- for (ExceptionType exceptionType : list) {
+ List<ExceptionDefinition> list = getExceptions();
+ for (ExceptionDefinition exceptionType : list) {
handler.addErrorHandlers(exceptionType);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java Fri Mar 6 08:20:00 2009
@@ -19,7 +19,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.model.ExceptionType;
+import org.apache.camel.model.ExceptionDefinition;
import org.apache.camel.processor.ErrorHandlerSupport;
/**
@@ -28,23 +28,23 @@
* @version $Revision$
*/
public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder {
- private List<ExceptionType> exceptions = new ArrayList<ExceptionType>();
+ private List<ExceptionDefinition> exceptions = new ArrayList<ExceptionDefinition>();
- public void addErrorHandlers(ExceptionType exception) {
+ public void addErrorHandlers(ExceptionDefinition exception) {
exceptions.add(exception);
}
protected void configure(ErrorHandlerSupport handler) {
- for (ExceptionType exception : exceptions) {
+ for (ExceptionDefinition exception : exceptions) {
handler.addExceptionPolicy(exception);
}
}
- public List<ExceptionType> getExceptions() {
+ public List<ExceptionDefinition> getExceptions() {
return exceptions;
}
- public void setErrorHandlers(List<ExceptionType> exceptions) {
+ public void setErrorHandlers(List<ExceptionDefinition> exceptions) {
this.exceptions.clear();
this.exceptions.addAll(exceptions);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Fri Mar 6 08:20:00 2009
@@ -21,7 +21,7 @@
import org.apache.camel.Expression;
import org.apache.camel.builder.xml.Namespaces;
import org.apache.camel.model.ExpressionNode;
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.language.MethodCallExpression;
import org.apache.camel.model.language.XPathExpression;
import org.apache.camel.model.language.XQueryExpression;
@@ -32,7 +32,7 @@
*
* @version $Revision$
*/
-public class ExpressionClause<T> extends ExpressionType {
+public class ExpressionClause<T> extends ExpressionDefinition {
private T result;
private String language;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Fri Mar 6 08:20:00 2009
@@ -26,12 +26,12 @@
import org.apache.camel.Route;
import org.apache.camel.Routes;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.model.ChoiceType;
-import org.apache.camel.model.ExceptionType;
-import org.apache.camel.model.InterceptType;
-import org.apache.camel.model.ProcessorType;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.model.RoutesType;
+import org.apache.camel.model.ChoiceDefinition;
+import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.InterceptDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.processor.interceptor.StreamCachingInterceptor;
@@ -43,7 +43,7 @@
*/
public abstract class RouteBuilder extends BuilderSupport implements Routes {
private AtomicBoolean initialized = new AtomicBoolean(false);
- private RoutesType routeCollection = new RoutesType();
+ private RoutesDefinition routeCollection = new RoutesDefinition();
private List<Route> routes = new ArrayList<Route>();
public RouteBuilder() {
@@ -75,8 +75,8 @@
* @param uri the from uri
* @return the builder
*/
- public RouteType from(String uri) {
- RouteType answer = routeCollection.from(uri);
+ public RouteDefinition from(String uri) {
+ RouteDefinition answer = routeCollection.from(uri);
configureRoute(answer);
return answer;
}
@@ -87,8 +87,8 @@
* @param endpoint the from endpoint
* @return the builder
*/
- public RouteType from(Endpoint endpoint) {
- RouteType answer = routeCollection.from(endpoint);
+ public RouteDefinition from(Endpoint endpoint) {
+ RouteDefinition answer = routeCollection.from(endpoint);
configureRoute(answer);
return answer;
}
@@ -99,8 +99,8 @@
* @param uris the from uris
* @return the builder
*/
- public RouteType from(String... uris) {
- RouteType answer = routeCollection.from(uris);
+ public RouteDefinition from(String... uris) {
+ RouteDefinition answer = routeCollection.from(uris);
configureRoute(answer);
return answer;
}
@@ -111,8 +111,8 @@
* @param endpoints the from endpoints
* @return the builder
*/
- public RouteType from(Endpoint... endpoints) {
- RouteType answer = routeCollection.from(endpoints);
+ public RouteDefinition from(Endpoint... endpoints) {
+ RouteDefinition answer = routeCollection.from(endpoints);
configureRoute(answer);
return answer;
}
@@ -152,11 +152,11 @@
}
/**
- * Adds a route for an interceptor; use the {@link ProcessorType#proceed()} method
+ * Adds a route for an interceptor; use the {@link ProcessorDefinition#proceed()} method
* to continue processing the underlying route being intercepted.
* @return the builder
*/
- public InterceptType intercept() {
+ public InterceptDefinition intercept() {
return routeCollection.intercept();
}
@@ -167,7 +167,7 @@
* @param predicate the predicate
* @return the builder
*/
- public ChoiceType intercept(Predicate predicate) {
+ public ChoiceDefinition intercept(Predicate predicate) {
return routeCollection.intercept(predicate);
}
@@ -178,7 +178,7 @@
* @param exception exception to catch
* @return the builder
*/
- public ExceptionType onException(Class exception) {
+ public ExceptionDefinition onException(Class exception) {
return routeCollection.onException(exception);
}
@@ -189,8 +189,8 @@
* @param exceptions list of exceptions to catch
* @return the builder
*/
- public ExceptionType onException(Class... exceptions) {
- ExceptionType last = null;
+ public ExceptionDefinition onException(Class... exceptions) {
+ ExceptionDefinition last = null;
for (Class ex : exceptions) {
last = last == null ? onException(ex) : last.onException(ex);
}
@@ -252,11 +252,11 @@
camelContext.addRouteDefinitions(routeCollection.getRoutes());
}
- public void setRouteCollection(RoutesType routeCollection) {
+ public void setRouteCollection(RoutesDefinition routeCollection) {
this.routeCollection = routeCollection;
}
- public RoutesType getRouteCollection() {
+ public RoutesDefinition getRouteCollection() {
return this.routeCollection;
}
@@ -281,7 +281,7 @@
return new DefaultCamelContext();
}
- protected void configureRoute(RouteType route) {
+ protected void configureRoute(RouteDefinition route) {
route.setGroup(getClass().getName());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Fri Mar 6 08:20:00 2009
@@ -44,8 +44,8 @@
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.management.InstrumentationLifecycleStrategy;
import org.apache.camel.management.JmxSystemPropertyKeys;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.DataFormatDefinition;
import org.apache.camel.processor.interceptor.Delayer;
import org.apache.camel.processor.interceptor.TraceFormatter;
import org.apache.camel.processor.interceptor.Tracer;
@@ -95,12 +95,12 @@
private LanguageResolver languageResolver = new DefaultLanguageResolver();
private Registry registry;
private LifecycleStrategy lifecycleStrategy;
- private List<RouteType> routeDefinitions = new ArrayList<RouteType>();
+ private List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
private List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
private Boolean trace;
private Long delay;
private ErrorHandlerBuilder errorHandlerBuilder;
- private Map<String, DataFormatType> dataFormats = new HashMap<String, DataFormatType>();
+ private Map<String, DataFormatDefinition> dataFormats = new HashMap<String, DataFormatDefinition>();
private Map<String, String> properties = new HashMap<String, String>();
private Class<? extends FactoryFinder> factoryFinderClass = FactoryFinder.class;
private Map<String, RouteService> routeServices = new HashMap<String, RouteService>();
@@ -441,8 +441,8 @@
//addRouteCollection(routeList);
}
- public void addRouteDefinitions(Collection<RouteType> routeDefinitions) throws Exception {
- for (RouteType routeDefinition : routeDefinitions) {
+ public void addRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception {
+ for (RouteDefinition routeDefinition : routeDefinitions) {
routeDefinition.setCamelContext(this);
}
this.routeDefinitions.addAll(routeDefinitions);
@@ -451,15 +451,15 @@
}
}
- public void removeRouteDefinitions(Collection<RouteType> routeDefinitions) throws Exception {
+ public void removeRouteDefinitions(Collection<RouteDefinition> routeDefinitions) throws Exception {
this.routeDefinitions.removeAll(routeDefinitions);
- for (RouteType routeDefinition : routeDefinitions) {
+ for (RouteDefinition routeDefinition : routeDefinitions) {
stopRoute(routeDefinition);
}
}
- public ServiceStatus getRouteStatus(RouteType route) {
+ public ServiceStatus getRouteStatus(RouteDefinition route) {
return getRouteStatus(route.idOrCreate());
}
@@ -474,7 +474,7 @@
return null;
}
- public void startRoute(RouteType route) throws Exception {
+ public void startRoute(RouteDefinition route) throws Exception {
Collection<Route> routes = new ArrayList<Route>();
List<RouteContext> routeContexts = route.addRoutes(this, routes);
RouteService routeService = new RouteService(this, route, routeContexts, routes);
@@ -482,7 +482,7 @@
}
- public void stopRoute(RouteType route) throws Exception {
+ public void stopRoute(RouteDefinition route) throws Exception {
stopRoute(route.idOrCreate());
}
@@ -626,7 +626,7 @@
this.lifecycleStrategy = lifecycleStrategy;
}
- public List<RouteType> getRouteDefinitions() {
+ public List<RouteDefinition> getRouteDefinitions() {
return routeDefinitions;
}
@@ -749,9 +749,9 @@
LOG.info("Apache Camel " + getVersion() + " (CamelContext:" + getName() + ") started");
}
- protected void startRouteDefinitions(Collection<RouteType> list) throws Exception {
+ protected void startRouteDefinitions(Collection<RouteDefinition> list) throws Exception {
if (list != null) {
- for (RouteType route : list) {
+ for (RouteDefinition route : list) {
startRoute(route);
}
}
@@ -899,11 +899,11 @@
return isStarted() && !isStarting();
}
- public void setDataFormats(Map<String, DataFormatType> dataFormats) {
+ public void setDataFormats(Map<String, DataFormatDefinition> dataFormats) {
this.dataFormats = dataFormats;
}
- public Map<String, DataFormatType> getDataFormats() {
+ public Map<String, DataFormatDefinition> getDataFormats() {
return dataFormats;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java Fri Mar 6 08:20:00 2009
@@ -24,8 +24,8 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Route;
import org.apache.camel.Service;
-import org.apache.camel.model.ProcessorType;
-import org.apache.camel.model.RouteType;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
@@ -51,16 +51,16 @@
}
public void onRouteContextCreate(RouteContext routeContext) {
- RouteType routeType = routeContext.getRoute();
+ RouteDefinition routeType = routeContext.getRoute();
if (routeType.getInputs() != null && !routeType.getInputs().isEmpty()) {
// configure the outputs
- List<ProcessorType> outputs = new ArrayList<ProcessorType>(routeType.getOutputs());
+ List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>(routeType.getOutputs());
// clearing the outputs
routeType.clearOutput();
// add the output configure the outputs with the routeType
- for (ProcessorType processorType : outputs) {
+ for (ProcessorDefinition processorType : outputs) {
routeType.addOutput(processorType);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Fri Mar 6 08:20:00 2009
@@ -29,10 +29,10 @@
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
-import org.apache.camel.model.FromType;
-import org.apache.camel.model.ProcessorType;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.dataformat.DataFormatDefinition;
import org.apache.camel.processor.Interceptor;
import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.ProceedProcessor;
@@ -47,8 +47,8 @@
* @version $Revision$
*/
public class DefaultRouteContext implements RouteContext {
- private RouteType route;
- private FromType from;
+ private RouteDefinition route;
+ private FromDefinition from;
private Collection<Route> routes;
private Endpoint endpoint;
private List<Processor> eventDrivenProcessors = new ArrayList<Processor>();
@@ -58,7 +58,7 @@
private ErrorHandlerWrappingStrategy errorHandlerWrappingStrategy;
private boolean routeAdded;
- public DefaultRouteContext(RouteType route, FromType from, Collection<Route> routes) {
+ public DefaultRouteContext(RouteDefinition route, FromDefinition from, Collection<Route> routes) {
this.route = route;
this.from = from;
this.routes = routes;
@@ -70,7 +70,7 @@
public DefaultRouteContext(CamelContext camelContext) {
this.camelContext = camelContext;
routes = new ArrayList<Route>();
- route = new RouteType("temporary");
+ route = new RouteDefinition("temporary");
}
public Endpoint getEndpoint() {
@@ -80,11 +80,11 @@
return endpoint;
}
- public FromType getFrom() {
+ public FromDefinition getFrom() {
return from;
}
- public RouteType getRoute() {
+ public RouteDefinition getRoute() {
return route;
}
@@ -95,7 +95,7 @@
return camelContext;
}
- public Processor createProcessor(ProcessorType node) throws Exception {
+ public Processor createProcessor(ProcessorDefinition node) throws Exception {
return node.createOutputsProcessor(this);
}
@@ -194,8 +194,8 @@
this.routeAdded = routeAdded;
}
- public DataFormatType getDataFormat(String ref) {
- Map<String, DataFormatType> dataFormats = getCamelContext().getDataFormats();
+ public DataFormatDefinition getDataFormat(String ref) {
+ Map<String, DataFormatDefinition> dataFormats = getCamelContext().getDataFormats();
if (dataFormats != null) {
return dataFormats.get(ref);
} else {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Fri Mar 6 08:20:00 2009
@@ -23,7 +23,7 @@
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Service;
-import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.spi.TraceableUnitOfWork;
import org.apache.camel.spi.UnitOfWork;
@@ -40,7 +40,7 @@
private String id;
private List<Synchronization> synchronizations;
private List<AsyncCallback> asyncCallbacks;
- private List<ProcessorType> routeList;
+ private List<ProcessorDefinition> routeList;
public DefaultUnitOfWork() {
}
@@ -99,21 +99,21 @@
return id;
}
- public synchronized void addInterceptedNode(ProcessorType node) {
+ public synchronized void addInterceptedNode(ProcessorDefinition node) {
if (routeList == null) {
- routeList = new ArrayList<ProcessorType>();
+ routeList = new ArrayList<ProcessorDefinition>();
}
routeList.add(node);
}
- public synchronized ProcessorType getLastInterceptedNode() {
+ public synchronized ProcessorDefinition getLastInterceptedNode() {
if (routeList == null || routeList.isEmpty()) {
return null;
}
return routeList.get(routeList.size() - 1);
}
- public List<ProcessorType> getInterceptedNodes() {
+ public List<ProcessorDefinition> getInterceptedNodes() {
return Collections.unmodifiableList(routeList);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java Fri Mar 6 08:20:00 2009
@@ -22,12 +22,12 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
import org.apache.camel.Service;
-import org.apache.camel.model.RouteType;
+import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
/**
- * Represents the runtime objects for a given {@link RouteType} so that it can be stopped independently
+ * Represents the runtime objects for a given {@link RouteDefinition} so that it can be stopped independently
* of other routes
*
* @version $Revision: 1.1 $
@@ -35,12 +35,12 @@
public class RouteService extends ServiceSupport {
private final DefaultCamelContext camelContext;
- private final RouteType routeType;
+ private final RouteDefinition routeType;
private final List<RouteContext> routeContexts;
private final Collection<Route> routes;
private String id;
- public RouteService(DefaultCamelContext camelContext, RouteType routeType, List<RouteContext> routeContexts, Collection<Route> routes) {
+ public RouteService(DefaultCamelContext camelContext, RouteDefinition routeType, List<RouteContext> routeContexts, Collection<Route> routes) {
this.camelContext = camelContext;
this.routeType = routeType;
this.routeContexts = routeContexts;
@@ -60,7 +60,7 @@
return routeContexts;
}
- public RouteType getRouteType() {
+ public RouteDefinition getRouteType() {
return routeType;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Fri Mar 6 08:20:00 2009
@@ -28,7 +28,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.Service;
-import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.RouteContext;
/**
@@ -143,11 +143,11 @@
}
/**
- * Implements the naming strategy for a {@link ProcessorType}.
- * The convention used for a {@link ProcessorType} ObjectName is:
+ * Implements the naming strategy for a {@link ProcessorDefinition}.
+ * The convention used for a {@link ProcessorDefinition} ObjectName is:
* <tt><domain>:context=<context-name>,route=<route-name>,type=processor,name=<processor-name>,nodeid=<node-id></tt>
*/
- public ObjectName getObjectName(RouteContext routeContext, ProcessorType processor)
+ public ObjectName getObjectName(RouteContext routeContext, ProcessorDefinition processor)
throws MalformedObjectNameException {
Endpoint ep = routeContext.getEndpoint();
String ctxid;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationErrorHandlerWrappingStrategy.java Fri Mar 6 08:20:00 2009
@@ -19,7 +19,7 @@
import java.util.Map;
import org.apache.camel.Processor;
-import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.ErrorHandlerWrappingStrategy;
import org.apache.camel.spi.RouteContext;
@@ -28,15 +28,15 @@
*/
public class InstrumentationErrorHandlerWrappingStrategy implements ErrorHandlerWrappingStrategy {
- private Map<ProcessorType, PerformanceCounter> counterMap;
+ private Map<ProcessorDefinition, PerformanceCounter> counterMap;
private RouteContext routeContext;
- public InstrumentationErrorHandlerWrappingStrategy(RouteContext routeContext, Map<ProcessorType, PerformanceCounter> counterMap) {
+ public InstrumentationErrorHandlerWrappingStrategy(RouteContext routeContext, Map<ProcessorDefinition, PerformanceCounter> counterMap) {
this.counterMap = counterMap;
this.routeContext = routeContext;
}
- public Processor wrapProcessorInErrorHandler(ProcessorType processorType, Processor target) throws Exception {
+ public Processor wrapProcessorInErrorHandler(ProcessorDefinition processorType, Processor target) throws Exception {
// don't wrap our instrumentation interceptors
if (counterMap.containsKey(processorType)) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java Fri Mar 6 08:20:00 2009
@@ -19,7 +19,7 @@
import java.util.Map;
import org.apache.camel.Processor;
-import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.InterceptStrategy;
/**
@@ -34,13 +34,13 @@
*/
public class InstrumentationInterceptStrategy implements InterceptStrategy {
- private Map<ProcessorType, PerformanceCounter> counterMap;
+ private Map<ProcessorDefinition, PerformanceCounter> counterMap;
- public InstrumentationInterceptStrategy(Map<ProcessorType, PerformanceCounter> counterMap) {
+ public InstrumentationInterceptStrategy(Map<ProcessorDefinition, PerformanceCounter> counterMap) {
this.counterMap = counterMap;
}
- public Processor wrapProcessorInInterceptors(ProcessorType processorType, Processor target) throws Exception {
+ public Processor wrapProcessorInInterceptors(ProcessorDefinition processorType, Processor target) throws Exception {
Processor retval = target;
PerformanceCounter counter = counterMap.get(processorType);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Fri Mar 6 08:20:00 2009
@@ -33,9 +33,9 @@
import org.apache.camel.Service;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.model.ExceptionType;
-import org.apache.camel.model.ProcessorType;
-import org.apache.camel.model.RouteType;
+import org.apache.camel.model.ExceptionDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.InstrumentationAgent;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
@@ -155,17 +155,17 @@
// Create a map (ProcessorType -> PerformanceCounter)
// to be passed to InstrumentationInterceptStrategy.
- Map<ProcessorType, PerformanceCounter> counterMap =
- new HashMap<ProcessorType, PerformanceCounter>();
+ Map<ProcessorDefinition, PerformanceCounter> counterMap =
+ new HashMap<ProcessorDefinition, PerformanceCounter>();
// Each processor in a route will have its own performance counter
// The performance counter are MBeans that we register with MBeanServer.
// These performance counter will be embedded
// to InstrumentationProcessor and wrap the appropriate processor
// by InstrumentationInterceptStrategy.
- RouteType route = routeContext.getRoute();
+ RouteDefinition route = routeContext.getRoute();
- for (ProcessorType processor : route.getOutputs()) {
+ for (ProcessorDefinition processor : route.getOutputs()) {
ObjectName name = null;
try {
// get the mbean name
@@ -191,7 +191,7 @@
// set up the interceptorMap for onRoutesAdd() method to register the
// ManagedRoute MBeans.
- RouteType routeType = routeContext.getRoute();
+ RouteDefinition routeType = routeContext.getRoute();
if (routeType.getInputs() != null && !routeType.getInputs().isEmpty()) {
if (routeType.getInputs().size() > 1) {
LOG.warn("Add InstrumentationProcessor to first input only.");
@@ -199,12 +199,12 @@
Endpoint endpoint = routeType.getInputs().get(0).getEndpoint();
- List<ProcessorType> exceptionHandlers = new ArrayList<ProcessorType>();
- List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ List<ProcessorDefinition> exceptionHandlers = new ArrayList<ProcessorDefinition>();
+ List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
// separate out the exception handers in the outputs
- for (ProcessorType output : routeType.getOutputs()) {
- if (output instanceof ExceptionType) {
+ for (ProcessorDefinition output : routeType.getOutputs()) {
+ if (output instanceof ExceptionDefinition) {
exceptionHandlers.add(output);
} else {
outputs.add(output);
@@ -222,7 +222,7 @@
routeType.intercept(processor);
// add the output
- for (ProcessorType processorType : outputs) {
+ for (ProcessorDefinition processorType : outputs) {
routeType.addOutput(processorType);
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorDefinition.java Fri Mar 6 08:20:00 2009
@@ -31,7 +31,7 @@
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.Aggregator;
import org.apache.camel.processor.aggregate.AggregationCollection;
import org.apache.camel.processor.aggregate.AggregationStrategy;
@@ -45,13 +45,13 @@
*/
@XmlRootElement(name = "aggregate")
@XmlAccessorType(XmlAccessType.FIELD)
-public class AggregatorType extends ProcessorType<AggregatorType> {
+public class AggregatorDefinition extends ProcessorDefinition<AggregatorDefinition> {
@XmlElement(name = "correlationExpression", required = false)
- private ExpressionSubElementType correlationExpression;
+ private ExpressionSubElementDefinition correlationExpression;
@XmlTransient
- private ExpressionType expression;
+ private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
private AggregationStrategy aggregationStrategy;
@XmlTransient
@@ -69,28 +69,28 @@
@XmlAttribute(required = false)
private Boolean groupExchanges;
@XmlElement(name = "completionPredicate", required = false)
- private ExpressionSubElementType completionPredicate;
+ private ExpressionSubElementDefinition completionPredicate;
- public AggregatorType() {
+ public AggregatorDefinition() {
}
- public AggregatorType(Predicate predicate) {
+ public AggregatorDefinition(Predicate predicate) {
if (predicate != null) {
- setExpression(new ExpressionType(predicate));
+ setExpression(new ExpressionDefinition(predicate));
}
}
- public AggregatorType(Expression correlationExpression) {
+ public AggregatorDefinition(Expression correlationExpression) {
if (correlationExpression != null) {
- setExpression(new ExpressionType(correlationExpression));
+ setExpression(new ExpressionDefinition(correlationExpression));
}
}
- public AggregatorType(ExpressionType correlationExpression) {
+ public AggregatorDefinition(ExpressionDefinition correlationExpression) {
this.expression = correlationExpression;
}
- public AggregatorType(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
+ public AggregatorDefinition(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
this(correlationExpression);
this.aggregationStrategy = aggregationStrategy;
}
@@ -111,8 +111,8 @@
return createAggregator(routeContext);
}
- public ExpressionClause<AggregatorType> createAndSetExpression() {
- ExpressionClause<AggregatorType> clause = new ExpressionClause<AggregatorType>(this);
+ public ExpressionClause<AggregatorDefinition> createAndSetExpression() {
+ ExpressionClause<AggregatorDefinition> clause = new ExpressionClause<AggregatorDefinition>(this);
this.setExpression(clause);
return clause;
}
@@ -254,11 +254,11 @@
this.collectionRef = collectionRef;
}
- public void setCompletionPredicate(ExpressionSubElementType completionPredicate) {
+ public void setCompletionPredicate(ExpressionSubElementDefinition completionPredicate) {
this.completionPredicate = completionPredicate;
}
- public ExpressionSubElementType getCompletionPredicate() {
+ public ExpressionSubElementDefinition getCompletionPredicate() {
return completionPredicate;
}
@@ -279,7 +279,7 @@
* @param batchSize the batch size
* @return builder
*/
- public AggregatorType batchSize(int batchSize) {
+ public AggregatorDefinition batchSize(int batchSize) {
setBatchSize(batchSize);
return this;
}
@@ -290,7 +290,7 @@
* @param batchSize the batch size
* @return builder
*/
- public AggregatorType outBatchSize(int batchSize) {
+ public AggregatorDefinition outBatchSize(int batchSize) {
setOutBatchSize(batchSize);
return this;
}
@@ -301,7 +301,7 @@
* @param batchTimeout the timeout in millis
* @return the builder
*/
- public AggregatorType batchTimeout(long batchTimeout) {
+ public AggregatorDefinition batchTimeout(long batchTimeout) {
setBatchTimeout(batchTimeout);
return this;
}
@@ -312,7 +312,7 @@
* @param aggregationCollection the aggregate collection to use
* @return the builder
*/
- public AggregatorType aggregationCollection(AggregationCollection aggregationCollection) {
+ public AggregatorDefinition aggregationCollection(AggregationCollection aggregationCollection) {
setAggregationCollection(aggregationCollection);
return this;
}
@@ -323,7 +323,7 @@
* @param aggregationStrategy the aggregate strategy to use
* @return the builder
*/
- public AggregatorType aggregationStrategy(AggregationStrategy aggregationStrategy) {
+ public AggregatorDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
setAggregationStrategy(aggregationStrategy);
return this;
}
@@ -334,7 +334,7 @@
* @param collectionRef reference to the aggregate collection to lookup in the registry
* @return the builder
*/
- public AggregatorType collectionRef(String collectionRef) {
+ public AggregatorDefinition collectionRef(String collectionRef) {
setCollectionRef(collectionRef);
return this;
}
@@ -345,7 +345,7 @@
* @param strategyRef reference to the strategy to lookup in the registry
* @return the builder
*/
- public AggregatorType strategyRef(String strategyRef) {
+ public AggregatorDefinition strategyRef(String strategyRef) {
setStrategyRef(strategyRef);
return this;
}
@@ -356,7 +356,7 @@
*
* @return the builder
*/
- public AggregatorType groupExchanges() {
+ public AggregatorDefinition groupExchanges() {
setGroupExchanges(true);
return this;
}
@@ -366,10 +366,10 @@
*
* @return the clause used to create the predicate
*/
- public ExpressionClause<AggregatorType> completionPredicate() {
+ public ExpressionClause<AggregatorDefinition> completionPredicate() {
checkNoCompletedPredicate();
- ExpressionClause<AggregatorType> clause = new ExpressionClause<AggregatorType>(this);
- setCompletionPredicate(new ExpressionSubElementType((Expression)clause));
+ ExpressionClause<AggregatorDefinition> clause = new ExpressionClause<AggregatorDefinition>(this);
+ setCompletionPredicate(new ExpressionSubElementDefinition((Expression)clause));
return clause;
}
@@ -378,9 +378,9 @@
*
* @param predicate the predicate
*/
- public AggregatorType completionPredicate(Predicate predicate) {
+ public AggregatorDefinition completionPredicate(Predicate predicate) {
checkNoCompletedPredicate();
- setCompletionPredicate(new ExpressionSubElementType(predicate));
+ setCompletionPredicate(new ExpressionSubElementDefinition(predicate));
return this;
}
@@ -390,11 +390,11 @@
}
}
- public void setCorrelationExpression(ExpressionSubElementType correlationExpression) {
+ public void setCorrelationExpression(ExpressionSubElementDefinition correlationExpression) {
this.correlationExpression = correlationExpression;
}
- public ExpressionSubElementType getCorrelationExpression() {
+ public ExpressionSubElementDefinition getCorrelationExpression() {
return correlationExpression;
}
@@ -402,27 +402,27 @@
// Needed to copy methods from ExpressionNode here so that I could specify the
// correlation expression as optional in JAXB
- public ExpressionType getExpression() {
+ public ExpressionDefinition getExpression() {
if (expression == null && correlationExpression != null) {
expression = correlationExpression.getExpressionType();
}
return expression;
}
- public void setExpression(ExpressionType expression) {
+ public void setExpression(ExpressionDefinition expression) {
this.expression = expression;
}
- public List<ProcessorType> getOutputs() {
+ public List<ProcessorDefinition> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType> outputs) {
+ public void setOutputs(List<ProcessorDefinition> outputs) {
this.outputs = outputs;
}
@Override
- protected void configureChild(ProcessorType output) {
+ protected void configureChild(ProcessorDefinition output) {
super.configureChild(output);
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java Fri Mar 6 08:20:00 2009
@@ -36,7 +36,7 @@
*/
@XmlRootElement(name = "bean")
@XmlAccessorType(XmlAccessType.FIELD)
-public class BeanRef extends OutputType<ProcessorType> {
+public class BeanRef extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = false)
private String ref;
@XmlAttribute(required = false)
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java Fri Mar 6 08:20:00 2009
@@ -22,5 +22,5 @@
* @version $Revision$
*/
public interface Block {
- void addOutput(ProcessorType processorType);
+ void addOutput(ProcessorDefinition processorType);
}