buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/13989 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
svn commit: r1006058 [1/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache properties.html using-propertyplaceholder.html
Author: buildbot Date: Wed Feb 1 21:20:51 2017 New Revision: 1006058 Log: Production update by buildbot for camel Modified: websites/production/camel/content/book-component-appendix.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/properties.html websites/production/camel/content/using-propertyplaceholder.html Modified: websites/production/camel/content/book-component-appendix.html == --- websites/production/camel/content/book-component-appendix.html (original) +++ websites/production/camel/content/book-component-appendix.html Wed Feb 1 21:20:51 2017 @@ -621,8 +621,8 @@ cometds://localhost:8443/service/mychann When using CXF in streaming modes (see DataFormat option), then also read about Stream caching. -The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services hosted in CXF./**/ div.rbtoc1485973067488 {padding: 0px;} div.rbtoc1485973067488 ul {list-style: disc;margin-left: 0px;} div.rbtoc1485973067488 li {margin-left: 0px;padding-left: 0px;} /**/ - +The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services hosted in CXF./**/ div.rbtoc1485983924092 {padding: 0px;} div.rbtoc1485983924092 ul {list-style: disc;margin-left: 0px;} div.rbtoc1485983924092 li {margin-left: 0px;padding-left: 0px;} /**/ + CXF Component URI formatOptions The descriptions of the dataformats @@ -4611,12 +4611,10 @@ cometds://localhost:8443/service/mychann - From Camel 2.19.0: you can set which location can be discarded if missing by setting optional=true, (false by default). Example: - pc.setLocations("com/mycompany/override.properties;optional=true,com/mycompany/defaults.properties"); @@ -4772,7 +4770,7 @@ cometds://localhost:8443/service/mychann <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> <!-- OSGI blueprint property placeholder --> <cm:property-placeholder id="myblueprint.placeholder" persistent-id="camel.blueprint"> <!-- list some properties as needed --> <cm:default-properties> <cm:property name="result" value="mock:result"/> </cm:default-properties> </cm:property-placeholder> <camelContext xmlns="http://came l.apache.org/schema/blueprint"> <!-- in the route we can use {{ }} placeholders which will lookup in blueprint as Camel will auto detect the OSGi blueprint property placeholder and use it --> <route> <from uri="direct:start"/> <to uri="mock:foo"/> <to uri="{{result}}"/> </route> </camelContext> </blueprint> - By default Camel detects and uses OSGi blueprint property placeholder service. You can disable this by setting the attribute useBlueprintPropertyResolver to false on the camelContext definition. + By default Camel detects and uses OSGi blueprint property placeholder service. You can disable this by setting the attribute useBlueprintPropertyResolver to false on the camelContext definition. About placeholder syntaxes @@ -4784,7 +4782,7 @@ cometds://localhost:8443/service/mychann <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cm="
svn commit: r1006058 [2/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache properties.html using-propertyplaceholder.html
Modified: websites/production/camel/content/properties.html == --- websites/production/camel/content/properties.html (original) +++ websites/production/camel/content/properties.html Wed Feb 1 21:20:51 2017 @@ -96,7 +96,7 @@ where file.uri is the property key.Property placeholders can be used to specify parts, or all, of an endpoint's URI by embedding one or more placeholders in the URI's string definition.FromCamel 2.14.1: you can specify a default value to use if a property with the key does not exists, e.g., file.url:/some/path where the default value is the text after the colon, e.g., /some/path.From Camel 2.14.1: do not use a colon in the property key. The colon character is used as a token separator when providing a default value.UsingPropertyResolverCamel provides a pluggable mechanism that >allows third-parties to specify their own resolver to use for the lookup of >properties.Camel provides a default implementation >org.apache.camel.component.properties.DefaultPropertiesResolver > which is capable of loading properties from the file system, classpath or shape="rect" href="registry.html">Registry. To indicate which source to >use the location must contain the appropriate prefix.The list of >prefixes is:class="confluenceTable">class="confluenceTh">Prefixclass="confluenceTh">Descriptionrowspan="1" class="confluenceTd">ref:rowspan="1" class="confluenceTd">Lookup in the href="registry.html">Registry.rowspan="1" class="confluenceTd">file:Load the from file system.classpath:Load from the classpath (this is also the default if no prefix is provided).blueprint:Use a specific OSGi blueprint placeholder service.Defining LocationThe PropertiesResolver must be configured with the location(s) to use when resolving properties. One or more locations can be given. Specifying multiple locations can be done a couple of ways: using either a single comma separated string, or an array of strings. -From Camel 2.19.0: you can set which location can be discarded if missing by setting optional=true, (false by default).Example: +From Camel 2.19.0: you can set which location can be discarded if missing by setting optional=true, (false by default).Example: Using System and Environment Variables in LocationsAvailable as of Camel 2.7The location now supports using placeholders for JVM system properties and OS environments variables.Example: -By default Camel detects and uses OSGi blueprint property placeholder service. You can disable this by setting the attribute useBlueprintPropertyResolver to false on the camelContext definition.About placeholder syntaxesNotice how we can use the Camel syntax for placeholders{{ }} in the Camel route, which will lookup the value from OSGi blueprint.< br clear="none"> The blueprint syntax for placeholders is ${}. So outside thecamelContext you must use the${} syntax. Where as insidecamelContext you must use{{ }} syntax. OSGi blueprint allows you to configure the syntax, so you can actually align those if you want.You can also explicit refer to a specific OSGi blueprint property placeholder by its id. For that you need to use the Camel'spropertyPlaceholder as shown in the example below: +By default Camel detects and uses OSGi blueprint property placeholder service. You can disable this by setting the attribute useBlueprintPropertyResolver to false on the camelContext definition.About placeholder syntaxesNotice how we can use the Camel syntax for placeholders{{ }} in the Camel route, which will lookup the value from OSGi blueprint. The blueprint syntax for placeholders is < code>${}. So outside thecamelContext you must use the${} syntax. Where as insidecamelContext you must use{{ }} syntax. OSGi blueprint allows you to configure the syntax, so you can actually align those if you want.You can also explicit refer to a specific OSGi blueprint property placeholder by its id. For that you need to use the Camel'spropertyPlaceholder as shown in the example below: http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cm="
[1/2] camel git commit: CAMEL-10775: Add information to components which version they were added to Camel
Repository: camel Updated Branches: refs/heads/master 267f065fb -> 32b42af19 CAMEL-10775: Add information to components which version they were added to Camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40bada55 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40bada55 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40bada55 Branch: refs/heads/master Commit: 40bada551084e76c57cfcffb456bd86324bc8678 Parents: 267f065 Author: Claus IbsenAuthored: Wed Feb 1 13:23:16 2017 +0100 Committer: Claus Ibsen Committed: Wed Feb 1 18:00:51 2017 +0100 -- .../main/java/org/apache/camel/model/dataformat/CsvDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/JaxbDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/JibxDataFormat.java | 2 +- .../main/java/org/apache/camel/model/language/ELExpression.java| 2 +- .../java/org/apache/camel/model/language/JXPathExpression.java | 2 +- .../java/org/apache/camel/model/language/JsonPathExpression.java | 2 +- .../main/java/org/apache/camel/model/language/SqlExpression.java | 2 +- .../main/java/org/apache/camel/component/amqp/AMQPEndpoint.java| 2 +- .../java/org/apache/camel/component/asterisk/AsteriskEndpoint.java | 2 +- .../main/java/org/apache/camel/component/atom/AtomEndpoint.java| 2 +- .../org/apache/camel/component/braintree/BraintreeEndpoint.java| 2 +- .../java/org/apache/camel/component/flatpack/FlatpackEndpoint.java | 2 +- .../java/org/apache/camel/component/ibatis/IBatisEndpoint.java | 2 +- .../org/apache/camel/component/ignite/AbstractIgniteEndpoint.java | 2 +- .../org/apache/camel/component/infinispan/InfinispanEndpoint.java | 2 +- .../main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java| 2 +- .../java/org/apache/camel/component/jcache/JCacheEndpoint.java | 2 +- .../java/org/apache/camel/component/jclouds/JcloudsEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java | 2 +- .../main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java| 2 +- .../java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java | 2 +- .../java/org/apache/camel/component/jgroups/JGroupsEndpoint.java | 2 +- .../org/apache/camel/component/validator/jing/JingEndpoint.java| 2 +- .../main/java/org/apache/camel/component/jira/JIRAEndpoint.java| 2 +- .../src/main/java/org/apache/camel/component/jms/JmsEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java | 2 +- .../main/java/org/apache/camel/component/jolt/JoltEndpoint.java| 2 +- .../src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/scp/ScpEndpoint.java | 2 +- .../main/java/org/apache/camel/component/jt400/Jt400Endpoint.java | 2 +- .../main/java/org/apache/camel/component/kafka/KafkaEndpoint.java | 2 +- .../java/org/apache/camel/component/kestrel/KestrelEndpoint.java | 2 +- .../main/java/org/apache/camel/component/krati/KratiEndpoint.java | 2 +- .../org/apache/camel/component/kubernetes/KubernetesEndpoint.java | 2 +- .../main/java/org/apache/camel/component/ldap/LdapEndpoint.java| 2 +- .../java/org/apache/camel/component/linkedin/LinkedInEndpoint.java | 2 +- .../java/org/apache/camel/component/lucene/LuceneEndpoint.java | 2 +- .../org/apache/camel/component/lumberjack/LumberjackEndpoint.java | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/40bada55/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java -- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java index a8a9b0c..d1052e3 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; /** * CSV data format */ -@Metadata(firstVersion = "1.4.0", label = "dataformat,transformation,csv", title = "CSV") +@Metadata(firstVersion = "1.3.0", label = "dataformat,transformation,csv", title = "CSV") @XmlRootElement(name = "csv") @XmlAccessorType(XmlAccessType.FIELD) public class CsvDataFormat extends DataFormatDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/40bada55/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java -- diff --git
[2/2] camel git commit: CAMEL-10775: Add information to components which version they were added to Camel
CAMEL-10775: Add information to components which version they were added to Camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32b42af1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32b42af1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32b42af1 Branch: refs/heads/master Commit: 32b42af19908611d7115a7d3c07830e28399a257 Parents: 40bada5 Author: Claus IbsenAuthored: Wed Feb 1 19:41:20 2017 +0100 Committer: Claus Ibsen Committed: Wed Feb 1 19:41:20 2017 +0100 -- .../java/org/apache/camel/model/dataformat/ProtobufDataFormat.java | 2 +- .../main/java/org/apache/camel/model/dataformat/RssDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java | 2 +- .../java/org/apache/camel/model/language/JavaScriptExpression.java | 2 +- .../main/java/org/apache/camel/model/language/MvelExpression.java | 2 +- .../main/java/org/apache/camel/model/language/OgnlExpression.java | 2 +- .../main/java/org/apache/camel/model/language/PhpExpression.java | 2 +- .../java/org/apache/camel/model/language/PythonExpression.java | 2 +- .../main/java/org/apache/camel/model/language/RubyExpression.java | 2 +- .../main/java/org/apache/camel/model/language/SpELExpression.java | 2 +- .../java/org/apache/camel/model/language/XQueryExpression.java | 2 +- .../main/java/org/apache/camel/component/mail/MailEndpoint.java| 2 +- .../java/org/apache/camel/component/metrics/MetricsEndpoint.java | 2 +- .../main/java/org/apache/camel/component/mina/MinaEndpoint.java| 2 +- .../main/java/org/apache/camel/component/mina2/Mina2Endpoint.java | 2 +- .../main/java/org/apache/camel/component/mllp/MllpEndpoint.java| 2 +- .../java/org/apache/camel/component/mongodb/MongoDbEndpoint.java | 2 +- .../main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java| 2 +- .../java/org/apache/camel/component/validator/msv/MsvEndpoint.java | 2 +- .../java/org/apache/camel/component/mustache/MustacheEndpoint.java | 2 +- .../main/java/org/apache/camel/component/mvel/MvelEndpoint.java| 2 +- .../java/org/apache/camel/component/mybatis/MyBatisEndpoint.java | 2 +- .../java/org/apache/camel/component/nagios/NagiosEndpoint.java | 2 +- .../main/java/org/apache/camel/component/nats/NatsEndpoint.java| 2 +- .../org/apache/camel/component/netty/http/NettyHttpEndpoint.java | 2 +- .../main/java/org/apache/camel/component/netty/NettyEndpoint.java | 2 +- .../org/apache/camel/component/netty4/http/NettyHttpEndpoint.java | 2 +- .../main/java/org/apache/camel/component/netty4/NettyEndpoint.java | 2 +- .../java/org/apache/camel/component/olingo2/Olingo2Endpoint.java | 2 +- .../org/apache/camel/component/openshift/OpenShiftEndpoint.java| 2 +- .../apache/camel/component/optaplanner/OptaPlannerEndpoint.java| 2 +- .../main/java/org/apache/camel/component/paho/PahoEndpoint.java| 2 +- .../org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java | 2 +- .../java/org/apache/camel/component/pgevent/PgEventEndpoint.java | 2 +- .../java/org/apache/camel/component/printer/PrinterEndpoint.java | 2 +- .../java/org/apache/camel/component/quartz/QuartzEndpoint.java | 2 +- .../java/org/apache/camel/component/quartz2/QuartzEndpoint.java| 2 +- .../org/apache/camel/component/quickfixj/QuickfixjEndpoint.java| 2 +- .../java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 2 +- .../java/org/apache/camel/component/restlet/RestletEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java | 2 +- .../java/org/apache/camel/component/routebox/RouteboxEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/rss/RssEndpoint.java | 2 +- .../org/apache/camel/component/salesforce/SalesforceEndpoint.java | 2 +- .../apache/camel/component/sap/netweaver/NetWeaverEndpoint.java| 2 +- .../java/org/apache/camel/component/xquery/XQueryEndpoint.java | 2 +- .../org/apache/camel/component/schematron/SchematronEndpoint.java | 2 +- .../org/apache/camel/component/servicenow/ServiceNowEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/sip/SipEndpoint.java | 2 +- .../main/java/org/apache/camel/component/sjms/SjmsEndpoint.java| 2 +- .../org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java | 2 +- .../main/java/org/apache/camel/component/slack/SlackEndpoint.java | 2 +- .../main/java/org/apache/camel/component/smpp/SmppEndpoint.java| 2 +- .../main/java/org/apache/camel/component/snmp/SnmpEndpoint.java| 2 +- .../main/java/org/apache/camel/component/solr/SolrEndpoint.java| 2 +- .../java/org/apache/camel/component/sparkrest/SparkEndpoint.java | 2 +-
svn commit: r1006044 [2/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache properties.html using-propertyplaceholder.html
Modified: websites/production/camel/content/properties.html == --- websites/production/camel/content/properties.html (original) +++ websites/production/camel/content/properties.html Wed Feb 1 18:19:58 2017 @@ -91,26 +91,26 @@ ]]> Where key is the key for the property to be looked up.Options NameTypeDefaultDescriptioncachebooleantrueWhether or not to cache loaded properties.encodingStringnullCamel 2.14.3/2.15.1: To use a specific charset to load the properties, such as UTF-8. By defaultISO-8859-1 (latin1) is used.fallbackToUnaugmentedPropertybooleantrueCamel 2.9 If true, first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified.If false, only the augmented property name is searched.defaultFallbackEnabledbooleantrueCamel 2.19 If false the component does not attempt to find a default for the key by looking after the colon separator.ignoreMissingLocationbooleanfalseCamel 2.10: Whether to silently ignore if a location cannot be located, such as a properties file not found.locationsStringnullA lis t of locations to load properties. You can use comma to separate multiple locations. This option will override any default locations and only use the locations from this option.prefixTokenString{{Camel 2.9 The token to indicate the beginning of a property token.propertyPrefixStringnullCamel 2.9 Optional prefix prepended to property names before resolution. propertySuffixStringnullCamel 2.9 Optional suffix appended to property names before resolution.suffixTokenString}}Camel 2.9 The token to indicate the end of a property token.systemPropertiesModeint2Camel 2.16 The mode to use for whether to resolve and use system properties:0= never - JVM system properties are never used.1= fallback - JVM system properties are only used as fallback if no regular property with the key exists.2= override - JVM system properties are used if exists, otherwise the regular property will be used.Note: when bridging to Spring's property placeholder using org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer the configuration on BridgePropertyPlaceholderConfigurer will take precedence over the configuration on the PropertiesComponent. -Resolving property from Java codeYou can use the method resolvePropertyPlaceholders on the CamelContext to resolve a property from any Java code.UsingPropertyPlaceholderAvailable as of Camel 2.3Camel now provides a new PropertiesComponent in camel-core which allows you to use property placeholders when defining Camel Endpoint URIs. This works much like you would do if using Spring's property-placeholder tag. However Spring has a l imitation that prevents 3rd party frameworks from fully leveraging Spring property placeholders.For more details see: How do I use Spring Property Placeholder with Camel XML.Bridging Spring and Camel property placeholdersFrom Camel 2.10: Spring's property placeholder can be bridged with Camel's. See below for more details.The property placeholder is generally in use when doing any of the following:lookup or creating endpoints.lookup of beans in the Registry.additional supported in Spring XML (see below in examples).< li>using BlueprintPropertyPlaceholder with Camel Properties component.using @PropertyInject to inject a property in a POJO.Camel 2.14.1 Using default value if a property does not exists.Camel 2.14.1 Include out of the box functions, to lookup property values from OS environment variables, JVM system properties, or the service idiom.Camel 2.14.1 Using custom functions, which can be plugged into the property component.SyntaxThe syntax to use Camel's property placeholder is to use {{key}} for example {{file.uri}} where file.uri is the property key. You can use property placeholders in parts of the endpoint URI's which for example you can use placeholders for pa rameters in the URIs.FromCamel 2.14.1: you can specify a default value to use if a property with the key does not exists, e.g., file.url:/some/path where the default value is the text after the colon, e.g., /some/path.From Camel 2.14.1: do not use a colon in the property key. The colon character is used as a token separator when providing a default value.UsingPropertyResolverCamel provides a pluggable mechanism which allows 3rd part to provide their own resolver to lookup properties. Camel provides a default implementation org.apache.camel.co mponent.properties.DefaultPropertiesResolver which is capable of loading properties from the file system, classpath or Registry. You can prefix the locations with either:ref: Camel 2.4: to lookup in the Registry.file: to load the from file system.classpath: to load from classpath (this is also the default if no prefix is provided).blueprint: Camel 2.7: to use a specific OSGi blueprint placeholder service.Defining
svn commit: r1006044 [1/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache properties.html using-propertyplaceholder.html
Author: buildbot Date: Wed Feb 1 18:19:58 2017 New Revision: 1006044 Log: Production update by buildbot for camel Modified: websites/production/camel/content/book-component-appendix.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/properties.html websites/production/camel/content/using-propertyplaceholder.html Modified: websites/production/camel/content/book-component-appendix.html == --- websites/production/camel/content/book-component-appendix.html (original) +++ websites/production/camel/content/book-component-appendix.html Wed Feb 1 18:19:58 2017 @@ -621,8 +621,8 @@ cometds://localhost:8443/service/mychann When using CXF in streaming modes (see DataFormat option), then also read about Stream caching. -The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services hosted in CXF./**/ div.rbtoc1485818260800 {padding: 0px;} div.rbtoc1485818260800 ul {list-style: disc;margin-left: 0px;} div.rbtoc1485818260800 li {margin-left: 0px;padding-left: 0px;} /**/ - +The cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services hosted in CXF./**/ div.rbtoc1485973067488 {padding: 0px;} div.rbtoc1485973067488 ul {list-style: disc;margin-left: 0px;} div.rbtoc1485973067488 li {margin-left: 0px;padding-left: 0px;} /**/ + CXF Component URI formatOptions The descriptions of the dataformats @@ -4582,38 +4582,44 @@ cometds://localhost:8443/service/mychann You can use the method resolvePropertyPlaceholders on the CamelContext to resolve a property from any Java code. -UsingPropertyPlaceholderAvailable as of Camel 2.3Camel now provides a new PropertiesComponent in camel-core which allows you to use property placeholders when defining Camel Endpoint URIs. This works much like you would do if using Spring's property-placeholder tag. However Spring has a limitation that prevents 3rd party frameworks from fully leveraging Spring property placeholders.For more details see: How do I use Spring Property Placeholder with Camel XML. +UsingPropertyPlaceholderAvailable as of Camel 2.3Camel now provides a new PropertiesComponent incamel-core which allows you to use property placeholders when defining Camel Endpoint URIs. This works much like you would do if using Spring's property-placeholder tag. However Spring has a limitation that prevents third-party frameworks from fully leveraging Spring property placeholders.For more details see: How do I use Spring Property Placeholder with Camel XML. Bridging Spring and Camel property placeholders From Camel 2.10: Spring's property placeholder can be bridged with Camel's. See below for more details. - The property placeholder is generally in use when doing any of the following: - lookup or creating endpoints.lookup of beans in the Registry.additional supported in Spring XML (see below in examples).using BlueprintPropertyPlaceholder with Camel Properties component.using @PropertyInject to inject a property in a POJO.Camel 2.14.1 Using default value if a property does not exists.Camel 2.14.1 Include out of the box functions, to lookup property values from OS environment variables, JVM system properties, or the service idiom.Camel 2.14.1 Using custom functions, which can be plugged into the property component.SyntaxThe syntax to use Camel's property placeholder is to use {{key}} for example {{file.uri}} where file.uri is the property key. You can use property placeholders in parts of the endpoint URI's which for example you can use placeholders for parameters in the URIs.FromCamel 2.14.1: you can specify a default value to use if a property with the key does not exists, e.g., file.url:/some/path where the default value is the text after the colon, e.g., /some/path. + The property placeholder is typically used when trying to do any of the following: + Lookup or creating endpoints.Lookup of beans in the Registry.Additional supported in Spring XML (see below in examples).Using BlueprintPropertyPlaceholder with Camel Properties component.Using @PropertyInject to inject a property in a POJO.Camel 2.14.1 Using default value if a property does not exists.Camel 2.14.1 Include out of the box functions, to lookup property values from OS environment variables, JVM system properties, or the service idiom.Camel 2.14.1 Using custom functions, which can be plugged into the property component.FormatThe value of a Camel property can be obtained by specifying its key name within a property placeholder, usi ng the following format: {{key}}.For example: + + + {{file.uri}} + + where file.uri is the property key.Property placeholders can be used to specify parts, or all, of an
camel git commit: CAMEL-10612: adding Publisher types for bean call
Repository: camel Updated Branches: refs/heads/master e16315825 -> 267f065fb CAMEL-10612: adding Publisher types for bean call Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/267f065f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/267f065f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/267f065f Branch: refs/heads/master Commit: 267f065fb9640a95164404795a3094d978e313cd Parents: e163158 Author: Nicola FerraroAuthored: Wed Feb 1 16:47:56 2017 +0100 Committer: Nicola Ferraro Committed: Wed Feb 1 16:48:09 2017 +0100 -- .../streams/ReactiveStreamsConverter.java | 62 .../reactive/streams/util/MonoPublisher.java| 64 .../streams/util/UnwrappingStreamProcessor.java | 78 ++ .../services/org/apache/camel/TypeConverter | 18 +++ .../reactive/streams/BeanCallTest.java | 148 +++ 5 files changed, 370 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/267f065f/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsConverter.java -- diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsConverter.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsConverter.java new file mode 100644 index 000..23f49c9 --- /dev/null +++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsConverter.java @@ -0,0 +1,62 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.reactive.streams; + +import org.apache.camel.AsyncCallback; +import org.apache.camel.AsyncProcessor; +import org.apache.camel.CamelContext; +import org.apache.camel.CamelContextAware; +import org.apache.camel.Converter; +import org.apache.camel.Exchange; +import org.apache.camel.FallbackConverter; +import org.apache.camel.Processor; +import org.apache.camel.component.bean.BeanInfo; +import org.apache.camel.component.bean.BeanProcessor; +import org.apache.camel.component.bean.ConstantBeanHolder; +import org.apache.camel.component.reactive.streams.util.MonoPublisher; +import org.apache.camel.component.reactive.streams.util.UnwrappingStreamProcessor; +import org.apache.camel.spi.TypeConverterRegistry; +import org.apache.camel.util.AsyncProcessorHelper; +import org.reactivestreams.Publisher; + + +@Converter +public final class ReactiveStreamsConverter implements CamelContextAware { + +private CamelContext camelContext; + +public ReactiveStreamsConverter() { +} + +@FallbackConverter +public Object convertToPublisher(Class type, Exchange exchange, Object value, TypeConverterRegistry registry) { +if (type.isAssignableFrom(Publisher.class)) { +return new MonoPublisher<>(value); +} +return null; +} + +@Override +public CamelContext getCamelContext() { +return camelContext; +} + +@Override +public void setCamelContext(CamelContext camelContext) { +this.camelContext = camelContext; +} +} http://git-wip-us.apache.org/repos/asf/camel/blob/267f065f/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/MonoPublisher.java -- diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/MonoPublisher.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/MonoPublisher.java new file mode 100644 index 000..d0be491 --- /dev/null +++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/MonoPublisher.java @@ -0,0 +1,64 @@ +/** + * Licensed to the Apache Software Foundation (ASF)
camel git commit: Fixed camel-http4 tests
Repository: camel Updated Branches: refs/heads/master e93b5b400 -> e16315825 Fixed camel-http4 tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e1631582 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e1631582 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e1631582 Branch: refs/heads/master Commit: e16315825770a93cb6a68322ec2f13fc3a67ae7c Parents: e93b5b4 Author: Andrea CosentinoAuthored: Wed Feb 1 15:51:05 2017 +0100 Committer: Andrea Cosentino Committed: Wed Feb 1 15:51:38 2017 +0100 -- .../org/apache/camel/component/http4/HttpMethodsTest.java| 8 .../camel/component/http4/HttpProducerContentTypeTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e1631582/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java -- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java index f9c7a5b..a65371d 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java @@ -96,11 +96,11 @@ public class HttpMethodsTest extends BaseHttpTest { Message out = exchange.getOut(); Map headers = out.getHeaders(); -assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, headers.get(Exchange.HTTP_RESPONSE_CODE)); -assertEquals("Not Implemented", headers.get(Exchange.HTTP_RESPONSE_TEXT)); -assertEquals("26", headers.get("Content-Length")); +assertEquals(HttpStatus.SC_OK, headers.get(Exchange.HTTP_RESPONSE_CODE)); +assertEquals("OK", headers.get(Exchange.HTTP_RESPONSE_TEXT)); +assertEquals("12", headers.get("Content-Length")); assertNotNull("Should have Content-Type header", headers.get("Content-Type")); -assertEquals("PATCH method not supported", out.getBody(String.class)); +assertEquals("camel rocks!", out.getBody(String.class)); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/e1631582/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java -- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java index e252595..f1575da 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java @@ -36,7 +36,7 @@ import org.junit.Test; public class HttpProducerContentTypeTest extends BaseHttpTest { -private static final String CONTENT_TYPE = "multipart/form-data;boundary=---j2radvtrk"; +private static final String CONTENT_TYPE = "multipart/form-data boundary=---j2radvtrk"; private HttpServer localServer;
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 3e36dfe3f -> e93b5b400 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e93b5b40 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e93b5b40 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e93b5b40 Branch: refs/heads/master Commit: e93b5b400eb27406893456575c3725e478dc9fe5 Parents: 3e36dfe Author: lburgazzoliAuthored: Wed Feb 1 14:00:52 2017 +0100 Committer: lburgazzoli Committed: Wed Feb 1 14:01:28 2017 +0100 -- .../component/chronicle/engine/ChronicleEngineEndpoint.java | 8 +++- .../camel/component/google/mail/GoogleMailEndpoint.java | 9 - .../java/org/apache/camel/component/irc/IrcEndpoint.java| 9 - .../org/apache/camel/maven/connector/ConnectorMojo.java | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e93b5b40/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java -- diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java index d2b4491..7735ac0 100644 --- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java +++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java @@ -30,7 +30,13 @@ import org.apache.camel.spi.UriPath; /** * The camel chronicle-engine component let you leverage the power of OpenHFT's https://github.com/OpenHFT/Chronicle-Engine;>Chronicle-Engine. */ -@UriEndpoint(firstVersion = "2.18.0", scheme = "chronicle-engine", title = "Chronicle Engine", syntax = "chronicle-engine:addresses/path", consumerClass = ChronicleEngineConsumer.class, label = "datagrid,cache") +@UriEndpoint( +firstVersion = "2.18.0", +scheme = "chronicle-engine", +title = "Chronicle Engine", +syntax = "chronicle-engine:addresses/path", +consumerClass = ChronicleEngineConsumer.class, +label = "datagrid,cache") public class ChronicleEngineEndpoint extends DefaultEndpoint { @UriPath(description = "Engine addresses. Multiple addresses can be separated by comman.") http://git-wip-us.apache.org/repos/asf/camel/blob/e93b5b40/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java -- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java index ba83671..5e32c2b 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java @@ -36,7 +36,14 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper; /** * The google-mail component provides access to Google Mail. */ -@UriEndpoint(firstVersion = "2.15.0", scheme = "google-mail", title = "Google Mail", syntax = "google-mail:apiName/methodName", consumerClass = GoogleMailConsumer.class, consumerPrefix = "consumer", label = "api,cloud,mail") +@UriEndpoint( +firstVersion = "2.15.0", +scheme = "google-mail", +title = "Google Mail", +syntax = "google-mail:apiName/methodName", +consumerClass = GoogleMailConsumer.class, +consumerPrefix = "consumer", +label = "api,cloud,mail") public class GoogleMailEndpoint extends AbstractApiEndpoint { // TODO create and manage API proxy http://git-wip-us.apache.org/repos/asf/camel/blob/e93b5b40/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java -- diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java index a057979..9572a63 100644 --- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java +++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java @@ -34,7 +34,14 @@ import org.slf4j.LoggerFactory; /** * The irc component implements an https://en.wikipedia.org/wiki/Internet_Relay_Chat;>IRC (Internet Relay
[2/2] camel git commit: Upgrade Http Core to version 4.4.6
Upgrade Http Core to version 4.4.6 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/018bef8a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/018bef8a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/018bef8a Branch: refs/heads/master Commit: 018bef8a193864beb87a7b404129a744c07841b0 Parents: 2de6d90 Author: Andrea CosentinoAuthored: Wed Feb 1 11:55:56 2017 +0100 Committer: Andrea Cosentino Committed: Wed Feb 1 12:45:20 2017 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/018bef8a/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 32d1fb0..7b66736 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -259,7 +259,7 @@ 2.23_1 3.1.0-incubating 1.7 -4.4.4 +4.4.6 4.5.3 4.1.2 3.1
[1/2] camel git commit: Regen code
Repository: camel Updated Branches: refs/heads/master 2de6d9079 -> 3e36dfe3f Regen code Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e36dfe3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e36dfe3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e36dfe3 Branch: refs/heads/master Commit: 3e36dfe3f9e744836a85400c1fb171f30cee5eda Parents: 018bef8 Author: Andrea CosentinoAuthored: Wed Feb 1 12:44:06 2017 +0100 Committer: Andrea Cosentino Committed: Wed Feb 1 12:45:20 2017 +0100 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3e36dfe3/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index ab4ab47..daf5298 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -2805,7 +2805,7 @@ org.apache.httpcomponents httpcore-nio -4.4.4 +4.4.6 org.apache.kafka
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master e3ec108c8 -> 2de6d9079 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2de6d907 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2de6d907 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2de6d907 Branch: refs/heads/master Commit: 2de6d9079fc81a510e63f902688a64a46c2b0aa9 Parents: e3ec108 Author: lburgazzoliAuthored: Wed Feb 1 12:31:54 2017 +0100 Committer: lburgazzoli Committed: Wed Feb 1 12:31:54 2017 +0100 -- .../camel/test/blueprint/cloud/ServiceCallFilterTest.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2de6d907/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java -- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java index 5c2a505..e5732ec 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java @@ -28,11 +28,17 @@ public class ServiceCallFilterTest extends CamelBlueprintTestSupport { public void testServiceFilter() throws Exception { Exchange result; -result = template.request("direct:start", e -> { return; } ); +result = template.request("direct:start", e -> { +return; +}); + assertHeader(result, ServiceCallConstants.SERVICE_HOST, "host1"); assertHeader(result, ServiceCallConstants.SERVICE_PORT, 9093); -result = template.request("direct:start", e -> { return; } ); +result = template.request("direct:start", e -> { +return; +}); + assertHeader(result, ServiceCallConstants.SERVICE_HOST, "host4"); assertHeader(result, ServiceCallConstants.SERVICE_PORT, 9094); }
[2/2] camel git commit: CAMEL-10775: Add information to components which version they were added to Camel
CAMEL-10775: Add information to components which version they were added to Camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3ec108c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3ec108c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3ec108c Branch: refs/heads/master Commit: e3ec108c871058c840f99a7fcfd06d8807b6da85 Parents: c0a9f5c Author: Claus IbsenAuthored: Wed Feb 1 12:09:22 2017 +0100 Committer: Claus Ibsen Committed: Wed Feb 1 12:09:45 2017 +0100 -- .../java/org/apache/camel/model/dataformat/AvroDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/BarcodeDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/Base64DataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/BeanioDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/BindyDataFormat.java| 2 +- .../java/org/apache/camel/model/dataformat/BoonDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/CastorDataFormat.java | 2 +- .../main/java/org/apache/camel/model/dataformat/CsvDataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/FlatpackDataFormat.java | 2 +- .../main/java/org/apache/camel/model/dataformat/HL7DataFormat.java | 2 +- .../java/org/apache/camel/model/dataformat/IcalDataFormat.java | 2 +- .../org/apache/camel/model/dataformat/JacksonXMLDataFormat.java| 2 +- .../java/org/apache/camel/model/language/GroovyExpression.java | 2 +- .../main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java| 2 +- .../src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java | 2 +- .../main/java/org/apache/camel/component/amqp/AMQPEndpoint.java| 2 +- .../main/java/org/apache/camel/component/apns/ApnsEndpoint.java| 2 +- .../java/org/apache/camel/component/asterisk/AsteriskEndpoint.java | 2 +- .../main/java/org/apache/camel/component/atmos/AtmosEndpoint.java | 2 +- .../camel/component/atmosphere/websocket/WebsocketEndpoint.java| 2 +- .../main/java/org/apache/camel/component/atom/AtomEndpoint.java| 2 +- .../main/java/org/apache/camel/component/avro/AvroEndpoint.java| 2 +- .../camel/component/bean/validator/BeanValidatorEndpoint.java | 2 +- .../org/apache/camel/component/beanstalk/BeanstalkEndpoint.java| 2 +- .../src/main/java/org/apache/camel/component/box/BoxEndpoint.java | 2 +- .../org/apache/camel/component/braintree/BraintreeEndpoint.java| 2 +- .../main/java/org/apache/camel/component/cache/CacheEndpoint.java | 2 +- .../org/apache/camel/component/cassandra/CassandraEndpoint.java| 2 +- .../camel/component/chronicle/engine/ChronicleEngineEndpoint.java | 2 +- .../main/java/org/apache/camel/component/chunk/ChunkEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/cm/CMEndpoint.java| 2 +- .../main/java/org/apache/camel/component/cmis/CMISEndpoint.java| 2 +- .../src/main/java/org/apache/camel/coap/CoAPEndpoint.java | 2 +- .../java/org/apache/camel/component/cometd/CometdEndpoint.java | 2 +- .../java/org/apache/camel/component/consul/ConsulEndpoint.java | 2 +- .../java/org/apache/camel/component/context/ContextEndpoint.java | 2 +- .../org/apache/camel/component/couchbase/CouchbaseEndpoint.java| 2 +- .../java/org/apache/camel/component/couchdb/CouchDbEndpoint.java | 2 +- .../apache/camel/component/crypto/DigitalSignatureEndpoint.java| 2 +- .../src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 2 +- .../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 2 +- .../org/apache/camel/component/disruptor/DisruptorEndpoint.java| 2 +- .../src/main/java/org/apache/camel/component/dns/DnsEndpoint.java | 2 +- .../java/org/apache/camel/component/docker/DockerEndpoint.java | 2 +- .../main/java/org/apache/camel/component/dozer/DozerEndpoint.java | 2 +- .../main/java/org/apache/camel/component/drill/DrillEndpoint.java | 2 +- .../java/org/apache/camel/component/dropbox/DropboxEndpoint.java | 2 +- .../java/org/apache/camel/component/ehcache/EhcacheEndpoint.java | 2 +- .../camel/component/elasticsearch/ElasticsearchEndpoint.java | 2 +- .../main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java | 2 +- .../java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java | 2 +- .../org/apache/camel/component/eventadmin/EventAdminEndpoint.java | 2 +- .../main/java/org/apache/camel/component/exec/ExecEndpoint.java| 2 +- .../java/org/apache/camel/component/facebook/FacebookEndpoint.java | 2 +- .../java/org/apache/camel/component/flatpack/FlatpackEndpoint.java | 2 +- .../main/java/org/apache/camel/component/flink/FlinkEndpoint.java | 2 +- .../src/main/java/org/apache/camel/component/fop/FopEndpoint.java | 2 +-
[1/2] camel git commit: CAMEL-10775: Add information to components which version they were added to Camel
Repository: camel Updated Branches: refs/heads/master c0a9f5cd4 -> e3ec108c8 http://git-wip-us.apache.org/repos/asf/camel/blob/e3ec108c/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java -- diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java index f72960f..6258813 100644 --- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java +++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraEndpoint.java @@ -28,7 +28,7 @@ import org.apache.gora.store.DataStore; /** * The gora component allows you to work with NoSQL databases using the Apache Gora framework. */ -@UriEndpoint(scheme = "gora", title = "Gora", syntax = "gora:name", consumerClass = GoraConsumer.class, label = "database,hadoop,nosql") +@UriEndpoint(firstVersion = "2.14.0", scheme = "gora", title = "Gora", syntax = "gora:name", consumerClass = GoraConsumer.class, label = "database,hadoop,nosql") public class GoraEndpoint extends DefaultEndpoint { /** http://git-wip-us.apache.org/repos/asf/camel/blob/e3ec108c/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java -- diff --git a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java index 74f1325..3ecf6eb 100644 --- a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java +++ b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpoint.java @@ -32,7 +32,7 @@ import org.apache.camel.util.CamelContextHelper; /** * The guava-eventbus component provides integration bridge between Camel and Google Guava EventBus. */ -@UriEndpoint(scheme = "guava-eventbus", title = "Guava EventBus", syntax = "guava-eventbus:eventBusRef", consumerClass = GuavaEventBusConsumer.class, label = "eventbus") +@UriEndpoint(firstVersion = "2.10.0", scheme = "guava-eventbus", title = "Guava EventBus", syntax = "guava-eventbus:eventBusRef", consumerClass = GuavaEventBusConsumer.class, label = "eventbus") public class GuavaEventBusEndpoint extends DefaultEndpoint implements MultipleConsumersSupport { private EventBus eventBus; http://git-wip-us.apache.org/repos/asf/camel/blob/e3ec108c/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java -- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java index 63b0ac7..67fcf8d 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java @@ -31,7 +31,7 @@ import org.apache.camel.spi.UriPath; /** * The hazelcast component allows you to work with the Hazelcast distributed data grid / cache. */ -@UriEndpoint(scheme = "hazelcast", title = "Hazelcast", syntax = "hazelcast:command:cacheName", consumerClass = HazelcastDefaultConsumer.class, label = "cache,datagrid") +@UriEndpoint(firstVersion = "2.7.0", scheme = "hazelcast", title = "Hazelcast", syntax = "hazelcast:command:cacheName", consumerClass = HazelcastDefaultConsumer.class, label = "cache,datagrid") public abstract class HazelcastDefaultEndpoint extends DefaultEndpoint { @UriPath @Metadata(required = "true") http://git-wip-us.apache.org/repos/asf/camel/blob/e3ec108c/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java -- diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java index 81bfe7f..a17202c 100644 --- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java +++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseEndpoint.java @@ -43,7 +43,7 @@ import org.apache.hadoop.security.UserGroupInformation; /** * For reading/writing from/to an HBase store (Hadoop database). */ -@UriEndpoint(scheme = "hbase", title = "HBase", syntax = "hbase:tableName", consumerClass = HBaseConsumer.class, label = "hadoop")
[3/3] camel git commit: CAMEL-10542: DataFormat from registry is used for every dataformat operation (marshal/unmarshal)
CAMEL-10542: DataFormat from registry is used for every dataformat operation (marshal/unmarshal) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0a9f5cd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0a9f5cd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0a9f5cd Branch: refs/heads/master Commit: c0a9f5cd494a361c081ded85c5b23f4c903a78a3 Parents: d4c4a84 Author: lburgazzoliAuthored: Fri Dec 2 17:38:55 2016 +0100 Committer: lburgazzoli Committed: Wed Feb 1 11:38:35 2017 +0100 -- .../java/org/apache/camel/CamelContext.java | 8 +++ .../dataformat/DataFormatComponent.java | 6 ++ .../dataformat/DataFormatEndpoint.java | 22 +++--- .../apache/camel/impl/DefaultCamelContext.java | 11 +++ .../camel/impl/DefaultDataFormatResolver.java | 70 ++-- .../org/apache/camel/impl/osgi/Activator.java | 12 .../camel/model/DataFormatDefinition.java | 2 +- .../org/apache/camel/spi/DataFormatFactory.java | 31 + .../apache/camel/spi/DataFormatResolver.java| 9 ++- .../org/apache/camel/util/ResolverHelper.java | 19 ++ .../camel/processor/DataFormatFactoryTest.java | 53 +++ .../blueprint/BlueprintDataFormatResolver.java | 33 ++--- .../camel/core/osgi/OsgiDataFormatResolver.java | 45 + .../csv/CsvDataFormatCustomFactoryTest.java | 58 .../csv/CsvDataFormatResourceFactoryTest.java | 57 .../dataformat/csv/MyCsvDataFormatFactory.java | 37 +++ .../CsvDataFormatCustomFactoryTest-context.xml | 46 + ...CsvDataFormatResourceFactoryTest-context.xml | 44 .../AvroDataFormatAutoConfiguration.java| 48 +- .../BarcodeDataFormatAutoConfiguration.java | 49 -- .../Base64DataFormatAutoConfiguration.java | 49 -- .../BeanIODataFormatAutoConfiguration.java | 49 -- .../BindyCsvDataFormatAutoConfiguration.java| 49 -- ...yFixedLengthDataFormatAutoConfiguration.java | 51 -- ...KeyValuePairDataFormatAutoConfiguration.java | 51 -- .../BoonDataFormatAutoConfiguration.java| 48 +- .../CastorDataFormatAutoConfiguration.java | 49 -- .../GzipDataFormatAutoConfiguration.java| 48 +- ...erializationDataFormatAutoConfiguration.java | 51 -- .../StringDataFormatAutoConfiguration.java | 49 -- .../ZipDataFormatAutoConfiguration.java | 48 +- .../CryptoDataFormatAutoConfiguration.java | 49 -- .../PGPDataFormatAutoConfiguration.java | 48 +- .../CsvDataFormatAutoConfiguration.java | 48 +- .../FlatpackDataFormatAutoConfiguration.java| 49 -- .../GsonDataFormatAutoConfiguration.java| 48 +- .../HessianDataFormatAutoConfiguration.java | 49 -- .../HL7DataFormatAutoConfiguration.java | 48 +- .../ICalDataFormatAutoConfiguration.java| 48 +- .../JacksonDataFormatAutoConfiguration.java | 49 -- .../JacksonXMLDataFormatAutoConfiguration.java | 50 -- .../JaxbDataFormatAutoConfiguration.java| 48 +- .../JibxDataFormatAutoConfiguration.java| 48 +- .../JohnzonDataFormatAutoConfiguration.java | 49 -- .../LZFDataFormatAutoConfiguration.java | 48 +- ...imeMultipartDataFormatAutoConfiguration.java | 51 -- .../ProtobufDataFormatAutoConfiguration.java| 49 -- .../RssDataFormatAutoConfiguration.java | 48 +- .../SnakeYAMLDataFormatAutoConfiguration.java | 49 -- .../SoapJaxbDataFormatAutoConfiguration.java| 49 -- .../SyslogDataFormatAutoConfiguration.java | 49 -- .../TidyMarkupDataFormatAutoConfiguration.java | 50 -- .../TarFileDataFormatAutoConfiguration.java | 49 -- ...UniVocityCsvDataFormatAutoConfiguration.java | 50 -- ...tyFixedWidthDataFormatAutoConfiguration.java | 51 -- ...UniVocityTsvDataFormatAutoConfiguration.java | 50 -- .../XmlBeansDataFormatAutoConfiguration.java| 49 -- .../XmlJsonDataFormatAutoConfiguration.java | 49 -- .../XmlRpcDataFormatAutoConfiguration.java | 49 -- .../XMLSecurityDataFormatAutoConfiguration.java | 50 -- .../JsonDataFormatAutoConfiguration.java| 48 +- .../XStreamDataFormatAutoConfiguration.java | 49 -- .../ZipFileDataFormatAutoConfiguration.java | 49 -- .../SpringBootAutoConfigurationMojo.java
[1/3] camel git commit: CAMEL-10542: DataFormat from registry is used for every dataformat operation (marshal/unmarshal)
Repository: camel Updated Branches: refs/heads/master d4c4a84f5 -> c0a9f5cd4 http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java index 72f025e..417d610 100644 --- a/platforms/spring-boot/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.protobuf.ProtobufDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(ProtobufDataFormatConfiguration.class) public class ProtobufDataFormatAutoConfiguration { -@Bean(name = "protobuf-dataformat") -@Scope("prototype") +@Bean(name = "protobuf-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ProtobufDataFormat.class) -public ProtobufDataFormat configureProtobufDataFormat( -CamelContext camelContext, -ProtobufDataFormatConfiguration configuration) throws Exception { -ProtobufDataFormat dataformat = new ProtobufDataFormat(); -if (CamelContextAware.class.isAssignableFrom(ProtobufDataFormat.class)) { -CamelContextAware contextAware = CamelContextAware.class -.cast(dataformat); -if (contextAware != null) { -contextAware.setCamelContext(camelContext); +public DataFormatFactory configureProtobufDataFormatFactory( +final CamelContext camelContext, +final ProtobufDataFormatConfiguration configuration) { +return new DataFormatFactory() { +public DataFormat newInstance() { +ProtobufDataFormat dataformat = new ProtobufDataFormat(); +if (CamelContextAware.class +.isAssignableFrom(ProtobufDataFormat.class)) { +CamelContextAware contextAware = CamelContextAware.class +.cast(dataformat); +if (contextAware != null) { +contextAware.setCamelContext(camelContext); +} +} +try { +Mapparameters = new HashMap<>(); +IntrospectionSupport.getProperties(configuration, +parameters, null, false); +IntrospectionSupport.setProperties(camelContext, +camelContext.getTypeConverter(), dataformat, +parameters); +} catch (Exception e) { +throw new RuntimeCamelException(e); +} +return dataformat; } -} -Map parameters = new HashMap<>(); -IntrospectionSupport.getProperties(configuration, parameters, null, -false); -IntrospectionSupport.setProperties(camelContext, -camelContext.getTypeConverter(), dataformat, parameters); -return dataformat; +}; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java
[2/3] camel git commit: CAMEL-10542: DataFormat from registry is used for every dataformat operation (marshal/unmarshal)
http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java index 91b952c..81c052e 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.GzipDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(GzipDataFormatConfiguration.class) public class GzipDataFormatAutoConfiguration { -@Bean(name = "gzip-dataformat") -@Scope("prototype") +@Bean(name = "gzip-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GzipDataFormat.class) -public GzipDataFormat configureGzipDataFormat(CamelContext camelContext, -GzipDataFormatConfiguration configuration) throws Exception { -GzipDataFormat dataformat = new GzipDataFormat(); -if (CamelContextAware.class.isAssignableFrom(GzipDataFormat.class)) { -CamelContextAware contextAware = CamelContextAware.class -.cast(dataformat); -if (contextAware != null) { -contextAware.setCamelContext(camelContext); +public DataFormatFactory configureGzipDataFormatFactory( +final CamelContext camelContext, +final GzipDataFormatConfiguration configuration) { +return new DataFormatFactory() { +public DataFormat newInstance() { +GzipDataFormat dataformat = new GzipDataFormat(); +if (CamelContextAware.class +.isAssignableFrom(GzipDataFormat.class)) { +CamelContextAware contextAware = CamelContextAware.class +.cast(dataformat); +if (contextAware != null) { +contextAware.setCamelContext(camelContext); +} +} +try { +Mapparameters = new HashMap<>(); +IntrospectionSupport.getProperties(configuration, +parameters, null, false); +IntrospectionSupport.setProperties(camelContext, +camelContext.getTypeConverter(), dataformat, +parameters); +} catch (Exception e) { +throw new RuntimeCamelException(e); +} +return dataformat; } -} -Map parameters = new HashMap<>(); -IntrospectionSupport.getProperties(configuration, parameters, null, -false); -IntrospectionSupport.setProperties(camelContext, -camelContext.getTypeConverter(), dataformat, parameters); -return dataformat; +}; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java