camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r747062 [1/5] - 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/builder/xml/ camel-core/src/main/java/org/apache/camel/component/bean/ ...
Date Mon, 23 Feb 2009 16:15:38 GMT
Author: davsclaus
Date: Mon Feb 23 16:14:17 2009
New Revision: 747062

URL: http://svn.apache.org/viewvc?rev=747062&view=rev
Log:
CAMEL-1373: Use CamelCase for header/prop keys. Moved well knows key consts to Exchange. Polished code. Added surpruse for compiler unchecked warnings. Removed some left over generics on Route. Fixed a bug in some util class.

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java   (contents, props changed)
      - copied, changed from r746943, camel/trunk/camel-core/src/main/java/org/apache/camel/util/NoFactoryAvailableException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/property/package.html
      - copied, changed from r746943, camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/package.html
Removed:
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/NoFactoryAvailableException.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/Route.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/ExpressionClause.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.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/DefaultComponentResolver.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.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/EventDrivenConsumerRoute.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.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/management/JmxSystemPropertyKeys.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.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/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/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/OptionalIdentifiedType.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/ResequencerType.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/RouteType.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/SetExchangePatternType.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/ThrowFaultType.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/DataFormatType.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/language/ExpressionType.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/FailOverLoadBalanceStrategy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.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/ExchangeFormatter.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/TraceInterceptor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/FactoryFinder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ResolverUtil.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/WebSphereResolverUtil.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.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/test/java/org/apache/camel/builder/RouteBuilderTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodWithMultipleParametersTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ChainedBeanInvocationTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/BeanToFileTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/DirectoryCreateIssueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMultipleDirectoriesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDirectoryNotMatchedTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExcludeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSkipDotFilesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileDeleteRouteExceptionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileFilterOnNameRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopTestProcessor.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
    camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java
    camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
    camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcHeaderFilterStrategy.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java
    camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java
    camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
    camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
    camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
    camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java
    camel/trunk/examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.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=747062&r1=747061&r2=747062&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 Mon Feb 23 16:14:17 2009
@@ -128,9 +128,11 @@
 
     /**
      * Returns a new Map containing all of the active endpoints with the key of the map being their
-     * unique key
+     * unique key.
+     *
+     * @return map of active endpoints
      */
-    Map<String,Endpoint> getEndpointMap();
+    Map<String, Endpoint> getEndpointMap();
 
     /**
      * Returns the collection of all registered endpoints for a uri or an empty collection.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Mon Feb 23 16:14:17 2009
@@ -30,22 +30,40 @@
  */
 public interface Exchange {
 
+    String BEAN_METHOD_NAME = "CamelBeanMethodName";
+    String BEAN_MULTI_PARAMETER_ARRAY = "CamelBeanMultiParameterArray";
+
     String AGGREGATED_COUNT = "CamelAggregatedCount";
 
     String CHARSET_NAME = "CamelCharsetName";
 
-    String EXCEPTION_CAUGHT = "CamelExceptionCaught";
+    String DATASET_INDEX = "CamelDataSetIndex";
 
+    String EXCEPTION_CAUGHT = "CamelExceptionCaught";
     String EXCEPTION_HANDLED = "CamelExceptionHandled";
-
     String FAILURE_HANDLED = "CamelFailureHandled";
 
-    String REDELIVERED = "CamelRedelivered";
+    String FILE_BATCH_INDEX = "CamelFileBatchIndex";
+    String FILE_BATCH_SIZE = "CamelFileBatchSize";
+    String FILE_LOCAL_WORK_PATH = "CamelFileLocalWorkPath";
+    String FILE_NAME = "CamelFileName";
+    String FILE_NAME_PRODUCED = "CamelFileNameProduced";
 
+    String LOOP_INDEX = "CamelLoopIndex";
+    String LOOP_SIZE = "CamelLoopSize";
+
+    String REDELIVERED = "CamelRedelivered";
     String REDELIVERY_COUNTER = "CamelRedeliveryCounter";
 
-    String TRANSACTED = "CamelTransacted";
+    String SPLIT_INDEX = "CamelSplitIndex";
+    String SPLIT_SIZE = "CamelSplitSize";
 
+    String TIMER_NAME = "CamelTimerName";
+    String TIMER_FIRED_TIME = "CamelTimerFiredTime";
+    String TIMER_PERIOD = "CamelTimerPeriod";
+    String TIMER_TIME = "CamelTimerTime";
+
+    String TRANSACTED = "CamelTransacted";
 
     /**
      * Returns the {@link ExchangePattern} (MEP) of this exchange.

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java (from r746943, camel/trunk/camel-core/src/main/java/org/apache/camel/util/NoFactoryAvailableException.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/util/NoFactoryAvailableException.java&r1=746943&r2=747062&rev=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/NoFactoryAvailableException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java Mon Feb 23 16:14:17 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.util;
+package org.apache.camel;
 
 import java.io.IOException;
 

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/NoFactoryAvailableException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java Mon Feb 23 16:14:17 2009
@@ -28,7 +28,7 @@
  *
  * @version $Revision$
  */
-public class Route<E extends Exchange> {
+public class Route {
     public static final String ID_PROPERTY = "id";
     public static final String PARENT_PROPERTY = "parent";
     public static final String GROUP_PROPERTY = "group";

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=747062&r1=747061&r2=747062&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 Mon Feb 23 16:14:17 2009
@@ -223,8 +223,7 @@
     /**
      * Uses the XML Security data format
      */
-    public T secureXML(String secureTag, boolean secureTagContents, String passPhrase,
-                        String xmlCipherAlgorithm) {
+    public T secureXML(String secureTag, boolean secureTagContents, String passPhrase, String xmlCipherAlgorithm) {
         XMLSecurityDataFormat xsdf = new XMLSecurityDataFormat(secureTag, secureTagContents, passPhrase, xmlCipherAlgorithm);
         return dataFormat(xsdf);
     }

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=747062&r1=747061&r2=747062&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 Mon Feb 23 16:14:17 2009
@@ -109,6 +109,7 @@
     /**
      * An expression of an outbound message body converted to the expected type
      */
+    @SuppressWarnings("unchecked")
     public T outBody(Class expectedType) {
         return expression(ExpressionBuilder.outBodyExpression(expectedType));
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java Mon Feb 23 16:14:17 2009
@@ -29,6 +29,7 @@
  * @version $Revision$
  */
 public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
+
     public ErrorHandlerBuilder copy() {
         return this;
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java Mon Feb 23 16:14:17 2009
@@ -112,8 +112,7 @@
     }
 
     /**
-     * A helper method to return true if any of the predicates
-     * matches.
+     * A helper method to return true if any of the predicates matches.
      */
     public static Predicate in(final Predicate... predicates) {
         notNull(predicates, "predicates");
@@ -298,8 +297,7 @@
 
             @Override
             protected String assertionFailureMessage(Exchange exchange) {
-                return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange)
-                       + ">";
+                return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange) + ">";
             }
 
         };

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java Mon Feb 23 16:14:17 2009
@@ -25,6 +25,12 @@
  */
 public interface ProcessorFactory {
 
+    /**
+     * Creates the processor.
+     *
+     * @return a newly created processor
+     * @throws Exception is thrown if the processor cannot be created
+     */
     Processor createProcessor() throws Exception;
 
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java Mon Feb 23 16:14:17 2009
@@ -81,6 +81,7 @@
         return null;
     }
 
+    @SuppressWarnings("unchecked")
     public Iterator getPrefixes(String namespaceURI) {
         Set set = new HashSet();
         for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Mon Feb 23 16:14:17 2009
@@ -527,6 +527,7 @@
     /**
      * Strategy method to extract the document from the exchange
      */
+    @SuppressWarnings("unchecked")
     protected Object getDocument(Exchange exchange) {
         Message in = exchange.getIn();
         Class type = getDocumentType();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Mon Feb 23 16:14:17 2009
@@ -108,7 +108,7 @@
         MethodInfo methodInfo = null;
 
         // TODO use some other mechanism?
-        String name = exchange.getIn().getHeader(BeanProcessor.METHOD_NAME, String.class);
+        String name = exchange.getIn().getHeader(Exchange.BEAN_METHOD_NAME, String.class);
         if (name != null) {
             methodInfo = operations.get(name);
         }
@@ -231,6 +231,7 @@
         return answer;
     }
 
+    @SuppressWarnings("unchecked")
     protected MethodInfo createMethodInfo(Class clazz, Method method) {
         Class[] parameterTypes = method.getParameterTypes();
         Annotation[][] parametersAnnotations = method.getParameterAnnotations();
@@ -299,6 +300,7 @@
         return null;
     }
 
+    @SuppressWarnings("unchecked")
     protected MethodInfo chooseMethodWithMatchingBody(Exchange exchange, Collection<MethodInfo> operationList) throws AmbiguousMethodCallException {
         // lets see if we can find a method who's body param type matches the message body
         Message in = exchange.getIn();
@@ -339,8 +341,7 @@
                         value = convertToType(exchange, methodInfo.getBodyParameterType(), body);
                         if (value != null) {
                             if (newBody != null) {
-                                throw new AmbiguousMethodCallException(exchange, Arrays.asList(matched,
-                                                                                               methodInfo));
+                                throw new AmbiguousMethodCallException(exchange, Arrays.asList(matched, methodInfo));
                             } else {
                                 newBody = value;
                                 matched = methodInfo;
@@ -397,8 +398,7 @@
 
         // TODO look for a parameter annotation that converts into an expression
         for (Annotation annotation : parameterAnnotation) {
-            Expression answer = createParameterUnmarshalExpressionForAnnotation(clazz, method, parameterType,
-                                                                                annotation);
+            Expression answer = createParameterUnmarshalExpressionForAnnotation(clazz, method, parameterType, annotation);
             if (answer != null) {
                 return answer;
             }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Mon Feb 23 16:14:17 2009
@@ -37,8 +37,6 @@
  * @version $Revision$
  */
 public class BeanProcessor extends ServiceSupport implements Processor {
-    public static final String METHOD_NAME = "org.apache.camel.MethodName";
-    public static final String MULTI_PARAMETER_ARRAY = "org.apache.camel.MultiParameterArray";
     private static final transient Log LOG = LogFactory.getLog(BeanProcessor.class);
 
     private boolean multiParameterArray;
@@ -82,8 +80,8 @@
         }
         Message in = exchange.getIn();
 
-        if (in.getHeader(MULTI_PARAMETER_ARRAY) == null) {
-            in.setHeader(MULTI_PARAMETER_ARRAY, isMultiParameterArray());
+        if (in.getHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY) == null) {
+            in.setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, isMultiParameterArray());
         }
 
         try {
@@ -104,8 +102,8 @@
         } else {
             // we just override the bean's invocation method name here
             if (ObjectHelper.isNotEmpty(method)) {
-                prevMethod = in.getHeader(METHOD_NAME, String.class);
-                in.setHeader(METHOD_NAME, method);
+                prevMethod = in.getHeader(Exchange.BEAN_METHOD_NAME, String.class);
+                in.setHeader(Exchange.BEAN_METHOD_NAME, method);
                 isExplicitMethod = true;
             }
             invocation = beanInfo.createInvocation(bean, exchange);
@@ -143,7 +141,7 @@
             }
         } finally {
             if (isExplicitMethod) {
-                in.setHeader(METHOD_NAME, prevMethod);
+                in.setHeader(Exchange.BEAN_METHOD_NAME, prevMethod);
             }
         }
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java Mon Feb 23 16:14:17 2009
@@ -38,7 +38,6 @@
 
     public synchronized Expression getDefaultParameterTypeExpression(Class parameterType) {
         Expression expression = parameterTypeToExpressionMap.get(parameterType);
-
         return expression;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Mon Feb 23 16:14:17 2009
@@ -177,8 +177,8 @@
                 Object[] answer = new Object[size];
                 Object body = exchange.getIn().getBody();
                 boolean multiParameterArray = false;
-                if (exchange.getIn().getHeader(BeanProcessor.MULTI_PARAMETER_ARRAY) != null) {
-                    multiParameterArray = exchange.getIn().getHeader(BeanProcessor.MULTI_PARAMETER_ARRAY, Boolean.class);
+                if (exchange.getIn().getHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY) != null) {
+                    multiParameterArray = exchange.getIn().getHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, Boolean.class);
                 }
                 for (int i = 0; i < size; i++) {
                     Object value = null;
@@ -275,8 +275,6 @@
 
     /**
      * Adds the current class and all of its base classes (apart from {@link Object} to the given list
-     * @param type
-     * @param result
      */
     protected void addTypeAndSuperTypes(Class<?> type, List<Class<?>> result) {
         for (Class<?> t = type; t != null && t != Object.class; t = t.getSuperclass()) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java Mon Feb 23 16:14:17 2009
@@ -37,6 +37,7 @@
         this(camelContext, 1000, 10000);
     }
 
+    @SuppressWarnings("unchecked")
     public MethodInfoCache(CamelContext camelContext, int classCacheSize, int methodCacheSize) {
         this(camelContext, createLruCache(classCacheSize), createLruCache(methodCacheSize));
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java Mon Feb 23 16:14:17 2009
@@ -34,7 +34,6 @@
     private ProxyHelper() {
     }
 
-
     /**
      * Creates a Proxy which sends PojoExchange to the endpoint.
      */
@@ -46,8 +45,6 @@
 
     /**
      * Creates a Proxy which sends PojoExchange to the endpoint.
-     *
-     * @throws Exception
      */
     @SuppressWarnings("unchecked")
     public static <T> T createProxy(Endpoint endpoint, ClassLoader cl, Class[] interfaces, MethodInfoCache methodCache) throws Exception {
@@ -56,8 +53,6 @@
 
     /**
      * Creates a Proxy which sends PojoExchange to the endpoint.
-     *
-     * @throws Exception
      */
     @SuppressWarnings("unchecked")
     public static <T> T createProxy(Endpoint endpoint, ClassLoader cl, Class<T>... interfaceClasses) throws Exception {
@@ -67,8 +62,6 @@
 
     /**
      * Creates a Proxy which sends PojoExchange to the endpoint.
-     *
-     * @throws Exception
      */
     @SuppressWarnings("unchecked")
     public static <T> T createProxy(Endpoint endpoint, Class<T>... interfaceClasses) throws Exception {
@@ -77,19 +70,14 @@
 
     /**
      * Creates a Proxy which sends PojoExchange to the endpoint.
-     *
-     * @throws Exception
      */
     @SuppressWarnings("unchecked")
     public static <T> T createProxy(Endpoint endpoint, Producer producer, Class<T>... interfaceClasses) throws Exception {
         return (T) createProxyObject(endpoint, producer, getClassLoader(interfaceClasses), interfaceClasses, createMethodInfoCache(endpoint));
     }
 
-
     /**
      * Returns the class loader of the first interface or throws {@link IllegalArgumentException} if there are no interfaces specified
-     *
-     * @return the class loader
      */
     protected static ClassLoader getClassLoader(Class... interfaces) {
         if (interfaces == null || interfaces.length < 1) {
@@ -98,7 +86,6 @@
         return interfaces[0].getClassLoader();
     }
 
-
     protected static MethodInfoCache createMethodInfoCache(Endpoint endpoint) {
         return new MethodInfoCache(endpoint.getCamelContext());
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java Mon Feb 23 16:14:17 2009
@@ -25,8 +25,6 @@
  */
 public interface DataSet {
 
-    String INDEX_HEADER = "camelDataSetIndex";
-
     /**
      * Populates a message exchange when using the DataSet as a source of messages
      */

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java Mon Feb 23 16:14:17 2009
@@ -94,7 +94,7 @@
         getDataSet().populateMessage(exchange, messageIndex);
 
         Message in = exchange.getIn();
-        in.setHeader(DataSet.INDEX_HEADER, messageIndex);
+        in.setHeader(Exchange.DATASET_INDEX, messageIndex);
 
         return exchange;
     }
@@ -190,8 +190,8 @@
     }
 
     protected void assertMessageExpected(long index, Exchange expected, Exchange actual) throws Exception {
-        long actualCounter = ExchangeHelper.getMandatoryHeader(actual, DataSet.INDEX_HEADER, Long.class);
-        assertEquals("Header: " + DataSet.INDEX_HEADER, index, actualCounter, actual);
+        long actualCounter = ExchangeHelper.getMandatoryHeader(actual, Exchange.DATASET_INDEX, Long.class);
+        assertEquals("Header: " + Exchange.DATASET_INDEX, index, actualCounter, actual);
 
         getDataSet().assertMessageExpected(this, expected, actual, index);
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java Mon Feb 23 16:14:17 2009
@@ -41,7 +41,7 @@
 
     public void process(Exchange exchange) throws Exception {
         if (endpoint.getConsumers().isEmpty()) {
-            LOG.warn("No consumers available on " + this + " to process " + exchange);
+            LOG.warn("No consumers available on endpoint: " + endpoint + " to process: " + exchange);
         } else {
             for (DefaultConsumer consumer : endpoint.getConsumers()) {
                 consumer.getProcessor().process(exchange);
@@ -52,7 +52,7 @@
     public boolean process(Exchange exchange, AsyncCallback callback) {
         int size = endpoint.getConsumers().size();
         if (size == 0) {
-            LOG.warn("No consumers available on " + this + " to process " + exchange);
+            LOG.warn("No consumers available on endpoint: " + endpoint + " to process " + exchange);
         } else if (size == 1) {
             DefaultConsumer consumer = endpoint.getConsumers().get(0);
             AsyncProcessor processor = AsyncProcessorTypeConverter.convert(consumer.getProcessor());

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java Mon Feb 23 16:14:17 2009
@@ -61,6 +61,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void init() throws NoSuchMethodException {
         // we must use reflection to invoke the AntPathMatcherFileFilter that reside in camel-spring.jar
         // and we don't want camel-ftp to have runtime dependency on camel-spring.jar

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java Mon Feb 23 16:14:17 2009
@@ -25,36 +25,10 @@
 public class FileComponent extends GenericFileComponent<File> {
 
     /**
-     * Header key holding the value: the fixed filename to use for producing files.
-     */
-    public static final String HEADER_FILE_NAME = "CamelFileName";
-
-    /**
-     * Header key holding the value: absolute filepath for the actual file produced (by file producer).
-     * Value is set automatically by Camel
-     */
-    public static final String HEADER_FILE_NAME_PRODUCED = "CamelFileNameProduced";
-
-    /**
-     * Header key holding the value: current index of total in the batch being consumed
-     */
-    public static final String HEADER_FILE_BATCH_INDEX = "CamelFileBatchIndex";
-
-    /**
-     * Header key holding the value: total in the batch being consumed
-     */
-    public static final String HEADER_FILE_BATCH_TOTAL = "CamelFileBatchTotal";
-
-    /**
      * Default camel lock filename postfix
      */
     public static final String DEFAULT_LOCK_FILE_POSTFIX = ".camelLock";
 
-    /**
-     * Header key holding file path to a local work directory containg a consumed file (if any)
-     */
-    public static final String HEADER_FILE_LOCAL_WORK_PATH = "CamelFileLocalWorkPath";
-
     protected GenericFileEndpoint<File> buildFileEndpoint(String uri, String remaining, Map parameters) throws Exception {
         File file = new File(remaining);
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java Mon Feb 23 16:14:17 2009
@@ -26,6 +26,7 @@
 import java.nio.channels.FileChannel;
 import java.util.List;
 
+import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.util.ExchangeHelper;
@@ -141,12 +142,12 @@
                 // so try to see if we can optimize by renaming the local work path file instead of doing
                 // a full file to file copy, as the local work copy is to be deleted afterwords anyway
                 // local work path
-                File local = exchange.getIn().getHeader(FileComponent.HEADER_FILE_LOCAL_WORK_PATH, File.class);
+                File local = exchange.getIn().getHeader(Exchange.FILE_LOCAL_WORK_PATH, File.class);
                 if (local != null && local.exists()) {
                     boolean renamed = writeFileByLocalWorkPath(local, file);
                     if (renamed) {
                         // clear header as we have renamed the file
-                        exchange.getIn().setHeader(FileComponent.HEADER_FILE_LOCAL_WORK_PATH, null);
+                        exchange.getIn().setHeader(Exchange.FILE_LOCAL_WORK_PATH, null);
                         // return as the operation is complete, we just renamed the local work file
                         // to the target.
                         return true;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Mon Feb 23 16:14:17 2009
@@ -48,6 +48,7 @@
      * @param source the source
      * @return a clone of the source
      */
+    @SuppressWarnings("unchecked")
     public GenericFile<T> copyFrom(GenericFile<T> source) {
         GenericFile<T> result;
         try {
@@ -82,7 +83,6 @@
      * @param newName the new name
      */
     public void changeFileName(String newName) {
-        
         newName = needToNormalize()
             // must normalize path to cater for Windows and other OS
             ? FileUtil.normalizePath(newName)
@@ -185,13 +185,11 @@
     }
 
     public void setAbsoluteFileName(String absoluteFileName) {
-               
         this.absoluteFileName = needToNormalize()
             // must normalize path to cater for Windows and other OS
             ? FileUtil.normalizePath(absoluteFileName)
             // we don't need to do that for Remote File
             : absoluteFileName;
-        
     }
 
     public String getAbsoluteFileName() {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java Mon Feb 23 16:14:17 2009
@@ -22,6 +22,7 @@
 public class GenericFileConfiguration {
 
     private String file;
+
     public boolean needToNormalize() {
         return true;
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java Mon Feb 23 16:14:17 2009
@@ -97,10 +97,8 @@
         for (int index = 0; index < total; index++) {
             GenericFileExchange<T> exchange = exchanges.get(index);
             // add current index and total as headers
-            exchange.getIn().setHeader(FileComponent.HEADER_FILE_BATCH_INDEX, index);
-            exchange.getIn().setHeader(FileComponent.HEADER_FILE_BATCH_TOTAL, total);
-            exchange.getIn().setHeader(FileComponent.HEADER_FILE_BATCH_INDEX, index);
-            exchange.getIn().setHeader(FileComponent.HEADER_FILE_BATCH_TOTAL, total);
+            exchange.getIn().setHeader(Exchange.FILE_BATCH_INDEX, index);
+            exchange.getIn().setHeader(Exchange.FILE_BATCH_SIZE, total);
             processExchange(exchange);
         }
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java Mon Feb 23 16:14:17 2009
@@ -138,8 +138,7 @@
             }
 
             public String toString() {
-                return expression
-                        + (nested != null ? ";" + nested.toString() : "");
+                return expression + (nested != null ? ";" + nested.toString() : "");
             }
         };
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java Mon Feb 23 16:14:17 2009
@@ -24,6 +24,7 @@
 import java.util.Map;
 
 import org.apache.camel.Component;
+import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
@@ -434,7 +435,7 @@
             name = name.substring(1);
         }
 
-        message.setHeader(FileComponent.HEADER_FILE_NAME, name);
+        message.setHeader(Exchange.FILE_NAME, name);
     }
 
     protected Map<String, Object> getParamsAsMap() {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Mon Feb 23 16:14:17 2009
@@ -91,9 +91,7 @@
 
             // lets store the name we really used in the header, so end-users
             // can retrieve it
-            exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME_PRODUCED, target);
-            // @deprecated will be removed later
-            exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME_PRODUCED, target);
+            exchange.getIn().setHeader(Exchange.FILE_NAME_PRODUCED, target);
         } catch (Exception e) {
             handleFailedWrite(exchange, e);
         }
@@ -153,7 +151,7 @@
     protected String createFileName(Exchange exchange) {
         String answer;
 
-        String name = exchange.getIn().getHeader(FileComponent.HEADER_FILE_NAME, String.class);
+        String name = exchange.getIn().getHeader(Exchange.FILE_NAME, String.class);
 
         // expression support
         Expression expression = endpoint.getFileExpression();
@@ -162,7 +160,7 @@
             // whatever configured on the endpoint
             if (name.indexOf("${") > -1) {
                 if (log.isDebugEnabled()) {
-                    log.debug(FileComponent.HEADER_FILE_NAME + " contains a FileLanguage expression: " + name);
+                    log.debug(Exchange.FILE_NAME + " contains a FileLanguage expression: " + name);
                 }
                 expression = FileLanguage.file(name);
             }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java Mon Feb 23 16:14:17 2009
@@ -18,7 +18,7 @@
 
 import java.io.File;
 
-import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.Exchange;
 import org.apache.camel.component.file.GenericFile;
 import org.apache.camel.component.file.GenericFileEndpoint;
 import org.apache.camel.component.file.GenericFileExchange;
@@ -71,7 +71,7 @@
 
     private void deleteLocalWorkFile(GenericFileExchange<T> exchange) {
         // delete local work file, if it was used (eg by ftp component)
-        File local = exchange.getIn().getHeader(FileComponent.HEADER_FILE_LOCAL_WORK_PATH, File.class);
+        File local = exchange.getIn().getHeader(Exchange.FILE_LOCAL_WORK_PATH, File.class);
         if (local != null && local.exists()) {
             if (log.isTraceEnabled()) {
                 log.trace("Deleting lock work file: " + local);

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java Mon Feb 23 16:14:17 2009
@@ -35,7 +35,7 @@
         MockEndpoint endpoint = new MockEndpoint(uri, this);
         Integer value = getAndRemoveParameter(parameters, "reportGroup", Integer.class);
         if (value != null) {
-            Processor reporter = new ThroughputLogger("org.apache.camel.mock:" + remaining, value);
+            Processor reporter = new ThroughputLogger("org.apache.camel.component.mock:" + remaining, value);
             endpoint.setReporter(reporter);
         }
         return endpoint;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Mon Feb 23 16:14:17 2009
@@ -389,6 +389,7 @@
      * Adds an expectation that the given body values are received by this
      * endpoint in any order
      */
+    @SuppressWarnings("unchecked")
     public void expectedBodiesReceivedInAnyOrder(Object... bodies) {
         List bodyList = new ArrayList();
         bodyList.addAll(Arrays.asList(bodies));
@@ -719,6 +720,7 @@
         }
     }
 
+    @SuppressWarnings("unchecked")
     protected void performAssertions(Exchange exchange) throws Exception {
         Message in = exchange.getIn();
         Object actualBody = in.getBody();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java Mon Feb 23 16:14:17 2009
@@ -86,12 +86,12 @@
 
     protected void sendTimerExchange() {
         Exchange exchange = endpoint.createExchange();
-        exchange.setProperty("org.apache.camel.timer.name", endpoint.getTimerName());
-        exchange.setProperty("org.apache.camel.timer.time", endpoint.getTime());
-        exchange.setProperty("org.apache.camel.timer.period", endpoint.getPeriod());
+        exchange.setProperty(Exchange.TIMER_NAME, endpoint.getTimerName());
+        exchange.setProperty(Exchange.TIMER_TIME, endpoint.getTime());
+        exchange.setProperty(Exchange.TIMER_PERIOD, endpoint.getPeriod());
 
         Date now = new Date();
-        exchange.setProperty("org.apache.camel.timer.firedTime", now);
+        exchange.setProperty(Exchange.TIMER_FIRED_TIME, now);
         // also set now on in header with same key as quaartz to be consistent
         exchange.getIn().setHeader("firedTime", now);
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java Mon Feb 23 16:14:17 2009
@@ -44,6 +44,7 @@
         return new SedaEndpoint(uri, this, blockingQueue);
     }
 
+    @SuppressWarnings("unchecked")
     protected BlockingQueue<Exchange> getBlockingQueue(String uri, Map parameters) {
         synchronized (QUEUES) {
             BlockingQueue<Exchange> answer = QUEUES.get(uri);

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java Mon Feb 23 16:14:17 2009
@@ -69,6 +69,7 @@
      * Converts a collection to a List if it is not already
      */
     @Converter
+    @SuppressWarnings("unchecked")
     public static List toList(Collection collection) {
         return new ArrayList(collection);
     }
@@ -77,6 +78,7 @@
      * Converts an {@link Iterator} to a {@link ArrayList}
      */
     @Converter
+    @SuppressWarnings("unchecked")
     public static ArrayList toArrayList(Iterator it) {
         ArrayList list = new ArrayList();
         while (it.hasNext()) {
@@ -86,6 +88,7 @@
     }
 
     @Converter
+    @SuppressWarnings("unchecked")
     public static Set toSet(Object[] array) {
         Set answer = new HashSet();
         answer.addAll(Arrays.asList(array));
@@ -93,6 +96,7 @@
     }
 
     @Converter
+    @SuppressWarnings("unchecked")
     public static Set toSet(Collection collection) {
         return new HashSet(collection);
     }
@@ -103,6 +107,7 @@
     }
 
     @Converter
+    @SuppressWarnings("unchecked")
     public static Properties toProperties(Map map) {
         Properties answer = new Properties();
         answer.putAll(map);
@@ -110,11 +115,13 @@
     }
 
     @Converter
+    @SuppressWarnings("unchecked")
     public static Hashtable toHashtable(Map map) {
         return new Hashtable(map);
     }
 
     @Converter
+    @SuppressWarnings("unchecked")
     public static HashMap toHashMap(Map map) {
         return new HashMap(map);
     }
@@ -123,6 +130,7 @@
      * Converts an {@link Iterable} into a {@link List} 
      */
     @Converter
+    @SuppressWarnings("unchecked")
     public static List toList(Iterable iterable) {
         if (iterable instanceof List) {
             return (List) iterable;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java Mon Feb 23 16:14:17 2009
@@ -95,7 +95,7 @@
                 try {
                     bytes = value.getBytes(charsetName);
                 } catch (UnsupportedEncodingException e) {
-                    LOG.warn("Can't convert the byte to String with the charset " + charsetName, e);
+                    LOG.warn("Cannot convert the byte to String with the charset " + charsetName, e);
                 }
             }
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java Mon Feb 23 16:14:17 2009
@@ -50,10 +50,7 @@
     @Converter
     public static boolean toBool(Object value) {
         Boolean answer = toBoolean(value);
-        if (answer != null) {
-            return answer.booleanValue();
-        }
-        return false;
+        return answer != null && answer;
     }
 
     /**
@@ -96,7 +93,7 @@
             return (Byte) value;
         } else if (value instanceof Number) {
             Number number = (Number) value;
-            return Byte.valueOf(number.byteValue());
+            return number.byteValue();
         } else if (value instanceof String) {
             return Byte.valueOf((String) value);
         } else {
@@ -128,7 +125,7 @@
             return (Short) value;
         } else if (value instanceof Number) {
             Number number = (Number) value;
-            return Short.valueOf(number.shortValue());
+            return number.shortValue();
         } else if (value instanceof String) {
             return Short.valueOf((String) value);
         } else {
@@ -145,7 +142,7 @@
             return (Integer) value;
         } else if (value instanceof Number) {
             Number number = (Number) value;
-            return Integer.valueOf(number.intValue());
+            return number.intValue();
         } else if (value instanceof String) {
             return Integer.valueOf((String) value);
         } else {
@@ -162,7 +159,7 @@
             return (Long) value;
         } else if (value instanceof Number) {
             Number number = (Number) value;
-            return Long.valueOf(number.longValue());
+            return number.longValue();
         } else if (value instanceof String) {
             return Long.valueOf((String) value);
         } else {
@@ -179,7 +176,7 @@
             return (Float) value;
         } else if (value instanceof Number) {
             Number number = (Number) value;
-            return Float.valueOf(number.floatValue());
+            return number.floatValue();
         } else if (value instanceof String) {
             return Float.valueOf((String) value);
         } else {
@@ -196,7 +193,7 @@
             return (Double) value;
         } else if (value instanceof Number) {
             Number number = (Number) value;
-            return Double.valueOf(number.doubleValue());
+            return number.doubleValue();
         } else if (value instanceof String) {
             return Double.valueOf((String) value);
         } else {
@@ -204,6 +201,4 @@
         }
     }
 
-
-
 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Mon Feb 23 16:14:17 2009
@@ -420,9 +420,6 @@
 
     /**
      * Converts the given TRaX Source into a W3C DOM node
-     * @throws SAXException
-     * @throws IOException
-     * @throws ParserConfigurationException
      */
     @Converter
     public Node toDOMNode(Source source) throws TransformerException, ParserConfigurationException, IOException, SAXException {

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=747062&r1=747061&r2=747062&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 Mon Feb 23 16:14:17 2009
@@ -25,13 +25,12 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.Callable;
-
 import javax.naming.Context;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
+import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.ResolveEndpointFailedException;
@@ -58,9 +57,7 @@
 import org.apache.camel.spi.LifecycleStrategy;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.util.CamelContextHelper;
 import org.apache.camel.util.FactoryFinder;
-import org.apache.camel.util.NoFactoryAvailableException;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ReflectionInjector;
 import org.apache.camel.util.SystemHelper;
@@ -69,7 +66,6 @@
 
 import static org.apache.camel.util.ServiceHelper.startServices;
 import static org.apache.camel.util.ServiceHelper.stopServices;
-
 /**
  * Represents the context used to configure routes and the policies to use.
  *
@@ -124,7 +120,7 @@
             }
             // if not created then fallback to default
             if (lifecycleStrategy == null) {
-                LOG.warn("Not possible to use JMX lifecycle strategy. Using DefaultLifecycleStrategy instead.");
+                LOG.warn("Cannot use JMX lifecycle strategy. Using DefaultLifecycleStrategy instead.");
                 lifecycleStrategy = new DefaultLifecycleStrategy();
             }
         }
@@ -162,7 +158,7 @@
         ObjectHelper.notNull(component, "component");
         synchronized (components) {
             if (components.containsKey(componentName)) {
-                throw new IllegalArgumentException("Component previously added: " + componentName);
+                throw new IllegalArgumentException("Cannot add component as its already previously added: " + componentName);
             }
             component.setCamelContext(this);
             components.put(componentName, component);
@@ -239,9 +235,9 @@
         }
     }
 
-    public Map<String,Endpoint> getEndpointMap() {
+    public Map<String, Endpoint> getEndpointMap() {
         synchronized (endpoints) {
-            return new TreeMap<String,Endpoint>(endpoints);
+            return new TreeMap<String, Endpoint>(endpoints);
         }
     }
 
@@ -353,7 +349,6 @@
                         lifecycleStrategy.onEndpointAdd(answer);
                     }
                 } catch (Exception e) {
-                    LOG.debug("Failed to resolve endpoint " + uri + ". Reason: " + e, e);
                     throw new ResolveEndpointFailedException(uri, e);
                 }
             }
@@ -382,7 +377,7 @@
 
     public void setRoutes(List<Route> routes) {
         this.routes = routes;
-        throw new UnsupportedOperationException("overriding existing routes is not supported yet, use addRoutes instead");
+        throw new UnsupportedOperationException("Overriding existing routes is not supported yet, use addRoutes instead");
     }
 
     public void addRoutes(Collection<Route> routes) throws Exception {
@@ -684,7 +679,7 @@
 
     protected void startRoutes(Collection<Route> routeList) throws Exception {
         if (routeList != null) {
-            for (Route<Exchange> route : routeList) {
+            for (Route route : routeList) {
                 List<Service> services = route.getServicesForRoute();
                 for (Service service : services) {
                     addService(service);
@@ -776,7 +771,7 @@
     }
 
     /**
-     * Attempt to convert the bean from a {@link Registry} to an endpoint using
+     * Strategy method for attempting to convert the bean from a {@link Registry} to an endpoint using
      * some kind of transformation or wrapper
      *
      * @param uri  the uri for the endpoint (and name in the registry)
@@ -830,8 +825,7 @@
     protected synchronized String getEndpointKey(String uri, Endpoint endpoint) {
         if (endpoint.isSingleton()) {
             return uri;
-        }
-        else {
+        } else {
             // lets try find the first endpoint key which is free
             for (int counter = 0; true; counter++) {
                 String key = (counter > 0) ? uri + ":" + counter : uri;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java Mon Feb 23 16:14:17 2009
@@ -18,9 +18,9 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
+import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.spi.ComponentResolver;
 import org.apache.camel.util.FactoryFinder;
-import org.apache.camel.util.NoFactoryAvailableException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -37,6 +37,7 @@
             new FactoryFinder("META-INF/services/org/apache/camel/component/");
     private static final transient Log LOG = LogFactory.getLog(DefaultComponentResolver.class);
 
+    @SuppressWarnings("unchecked")
     public Component resolveComponent(String name, CamelContext context) {
         Object bean = null;
         try {
@@ -45,7 +46,7 @@
                 LOG.debug("Found component: " + name + " in registry: " + bean);
             }
         } catch (Exception e) {
-            LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
+            LOG.debug("Ignored error looking up bean: " + name, e);
         }
         if (bean != null) {
             if (bean instanceof Component) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Mon Feb 23 16:14:17 2009
@@ -149,6 +149,7 @@
     /**
      * Returns the type of the exchange which is generated by this component
      */
+    @SuppressWarnings("unchecked")
     public Class<Exchange> getExchangeType() {
         Type type = getClass().getGenericSuperclass();
         if (type instanceof ParameterizedType) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Mon Feb 23 16:14:17 2009
@@ -121,19 +121,6 @@
         return new ConcurrentHashMap<String, Object>(properties);
     }
 
-    private static Message safeCopy(Exchange exchange, Message message) {
-        // TODO: This method is not used
-        if (message == null) {
-            return null;
-        }
-        Message answer = message.copy();
-        if (answer instanceof MessageSupport) {
-            MessageSupport messageSupport = (MessageSupport) answer;
-            messageSupport.setExchange(exchange);
-        }
-        return answer;
-    }
-
     public Exchange newInstance() {
         return new DefaultExchange(this);
     }
@@ -162,6 +149,7 @@
         return getContext().getTypeConverter().convertTo(type, this, value);
     }
 
+    @SuppressWarnings("unchecked")
     public void setProperty(String name, Object value) {
         ExchangeProperty<?> property = ExchangeProperty.getByName(name);
 
@@ -185,8 +173,7 @@
     private <T> void validateExchangePropertyIsExpectedType(ExchangeProperty<?> property, Class<T> type, Object value) {
         if (value != null && property != null && !property.type().isAssignableFrom(type)) {
             throw new RuntimeCamelException("Type cast exception while getting an "
-                    + "Exchange Property value '" + value.toString()
-                    + "' on Exchange " + this
+                    + "Exchange Property value '" + value.toString() + "' on Exchange " + this
                     + " for a well known Exchange Property with these traits: " + property);
         }
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultHeaderFilterStrategy.java Mon Feb 23 16:14:17 2009
@@ -47,7 +47,7 @@
     private Set<String> outFilter;
     private Pattern outFilterPattern;
 
-    private boolean lowercase;
+    private boolean lowerCase;
     private boolean allowNullValues;
     
     public boolean applyFilterToCamelHeaders(String headerName, Object headerValue) {
@@ -168,8 +168,8 @@
      * checking it the filter Set.  It does not affect filtering using
      * regular expression pattern.
      */
-    public boolean isLowercase() {
-        return lowercase;
+    public boolean isLowerCase() {
+        return lowerCase;
     }
     
     /**
@@ -178,8 +178,8 @@
      * checking it the filter Set.  It does not affect filtering using
      * regular expression pattern.
      */
-    public void setLowercase(boolean value) {
-        lowercase = value;
+    public void setLowerCase(boolean value) {
+        lowerCase = value;
     }
     
     public boolean getAllowNullValues() {
@@ -195,7 +195,6 @@
     }
 
     private boolean doFiltering(Direction direction, String headerName, Object headerValue) {
-        
         if (headerName == null) {
             return true;
         }
@@ -220,7 +219,7 @@
         }
             
         if (filter != null) {
-            if (isLowercase()) {
+            if (isLowerCase()) {
                 if (filter.contains(headerName.toLowerCase())) {
                     return true;
                 }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Mon Feb 23 16:14:17 2009
@@ -17,11 +17,11 @@
 package org.apache.camel.impl;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.NoSuchLanguageException;
 import org.apache.camel.spi.Language;
 import org.apache.camel.spi.LanguageResolver;
 import org.apache.camel.util.FactoryFinder;
-import org.apache.camel.util.NoFactoryAvailableException;
 
 /**
  * Default language resolver that looks for language factories in <b>META-INF/services/org/apache/camel/language/</b> and

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java Mon Feb 23 16:14:17 2009
@@ -88,7 +88,7 @@
      *         the underlying inbound transport
      */
     protected Map<String, Object> createHeaders() {
-        HashMap<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         populateInitialHeaders(map);
         return map;
     }
@@ -110,7 +110,7 @@
      * @return return a newly constructed Map
      */
     protected Map<String, DataHandler> createAttachments() {
-        HashMap<String, DataHandler> map = new HashMap<String, DataHandler>();
+        Map<String, DataHandler> map = new HashMap<String, DataHandler>();
         populateInitialAttachments(map);
         return map;
     }



Mime
View raw message