Include improvement : https://issues.apache.org/jira/browse/CAMEL-8066
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f74c12d2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f74c12d2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f74c12d2 Branch: refs/heads/master Commit: f74c12d2777deb66b5a660ec47abeb5a840e541e Parents: bf07762 18f5bf4 Author: Charles Moulliard <cmoulli...@apache.org> Authored: Fri Nov 21 10:21:07 2014 +0100 Committer: Charles Moulliard <cmoulli...@apache.org> Committed: Fri Nov 21 10:21:07 2014 +0100 ---------------------------------------------------------------------- apache-camel/pom.xml | 18 +- .../src/main/descriptors/common-bin.xml | 4 + .../main/java/org/apache/camel/Exchange.java | 19 + .../management/mbean/CamelOpenMBeanTypes.java | 8 +- .../mbean/ManagedCamelContextMBean.java | 2 +- .../camel/builder/ErrorHandlerBuilder.java | 1 + .../camel/builder/ErrorHandlerBuilderRef.java | 12 + .../builder/ErrorHandlerBuilderSupport.java | 25 + .../apache/camel/builder/ProcessorBuilder.java | 32 + .../camel/component/ResourceEndpoint.java | 13 +- .../camel/component/bean/BeanEndpoint.java | 2 +- .../component/beanclass/ClassEndpoint.java | 2 +- .../component/binding/BindingEndpoint.java | 2 +- .../camel/component/browse/BrowseEndpoint.java | 2 +- .../controlbus/ControlBusEndpoint.java | 2 +- .../dataformat/DataFormatEndpoint.java | 2 +- .../component/dataset/DataSetEndpoint.java | 2 +- .../camel/component/direct/DirectEndpoint.java | 2 +- .../component/directvm/DirectVmEndpoint.java | 2 +- .../camel/component/file/FileEndpoint.java | 2 +- .../component/language/LanguageEndpoint.java | 2 +- .../apache/camel/component/log/LogEndpoint.java | 2 +- .../camel/component/mock/MockEndpoint.java | 2 +- .../apache/camel/component/ref/RefEndpoint.java | 2 +- .../camel/component/rest/RestEndpoint.java | 2 +- .../camel/component/seda/SedaEndpoint.java | 2 +- .../camel/component/stub/StubEndpoint.java | 2 +- .../camel/component/test/TestEndpoint.java | 2 +- .../camel/component/timer/TimerEndpoint.java | 2 +- .../component/validator/ValidatorEndpoint.java | 2 +- .../apache/camel/component/vm/VmEndpoint.java | 2 +- .../camel/component/xslt/XsltEndpoint.java | 4 +- .../camel/impl/CamelContextTrackerRegistry.java | 62 ++ .../apache/camel/impl/DefaultCamelContext.java | 23 +- .../camel/impl/DefaultCamelContextRegistry.java | 133 ---- .../org/apache/camel/impl/DefaultEndpoint.java | 14 +- .../org/apache/camel/impl/DefaultExchange.java | 34 ++ .../main/java/org/apache/camel/main/Main.java | 9 +- .../management/mbean/ManagedCamelContext.java | 12 +- .../apache/camel/model/MarshalDefinition.java | 6 + .../apache/camel/model/ProcessorDefinition.java | 27 + .../camel/model/RemovePropertiesDefinition.java | 106 ++++ .../apache/camel/model/UnmarshalDefinition.java | 6 + .../model/dataformat/DataFormatsDefinition.java | 3 + .../dataformat/UniVocityAbstractDataFormat.java | 260 ++++++++ .../dataformat/UniVocityCsvDataFormat.java | 96 +++ .../UniVocityFixedWidthDataFormat.java | 94 +++ .../camel/model/dataformat/UniVocityHeader.java | 51 ++ .../dataformat/UniVocityTsvDataFormat.java | 56 ++ .../apache/camel/spi/CamelContextRegistry.java | 99 --- .../apache/camel/spi/CamelContextTracker.java | 41 ++ .../apache/camel/model/dataformat/jaxb.index | 4 + .../resources/org/apache/camel/model/jaxb.index | 1 + .../builder/ErrorHandlerBuilderRefTest.java | 87 +++ .../camel/impl/CamelContextTrackerTest.java | 71 +++ .../apache/camel/impl/DefaultExchangeTest.java | 70 +++ .../RemovePropertiesWithExclusionTest.java | 85 +++ .../RemovePropertiesWithoutExclusionTest.java | 79 +++ .../camel/spi/CamelContextRegistryTest.java | 72 --- components/camel-bam/pom.xml | 3 +- .../component/beanstalk/BeanstalkCommand.java | 25 + .../component/beanstalk/BeanstalkComponent.java | 2 +- .../component/beanstalk/BeanstalkConsumer.java | 12 +- .../component/beanstalk/BeanstalkEndpoint.java | 64 +- .../camel/component/beanstalk/EndpointTest.java | 8 +- .../camel/component/beanstalk/Helper.java | 2 +- .../camel/component/beanstalk/ProducerTest.java | 22 +- components/camel-box/pom.xml | 3 +- components/camel-cxf-transport/pom.xml | 3 +- components/camel-cxf/pom.xml | 3 +- .../component/cxf/CxfDispatchMessageBeans.xml | 2 - .../component/cxf/CxfDispatchPayloadBeans.xml | 2 - components/camel-facebook/pom.xml | 6 +- .../component/file/remote/FtpEndpoint.java | 2 +- .../component/file/remote/FtpsEndpoint.java | 2 +- .../component/file/remote/SftpEndpoint.java | 2 +- components/camel-gae/pom.xml | 3 +- components/camel-google-calendar/pom.xml | 260 ++++++++ .../BatchGoogleCalendarClientFactory.java | 68 +++ .../calendar/GoogleCalendarClientFactory.java | 27 + .../calendar/GoogleCalendarComponent.java | 74 +++ .../calendar/GoogleCalendarConfiguration.java | 100 +++ .../google/calendar/GoogleCalendarConsumer.java | 47 ++ .../google/calendar/GoogleCalendarEndpoint.java | 116 ++++ .../google/calendar/GoogleCalendarProducer.java | 48 ++ .../internal/GoogleCalendarConstants.java | 29 + .../GoogleCalendarPropertiesHelper.java | 39 ++ .../org/apache/camel/component/google-calendar | 1 + .../AbstractGoogleCalendarTestSupport.java | 121 ++++ .../calendar/CalendarAclIntegrationTest.java | 74 +++ .../CalendarCalendarListIntegrationTest.java | 91 +++ .../CalendarCalendarsIntegrationTest.java | 89 +++ .../calendar/CalendarColorsIntegrationTest.java | 53 ++ .../calendar/CalendarEventsIntegrationTest.java | 162 +++++ .../CalendarFreebusyIntegrationTest.java | 70 +++ .../CalendarSettingsIntegrationTest.java | 68 +++ .../src/test/resources/log4j.properties | 14 + .../src/test/resources/test-options.properties | 26 + components/camel-google-drive/pom.xml | 3 +- components/camel-hawtdb/pom.xml | 3 +- components/camel-hazelcast/pom.xml | 3 +- components/camel-hbase/pom.xml | 3 +- .../camel/component/hdfs/HdfsEndpoint.java | 2 +- .../camel/component/hdfs2/HdfsEndpoint.java | 2 +- .../camel/component/http/HttpEndpoint.java | 2 +- components/camel-http4/pom.xml | 3 +- .../camel/component/http4/HttpEndpoint.java | 2 +- components/camel-jaxb/pom.xml | 3 +- components/camel-jcr/pom.xml | 3 +- .../camel/component/jdbc/JdbcEndpoint.java | 2 +- components/camel-jetty/pom.xml | 3 +- .../camel/component/jetty/CamelHttpClient.java | 22 + .../component/jetty/JettyHttpComponent.java | 546 +++++++++++------ .../component/jetty/JettyHttpEndpoint.java | 2 +- .../component/jetty/ExplicitHttpsRouteTest.java | 10 +- ...licitHttpsSslContextParametersRouteTest.java | 10 +- .../component/jetty/ExplicitJettyRouteTest.java | 7 +- components/camel-jms/pom.xml | 3 +- .../apache/camel/component/jms/JmsEndpoint.java | 2 +- .../apache/camel/component/jpa/JpaEndpoint.java | 2 +- components/camel-leveldb/pom.xml | 3 +- components/camel-linkedin/pom.xml | 3 +- .../metrics/AbstractMetricsEndpoint.java | 53 -- .../metrics/AbstractMetricsProducer.java | 27 +- .../component/metrics/CounterProducer.java | 49 ++ .../component/metrics/HistogramProducer.java | 48 ++ .../camel/component/metrics/MeterProducer.java | 44 ++ .../component/metrics/MetricsComponent.java | 38 +- .../component/metrics/MetricsEndpoint.java | 133 ++++ .../component/metrics/MetricsTimerAction.java | 23 + .../camel/component/metrics/TimerProducer.java | 83 +++ .../metrics/counter/CounterEndpoint.java | 66 -- .../metrics/counter/CounterProducer.java | 52 -- .../metrics/histogram/HistogramEndpoint.java | 55 -- .../metrics/histogram/HistogramProducer.java | 50 -- .../component/metrics/meter/MeterEndpoint.java | 55 -- .../component/metrics/meter/MeterProducer.java | 45 -- .../routepolicy/MetricsRegistryService.java | 14 +- .../component/metrics/timer/TimerEndpoint.java | 59 -- .../component/metrics/timer/TimerProducer.java | 86 --- .../metrics/AbstractMetricsEndpointTest.java | 105 ---- .../metrics/AbstractMetricsProducerTest.java | 15 +- .../component/metrics/CounterEndpointTest.java | 99 +++ .../component/metrics/CounterProducerTest.java | 196 ++++++ .../component/metrics/CounterRouteTest.java | 200 ++++++ .../metrics/HistogramEndpointTest.java | 85 +++ .../metrics/HistogramProducerTest.java | 128 ++++ .../component/metrics/HistogramRouteTest.java | 124 ++++ .../component/metrics/MeterEndpointTest.java | 86 +++ .../component/metrics/MeterProducerTest.java | 127 ++++ .../camel/component/metrics/MeterRouteTest.java | 166 +++++ .../metrics/MetricComponentSpringTest.java | 1 + .../metrics/MetricsComponentRouteTest.java | 2 + .../component/metrics/MetricsComponentTest.java | 40 +- .../component/metrics/MetricsEndpointTest.java | 106 ++++ .../component/metrics/MetricsTypeTest.java | 1 + .../component/metrics/TimerEndpointTest.java | 85 +++ .../component/metrics/TimerProducerTest.java | 229 +++++++ .../camel/component/metrics/TimerRouteTest.java | 144 +++++ .../metrics/counter/CounterEndpointTest.java | 102 ---- .../metrics/counter/CounterProducerTest.java | 195 ------ .../metrics/counter/CounterRouteTest.java | 210 ------- .../histogram/HistogramEndpointTest.java | 88 --- .../histogram/HistogramProducerTest.java | 125 ---- .../metrics/histogram/HistogramRouteTest.java | 124 ---- .../metrics/meter/MeterEndpointTest.java | 89 --- .../metrics/meter/MeterProducerTest.java | 126 ---- .../component/metrics/meter/MeterRouteTest.java | 166 ----- .../ManagedMetricsRoutePolicyTest.java | 27 +- .../metrics/timer/TimerEndpointTest.java | 89 --- .../metrics/timer/TimerProducerTest.java | 229 ------- .../component/metrics/timer/TimerRouteTest.java | 145 ----- components/camel-mina/pom.xml | 3 +- components/camel-mina2/pom.xml | 15 +- .../mongodb/MongoDbTailTrackingManager.java | 2 +- components/camel-mqtt/pom.xml | 5 +- .../camel/component/mqtt/MQTTEndpoint.java | 27 +- .../component/mybatis/MyBatisEndpoint.java | 2 +- .../component/netty/http/NettyHttpEndpoint.java | 2 +- .../camel/component/netty/NettyComponent.java | 11 +- .../component/netty/NettyConfiguration.java | 2 +- components/camel-olingo2/pom.xml | 3 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- components/camel-quartz/pom.xml | 3 +- .../camel/component/quartz/QuartzEndpoint.java | 23 +- components/camel-quartz2/pom.xml | 3 +- .../camel/component/quartz2/QuartzEndpoint.java | 36 +- .../camel/component/quartz2/QuartzHelper.java | 21 +- .../restlet/DefaultRestletBinding.java | 33 +- components/camel-rx/pom.xml | 4 +- .../camel/rx/support/EndpointSubscribeFunc.java | 2 +- .../camel/rx/support/EndpointSubscription.java | 10 +- .../src/test/resources/log4j.properties | 6 +- components/camel-sap-netweaver/pom.xml | 6 +- .../org/apache/camel/scala/RichExchange.scala | 4 + .../camel/scala/dsl/SAbstractDefinition.scala | 6 + .../camel/scala/dsl/languages/Languages.scala | 2 + components/camel-scr/pom.xml | 1 + .../apache/camel/scr/AbstractCamelRunner.java | 36 +- .../apache/camel/scr/internal/ScrHelper.java | 8 +- .../apache/camel/scr/ConcreteCamelRunner.java | 1 + components/camel-script/pom.xml | 3 +- components/camel-servlet/pom.xml | 3 +- .../component/servlet/ServletEndpoint.java | 2 +- components/camel-servletlistener/pom.xml | 3 +- components/camel-sjms/pom.xml | 3 +- .../camel/component/sjms/SjmsEndpoint.java | 2 +- components/camel-soap/pom.xml | 3 +- ...SpringRemovePropertiesWithExclusionTest.java | 28 + ...ingRemovePropertiesWithoutExclusionTest.java | 28 + .../processor/removePropertiesWithExclusion.xml | 43 ++ .../removePropertiesWithoutExclusion.xml | 40 ++ components/camel-sql/pom.xml | 3 +- .../apache/camel/component/sql/SqlEndpoint.java | 2 +- components/camel-stream/pom.xml | 3 +- components/camel-test-blueprint/pom.xml | 7 +- components/camel-twitter/pom.xml | 6 +- components/camel-univocity-parsers/pom.xml | 82 +++ .../univocity/AbstractUniVocityDataFormat.java | 612 +++++++++++++++++++ .../univocity/HeaderRowProcessor.java | 69 +++ .../camel/dataformat/univocity/Marshaller.java | 101 +++ .../univocity/UniVocityCsvDataFormat.java | 209 +++++++ .../UniVocityFixedWidthDataFormat.java | 219 +++++++ .../univocity/UniVocityTsvDataFormat.java | 101 +++ .../dataformat/univocity/Unmarshaller.java | 197 ++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 ++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../org/apache/camel/dataformat/univocity-csv | 18 + .../org/apache/camel/dataformat/univocity-fixed | 18 + .../org/apache/camel/dataformat/univocity-tsv | 18 + ...UniVocityCsvDataFormatMarshalSpringTest.java | 127 ++++ .../UniVocityCsvDataFormatMarshalTest.java | 153 +++++ .../univocity/UniVocityCsvDataFormatTest.java | 202 ++++++ ...iVocityCsvDataFormatUnmarshalSpringTest.java | 152 +++++ .../UniVocityCsvDataFormatUnmarshalTest.java | 193 ++++++ ...tyFixedWidthDataFormatMarshalSpringTest.java | 125 ++++ ...niVocityFixedWidthDataFormatMarshalTest.java | 155 +++++ .../UniVocityFixedWidthDataFormatTest.java | 260 ++++++++ ...FixedWidthDataFormatUnmarshalSpringTest.java | 152 +++++ ...VocityFixedWidthDataFormatUnmarshalTest.java | 196 ++++++ .../univocity/UniVocityTestHelper.java | 67 ++ ...UniVocityTsvDataFormatMarshalSpringTest.java | 126 ++++ .../UniVocityTsvDataFormatMarshalTest.java | 150 +++++ .../univocity/UniVocityTsvDataFormatTest.java | 172 ++++++ ...iVocityTsvDataFormatUnmarshalSpringTest.java | 152 +++++ .../UniVocityTsvDataFormatUnmarshalTest.java | 191 ++++++ .../src/test/resources/log4j.properties | 37 ++ .../UniVocityCsvDataFormatMarshalSpringTest.xml | 58 ++ ...niVocityCsvDataFormatUnmarshalSpringTest.xml | 74 +++ ...ityFixedWidthDataFormatMarshalSpringTest.xml | 64 ++ ...yFixedWidthDataFormatUnmarshalSpringTest.xml | 88 +++ .../UniVocityTsvDataFormatMarshalSpringTest.xml | 57 ++ ...niVocityTsvDataFormatUnmarshalSpringTest.xml | 74 +++ components/camel-urlrewrite/pom.xml | 3 +- components/camel-vertx/pom.xml | 3 +- .../main/java/org/apache/camel/web/Main.java | 13 +- .../test/java/org/apache/camel/web/Main.java | 21 +- components/pom.xml | 11 +- examples/camel-example-bam/pom.xml | 3 +- examples/camel-example-loan-broker/pom.xml | 3 +- examples/pom.xml | 3 +- parent/pom.xml | 31 +- platforms/catalog/pom.xml | 73 +++ .../camel/catalog/CamelComponentCatalog.java | 51 ++ .../catalog/DefaultCamelComponentCatalog.java | 188 ++++++ .../apache/camel/catalog/JSonSchemaHelper.java | 91 +++ platforms/commands/commands-core/pom.xml | 5 + .../camel/commands/AbstractCamelController.java | 103 ++++ .../apache/camel/commands/CamelController.java | 20 +- .../commands/CatalogComponentListCommand.java | 192 ++++++ .../camel/commands/CatalogLabelListCommand.java | 165 +++++ .../camel/commands/ComponentListCommand.java | 2 +- .../camel/commands/ContextListCommandTest.java | 6 +- .../catalog/CamelComponentCatalogTest.java | 124 ++++ platforms/karaf/commands/pom.xml | 2 +- .../karaf/commands/CatalogComponentList.java | 39 ++ .../camel/karaf/commands/CatalogLabelList.java | 35 ++ .../camel/karaf/commands/ComponentList.java | 2 +- .../OSGI-INF/blueprint/camel-commands.xml | 10 + .../features/src/main/resources/features.xml | 23 +- platforms/pom.xml | 1 + tests/camel-itest-karaf/pom.xml | 3 +- .../itest/karaf/CamelGoogleCalendarTest.java | 40 ++ tests/camel-itest-osgi/pom.xml | 3 +- tests/camel-itest/pom.xml | 3 +- .../tools/apt/EndpointAnnotationProcessor.java | 97 ++- tooling/archetypes/camel-archetype-scr/pom.xml | 3 + .../src/test/java/__className__Test.java | 3 + .../maven/AbstractApiMethodGeneratorMojo.java | 7 +- .../camel/maven/ApiComponentGeneratorMojo.java | 3 +- .../maven/camel-package-maven-plugin/pom.xml | 53 +- .../camel/maven/packaging/EndpointMojo.java | 471 -------------- .../maven/packaging/PrepareCatalogMojo.java | 370 +++++++++++ .../camel-package-maven-plugin.properties | 3 - .../java/org/apache/camel/spi/UriEndpoint.java | 14 +- .../java/org/apache/camel/spi/UriParam.java | 7 + 296 files changed, 12752 insertions(+), 3696 deletions(-) ----------------------------------------------------------------------
