This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit d9e73abf4144875aee6c4b5f6ab0dcfb67e1d059 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Aug 8 11:40:37 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed docs and camel-catalog tests --- .../org/apache/camel/catalog/CamelCatalogTest.java | 54 +++--- components/readme.adoc | 122 +------------ core/camel-core/readme-eip.adoc | 192 --------------------- .../src/main/resources/features.xml | 2 +- examples/camel-example-netty-http/README.md | 2 +- examples/camel-example-rest-producer/readme.adoc | 2 +- 6 files changed, 33 insertions(+), 341 deletions(-) diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index fc1d14d..a86bc93 100644 --- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -223,21 +223,21 @@ public class CamelCatalogTest { map.put("path", "foo/bar"); map.put("disconnect", "true"); - String uri = catalog.asEndpointUri("netty4-http", map, true); - assertEquals("netty4-http:http:localhost:8080/foo/bar?disconnect=true", uri); + String uri = catalog.asEndpointUri("netty-http", map, true); + assertEquals("netty-http:http:localhost:8080/foo/bar?disconnect=true", uri); // lets switch protocol map.put("protocol", "https"); - uri = catalog.asEndpointUri("netty4-http", map, true); - assertEquals("netty4-http:https:localhost:8080/foo/bar?disconnect=true", uri); + uri = catalog.asEndpointUri("netty-http", map, true); + assertEquals("netty-http:https:localhost:8080/foo/bar?disconnect=true", uri); // lets set a query parameter in the path map.put("path", "foo/bar?verbose=true"); map.put("disconnect", "true"); - uri = catalog.asEndpointUri("netty4-http", map, true); - assertEquals("netty4-http:https:localhost:8080/foo/bar?verbose=true&disconnect=true", uri); + uri = catalog.asEndpointUri("netty-http", map, true); + assertEquals("netty-http:https:localhost:8080/foo/bar?verbose=true&disconnect=true", uri); } @Test @@ -322,21 +322,21 @@ public class CamelCatalogTest { map.put("host", "a-b-c.hostname.tld"); map.put("port", "8080"); map.put("path", "anything"); - String uri = catalog.asEndpointUri("netty4-http", map, false); - assertEquals("netty4-http:http:a-b-c.hostname.tld:8080/anything", uri); + String uri = catalog.asEndpointUri("netty-http", map, false); + assertEquals("netty-http:http:a-b-c.hostname.tld:8080/anything", uri); map = new LinkedHashMap<>(); map.put("protocol", "http"); map.put("host", "a-b-c.server.net"); map.put("port", "8888"); map.put("path", "service/v3"); - uri = catalog.asEndpointUri("netty4-http", map, true); - assertEquals("netty4-http:http:a-b-c.server.net:8888/service/v3", uri); + uri = catalog.asEndpointUri("netty-http", map, true); + assertEquals("netty-http:http:a-b-c.server.net:8888/service/v3", uri); } @Test public void testNetty4Http4DynamicToIssueHost() throws Exception { - String uri = "netty4-http:http://a-b-c.hostname.tld:8080/anything";; + String uri = "netty-http:http://a-b-c.hostname.tld:8080/anything";; Map<String, String> params = catalog.endpointProperties(uri); assertEquals("http", params.get("protocol")); assertEquals("a-b-c.hostname.tld", params.get("host")); @@ -346,8 +346,8 @@ public class CamelCatalogTest { // remove path params.remove("path"); - String resolved = catalog.asEndpointUri("netty4-http", params, false); - assertEquals("netty4-http:http:a-b-c.hostname.tld:8080", resolved); + String resolved = catalog.asEndpointUri("netty-http", params, false); + assertEquals("netty-http:http:a-b-c.hostname.tld:8080", resolved); } @Test @@ -400,7 +400,7 @@ public class CamelCatalogTest { @Test public void testEndpointPropertiesNetty4Http() throws Exception { - Map<String, String> map = catalog.endpointProperties("netty4-http:http:localhost:8080/foo/bar?disconnect=true&keepAlive=false"); + Map<String, String> map = catalog.endpointProperties("netty-http:http:localhost:8080/foo/bar?disconnect=true&keepAlive=false"); assertNotNull(map); assertEquals(6, map.size()); @@ -414,7 +414,7 @@ public class CamelCatalogTest { @Test public void testEndpointPropertiesNetty4HttpDefaultPort() throws Exception { - Map<String, String> map = catalog.endpointProperties("netty4-http:http:localhost/foo/bar?disconnect=true&keepAlive=false"); + Map<String, String> map = catalog.endpointProperties("netty-http:http:localhost/foo/bar?disconnect=true&keepAlive=false"); assertNotNull(map); assertEquals(5, map.size()); @@ -427,7 +427,7 @@ public class CamelCatalogTest { @Test public void testEndpointPropertiesNetty4HttpPlaceholder() throws Exception { - Map<String, String> map = catalog.endpointProperties("netty4-http:http:{{myhost}}:{{myport}}/foo/bar?disconnect=true&keepAlive=false"); + Map<String, String> map = catalog.endpointProperties("netty-http:http:{{myhost}}:{{myport}}/foo/bar?disconnect=true&keepAlive=false"); assertNotNull(map); assertEquals(6, map.size()); @@ -441,7 +441,7 @@ public class CamelCatalogTest { @Test public void testEndpointPropertiesNetty4HttpWithDoubleSlash() throws Exception { - Map<String, String> map = catalog.endpointProperties("netty4-http:http://localhost:8080/foo/bar?disconnect=true&keepAlive=false";); + Map<String, String> map = catalog.endpointProperties("netty-http:http://localhost:8080/foo/bar?disconnect=true&keepAlive=false";); assertNotNull(map); assertEquals(6, map.size()); @@ -734,26 +734,26 @@ public class CamelCatalogTest { assertTrue(result.getUnknown().contains("foo")); // lenient off consumer only - result = catalog.validateEndpointProperties("netty4-http:http://myserver?foo=bar";, false, true, false); + result = catalog.validateEndpointProperties("netty-http:http://myserver?foo=bar";, false, true, false); assertFalse(result.isSuccess()); // consumer should still fail because we cannot use lenient option in consumer mode assertEquals("foo", result.getUnknown().iterator().next()); assertNull(result.getLenient()); // lenient off producer only - result = catalog.validateEndpointProperties("netty4-http:http://myserver?foo=bar";, false, false, true); + result = catalog.validateEndpointProperties("netty-http:http://myserver?foo=bar";, false, false, true); assertTrue(result.isSuccess()); // foo is the lenient option assertEquals(1, result.getLenient().size()); assertEquals("foo", result.getLenient().iterator().next()); // lenient on consumer only - result = catalog.validateEndpointProperties("netty4-http:http://myserver?foo=bar";, true, true, false); + result = catalog.validateEndpointProperties("netty-http:http://myserver?foo=bar";, true, true, false); assertFalse(result.isSuccess()); // consumer should still fail because we cannot use lenient option in consumer mode assertEquals("foo", result.getUnknown().iterator().next()); assertNull(result.getLenient()); // lenient on producer only - result = catalog.validateEndpointProperties("netty4-http:http://myserver?foo=bar";, true, false, true); + result = catalog.validateEndpointProperties("netty-http:http://myserver?foo=bar";, true, false, true); assertFalse(result.isSuccess()); assertEquals("foo", result.getUnknown().iterator().next()); assertNull(result.getLenient()); @@ -1220,19 +1220,19 @@ public class CamelCatalogTest { @Test public void testNetty4Http4DynamicToIssue() throws Exception { - String uri = "netty4-http:http://10.192.1.10:8080/client/alerts/summary?throwExceptionOnFailure=false";; + String uri = "netty-http:http://10.192.1.10:8080/client/alerts/summary?throwExceptionOnFailure=false";; Map<String, String> params = catalog.endpointProperties(uri); params.remove("path"); params.remove("throwExceptionOnFailure"); - String resolved = catalog.asEndpointUri("netty4-http", params, false); - assertEquals("netty4-http:http:10.192.1.10:8080", resolved); + String resolved = catalog.asEndpointUri("netty-http", params, false); + assertEquals("netty-http:http:10.192.1.10:8080", resolved); // another example with dash in hostname - uri = "netty4-http:http://a-b-c.hostname.tld:8080/anything";; + uri = "netty-http:http://a-b-c.hostname.tld:8080/anything";; params = catalog.endpointProperties(uri); - resolved = catalog.asEndpointUri("netty4-http", params, false); - assertEquals("netty4-http:http:a-b-c.hostname.tld:8080/anything", resolved); + resolved = catalog.asEndpointUri("netty-http", params, false); + assertEquals("netty-http:http:a-b-c.hostname.tld:8080/anything", resolved); } @Test diff --git a/components/readme.adoc b/components/readme.adoc index 0b29a5b..6fc5ca4 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ = Components // components: START -Number of Components: 297 in 234 JAR artifacts (0 deprecated) +Number of Components: 263 in 204 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -40,9 +40,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-atmos/src/main/docs/atmos-component.adoc[Atmos] (camel-atmos) + `atmos:name/operation` | 2.15 | The atmos component is used for integrating with EMC's Atomos Storage. -| link:camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc[Atmosphere Websocket] (camel-atmosphere-websocket) + -`atmosphere-websocket:servicePath` | 2.14 | To exchange data with external Websocket clients using Atmosphere. - | link:camel-atom/src/main/docs/atom-component.adoc[Atom] (camel-atom) + `atom:feedUri` | 1.2 | The atom component is used for consuming Atom RSS feeds. @@ -286,9 +283,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-ftp/src/main/docs/ftps-component.adoc[FTPS] (camel-ftp) + `ftps:host:port/directoryName` | 2.2 | The \ftps (FTP secure SSL/TLS) component is used for uploading or downloading files from FTP servers. -| link:camel-ganglia/src/main/docs/ganglia-component.adoc[Ganglia] (camel-ganglia) + -`ganglia:host:port` | 2.15 | The ganglia component is used for sending metrics to the Ganglia monitoring system. - | link:camel-geocoder/src/main/docs/geocoder-component.adoc[Geocoder] (camel-geocoder) + `geocoder:address:latlng` | 2.12 | The geocoder component is used for looking up geocodes (latitude and longitude) for a given address, or reverse lookup. @@ -376,15 +370,9 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-hbase/src/main/docs/hbase-component.adoc[HBase] (camel-hbase) + `hbase:tableName` | 2.10 | For reading/writing from/to an HBase store (Hadoop database). -| link:camel-hdfs/src/main/docs/hdfs-component.adoc[HDFS] (camel-hdfs) + -`hdfs:hostName:port/path` | 2.14 | For reading/writing from/to an HDFS filesystem using Hadoop 2.x. - | link:camel-hipchat/src/main/docs/hipchat-component.adoc[Hipchat] (camel-hipchat) + `hipchat:protocol:host:port` | 2.15 | The hipchat component supports producing and consuming messages from/to Hipchat service. -| link:camel-http/src/main/docs/http-component.adoc[HTTP] (camel-http) + -`http:httpUri` | 2.3 | For calling out to external HTTP servers using Apache HTTP Client 4.x. - | link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) + `iec60870-client:uriPath` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems. @@ -448,12 +436,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-jdbc/src/main/docs/jdbc-component.adoc[JDBC] (camel-jdbc) + `jdbc:dataSourceName` | 1.2 | The jdbc component enables you to access databases through JDBC, where SQL queries are sent in the message body. -| link:camel-jetty/src/main/docs/jetty-component.adoc[Jetty] (camel-jetty) + -`jetty:httpUri` | 1.2 | The jetty component provides HTTP-based endpoints for consuming and producing HTTP requests. - -| link:camel-websocket/src/main/docs/websocket-component.adoc[Jetty Websocket] (camel-websocket) + -`websocket:host:port/resourceUri` | 2.10 | The websocket component provides websocket endpoints with Jetty for communicating with clients using websocket. - | link:camel-jgroups/src/main/docs/jgroups-component.adoc[JGroups] (camel-jgroups) + `jgroups:clusterName` | 2.13 | The jgroups component provides exchange of messages between Camel and JGroups clusters. @@ -487,9 +469,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-jt400/src/main/docs/jt400-component.adoc[JT400] (camel-jt400) + `jt400:userID:password/systemName/objectPath.type` | 1.5 | The jt400 component allows you to exchanges messages with an AS/400 system using data queues or program call. -| link:camel-kafka/src/main/docs/kafka-component.adoc[Kafka] (camel-kafka) + -`kafka:topic` | 2.13 | The kafka component allows messages to be sent to (or consumed from) Apache Kafka brokers. - | link:camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc[Kubernetes ConfigMap] (camel-kubernetes) + `kubernetes-config-maps:masterUrl` | 2.17 | The Kubernetes Configmaps component provides a producer to execute kubernetes configmap operations. @@ -565,18 +544,12 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-micrometer/src/main/docs/micrometer-component.adoc[Micrometer] (camel-micrometer) + `micrometer:metricsType:metricsName` | 2.22 | To collect various metrics directly from Camel routes using the Micrometer library. -| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) + -`mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library. - | link:camel-mllp/src/main/docs/mllp-component.adoc[MLLP] (camel-mllp) + `mllp:hostname:port` | 2.17 | Provides functionality required by Healthcare providers to communicate with other systems using the MLLP protocol. | link:camel-mock/src/main/docs/mock-component.adoc[Mock] (camel-mock) + `mock:name` | 1.0 | The mock component is used for testing routes and mediation rules using mocks. -| link:camel-mongodb/src/main/docs/mongodb-component.adoc[MongoDB] (camel-mongodb) + -`mongodb:connectionBean` | 2.19 | Component for working with documents stored in MongoDB database. - | link:camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc[MongoDB GridFS] (camel-mongodb-gridfs) + `mongodb-gridfs:connectionBean` | 2.18 | Component for working with MongoDB GridFS. @@ -604,12 +577,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-nats/src/main/docs/nats-component.adoc[Nats] (camel-nats) + `nats:servers` | 2.17 | The nats component allows you produce and consume messages from NATS. -| link:camel-netty/src/main/docs/netty-component.adoc[Netty] (camel-netty) + -`netty:protocol:host:port` | 2.14 | Socket level networking using TCP or UDP with the Netty 4.x library. - -| link:camel-netty-http/src/main/docs/netty-http-component.adoc[Netty HTTP] (camel-netty-http) + -`netty-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library. - | link:camel-nsq/src/main/docs/nsq-component.adoc[NSQ] (camel-nsq) + `nsq:servers` | 2.23 | Represents a nsq endpoint. @@ -679,9 +646,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-pubnub/src/main/docs/pubnub-component.adoc[PubNub] (camel-pubnub) + `pubnub:channel` | 2.19 | To send and receive messages to PubNub data stream network for connected devices. -| link:camel-quartz/src/main/docs/quartz-component.adoc[Quartz] (camel-quartz) + -`quartz:groupName/triggerName` | 2.12 | Provides a scheduled delivery of messages using the Quartz 2.x scheduler. - | link:camel-quickfix/src/main/docs/quickfix-component.adoc[QuickFix] (camel-quickfix) + `quickfix:configurationName` | 2.1 | The quickfix component allows to send Financial Interchange (FIX) messages to the QuickFix engine. @@ -736,9 +700,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc[ServiceNow] (camel-servicenow) + `servicenow:instanceName` | 2.18 | The servicenow component is used to integrate Camel with ServiceNow cloud services. -| link:camel-servlet/src/main/docs/servlet-component.adoc[Servlet] (camel-servlet) + -`servlet:contextPath` | 2.0 | To use a HTTP Servlet as entry for Camel routes when running in a servlet container. - | link:camel-ftp/src/main/docs/sftp-component.adoc[SFTP] (camel-ftp) + `sftp:host:port/directoryName` | 1.1 | The \sftp (FTP over SSH) component is used for uploading or downloading files from SFTP servers. @@ -775,42 +736,15 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-splunk/src/main/docs/splunk-component.adoc[Splunk] (camel-splunk) + `splunk:name` | 2.13 | The splunk component allows to publish or search for events in Splunk. -| link:camel-spring-batch/src/main/docs/spring-batch-component.adoc[Spring Batch] (camel-spring-batch) + -`spring-batch:jobName` | 2.10 | The spring-batch component allows to send messages to Spring Batch for further processing. - -| link:camel-spring/src/main/docs/spring-event-component.adoc[Spring Event] (camel-spring) + -`spring-event:name` | 1.4 | The spring-event component allows to listen for Spring Application Events. - | link:camel-spring-integration/src/main/docs/spring-integration-component.adoc[Spring Integration] (camel-spring-integration) + `spring-integration:defaultChannel` | 1.4 | Bridges Camel with Spring Integration. | link:camel-spring-ldap/src/main/docs/spring-ldap-component.adoc[Spring LDAP] (camel-spring-ldap) + `spring-ldap:templateName` | 2.11 | The spring-ldap component allows you to perform searches in LDAP servers using filters as the message payload. -| link:camel-spring-redis/src/main/docs/spring-redis-component.adoc[Spring Redis] (camel-spring-redis) + -`spring-redis:host:port` | 2.11 | The spring-redis component allows sending and receiving messages from Redis. - -| link:camel-spring-ws/src/main/docs/spring-ws-component.adoc[Spring WebService] (camel-spring-ws) + -`spring-ws:type:lookupKey:webServiceEndpointUri` | 2.6 | The spring-ws component is used for SOAP WebServices using Spring WebServices. - -| link:camel-sql/src/main/docs/sql-component.adoc[SQL] (camel-sql) + -`sql:query` | 1.4 | The sql component allows you to work with databases using JDBC SQL queries. - -| link:camel-sql/src/main/docs/sql-stored-component.adoc[SQL Stored Procedure] (camel-sql) + -`sql-stored:template` | 2.17 | The sql component allows you to work with databases using JDBC Stored Procedure queries. - | link:camel-ssh/src/main/docs/ssh-component.adoc[SSH] (camel-ssh) + `ssh:host:port` | 2.10 | The ssh component enables access to SSH servers such that you can send an SSH command, and process the response. -| link:camel-stax/src/main/docs/stax-component.adoc[StAX] (camel-stax) + -`stax:contentHandlerClass` | 2.9 | The stax component allows messages to be process through a SAX ContentHandler. - -| link:camel-stomp/src/main/docs/stomp-component.adoc[Stomp] (camel-stomp) + -`stomp:destination` | 2.12 | The stomp component is used for communicating with Stomp compliant message brokers. - -| link:camel-stream/src/main/docs/stream-component.adoc[Stream] (camel-stream) + -`stream:kind` | 1.3 | The stream: component provides access to the system-in, system-out and system-err streams as well as allowing streaming of file and URL. - | link:camel-stringtemplate/src/main/docs/string-template-component.adoc[String Template] (camel-stringtemplate) + `string-template:resourceUri` | 1.2 | Transforms the message using a String template. @@ -820,33 +754,12 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-telegram/src/main/docs/telegram-component.adoc[Telegram] (camel-telegram) + `telegram:type/authorizationToken` | 2.18 | The telegram component provides access to the Telegram Bot API. -| link:camel-thrift/src/main/docs/thrift-component.adoc[Thrift] (camel-thrift) + -`thrift:host:port/service` | 2.20 | The Thrift component allows to call and expose remote procedures (RPC) with Apache Thrift data format and serialization mechanism - -| link:camel-tika/src/main/docs/tika-component.adoc[Tika] (camel-tika) + -`tika:operation` | 2.19 | This component integrates with Apache Tika to extract content and metadata from thousands of file types. - | link:camel-timer/src/main/docs/timer-component.adoc[Timer] (camel-timer) + `timer:timerName` | 1.0 | The timer component is used for generating message exchanges when a timer fires. | link:camel-twilio/src/main/docs/twilio-component.adoc[Twilio] (camel-twilio) + `twilio:apiName/methodName` | 2.20 | The Twilio component allows you to interact with the Twilio REST APIs using Twilio Java SDK. -| link:camel-twitter/src/main/docs/twitter-directmessage-component.adoc[Twitter Direct Message] (camel-twitter) + -`twitter-directmessage:user` | 2.10 | The Twitter Direct Message Component consumes/produces user's direct messages. - -| link:camel-twitter/src/main/docs/twitter-search-component.adoc[Twitter Search] (camel-twitter) + -`twitter-search:keywords` | 2.10 | The Twitter Search component consumes search results. - -| link:camel-twitter/src/main/docs/twitter-streaming-component.adoc[Twitter Streaming] (camel-twitter) + -`twitter-streaming:streamingType` | 2.10 | The Twitter Streaming component consumes twitter statuses using Streaming API. - -| link:camel-twitter/src/main/docs/twitter-timeline-component.adoc[Twitter Timeline] (camel-twitter) + -`twitter-timeline:timelineType` | 2.10 | The Twitter Timeline component consumes twitter timeline or update the status of specific user. - -| link:camel-undertow/src/main/docs/undertow-component.adoc[Undertow] (camel-undertow) + -`undertow:httpURI` | 2.16 | The undertow component provides HTTP and WebSocket based endpoints for consuming and producing HTTP/WebSocket requests. - | link:camel-validator/src/main/docs/validator-component.adoc[Validator] (camel-validator) + `validator:resourceUri` | 1.1 | Validates the payload of a message using XML Schema and JAXP Validation. @@ -862,9 +775,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-weather/src/main/docs/weather-component.adoc[Weather] (camel-weather) + `weather:name` | 2.12 | Polls the weather information from Open Weather Map. -| link:camel-web3j/src/main/docs/web3j-component.adoc[Web3j Ethereum Blockchain] (camel-web3j) + -`web3j:nodeAddress` | 2.22 | The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories. - | link:camel-webhook/src/main/docs/webhook-component.adoc[Webhook] (camel-webhook) + `webhook:endpointUri` | 3.0 | The webhook component allows other Camel components that can receive push notifications to expose webhook endpoints and automatically register them with their own webhook provider. @@ -874,15 +784,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-xchange/src/main/docs/xchange-component.adoc[XChange] (camel-xchange) + `xchange:name` | 2.21 | The camel-xchange component provide access to many bitcoin and altcoin exchanges for trading and accessing market data. -| link:camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc[XML Security] (camel-xmlsecurity) + -`xmlsecurity:command:name` | 2.12 | Used to sign and verify exchanges using the XML signature specification. - -| link:camel-xmpp/src/main/docs/xmpp-component.adoc[XMPP] (camel-xmpp) + -`xmpp:host:port/participant` | 1.0 | To send and receive messages from a XMPP (chat) server. - -| link:camel-saxon/src/main/docs/xquery-component.adoc[XQuery] (camel-saxon) + -`xquery:resourceUri` | 1.0 | Transforms the message using a XQuery template using Saxon. - | link:camel-xslt/src/main/docs/xslt-component.adoc[XSLT] (camel-xslt) + `xslt:resourceUri` | 1.3 | Transforms the message using a XSLT template. @@ -892,9 +793,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-zendesk/src/main/docs/zendesk-component.adoc[Zendesk] (camel-zendesk) + `zendesk:methodName` | 2.19 | Allows producing messages to manage Zendesk ticket, user, organization, etc. -| link:camel-zookeeper/src/main/docs/zookeeper-component.adoc[ZooKeeper] (camel-zookeeper) + -`zookeeper:serverUrls/path` | 2.9 | The zookeeper component allows interaction with a ZooKeeper cluster. - | link:camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc[ZooKeeper Master] (camel-zookeeper-master) + `zookeeper-master:groupName:consumerEndpointUri` | 2.19 | Represents an endpoint which only becomes active when it obtains the master lock @@ -905,7 +803,7 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) == Data Formats // dataformats: START -Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) +Number of Data Formats: 40 in 32 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -943,8 +841,6 @@ Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) | link:camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc[GZip Deflater] (camel-zip-deflater) | 2.0 | The GZip data format is a message compression and de-compression format (which works with the popular gzip/gunzip tools). -| link:camel-hl7/src/main/docs/hl7-dataformat.adoc[HL7] (camel-hl7) | 2.0 | The HL7 data format can be used to marshal or unmarshal HL7 (Health Care) model objects. - | link:camel-ical/src/main/docs/ical-dataformat.adoc[iCal] (camel-ical) | 2.12 | The iCal dataformat is used for working with iCalendar messages. | link:camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc[JacksonXML] (camel-jacksonxml) | 2.16 | JacksonXML data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload. @@ -975,12 +871,8 @@ Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) | link:camel-soap/src/main/docs/soapjaxb-dataformat.adoc[SOAP] (camel-soap) | 2.3 | SOAP is a data format which uses JAXB2 and JAX-WS annotations to marshal and unmarshal SOAP payloads. -| link:camel-syslog/src/main/docs/syslog-dataformat.adoc[Syslog] (camel-syslog) | 2.6 | The Syslog dataformat is used for working with RFC3164 and RFC5424 messages (logging and monitoring). - | link:camel-tarfile/src/main/docs/tarfile-dataformat.adoc[Tar File] (camel-tarfile) | 2.16 | The Tar File data format is a message compression and de-compression format of tar files. -| link:camel-thrift/src/main/docs/thrift-dataformat.adoc[Thrift] (camel-thrift) | 2.20 | The Thrift data format is used for serialization and deserialization of messages using Apache Thrift binary dataformat. - | link:camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc[TidyMarkup] (camel-tagsoup) | 2.0 | TidyMarkup data format is used for parsing HTML and return it as pretty well-formed HTML. | link:camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc[uniVocity CSV] (camel-univocity-parsers) | 2.15 | The uniVocity CSV data format is used for working with CSV (Comma Separated Values) flat payloads. @@ -989,8 +881,6 @@ Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) | link:camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc[uniVocity TSV] (camel-univocity-parsers) | 2.15 | The uniVocity TSV data format is used for working with TSV (Tabular Separated Values) flat payloads. -| link:camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc[XML Security] (camel-xmlsecurity) | 2.0 | The XML Security data format facilitates encryption and decryption of XML payloads. - | link:camel-xstream/src/main/docs/xstream-dataformat.adoc[XStream] (camel-xstream) | 1.3 | XSTream data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload. | link:camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] (camel-snakeyaml) | 2.17 | YAML is a data format to marshal and unmarshal Java objects to and from YAML. @@ -1005,7 +895,7 @@ Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) == Expression Languages // languages: START -Number of Languages: 17 in 11 JAR artifacts (0 deprecated) +Number of Languages: 14 in 8 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -1023,8 +913,6 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated) | link:camel-base/src/main/docs/header-language.adoc[Header] (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates. -| link:camel-hl7/src/main/docs/hl7terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates. - | link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath] (camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates. | link:camel-mvel/src/main/docs/mvel-language.adoc[MVEL] (camel-mvel) | 2.0 | To use MVEL scripts in Camel expressions or predicates. @@ -1035,15 +923,11 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated) | link:camel-base/src/main/docs/simple-language.adoc[Simple] (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates. -| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates. - | link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates. | link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates. | link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates. - -| link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates. |=== // languages: END diff --git a/core/camel-core/readme-eip.adoc b/core/camel-core/readme-eip.adoc index 107db78..07ab32f 100644 --- a/core/camel-core/readme-eip.adoc +++ b/core/camel-core/readme-eip.adoc @@ -3,197 +3,5 @@ Camel supports most of the link:http://www.eaipatterns.com/toc.html[Enterprise Integration Patterns] from the excellent book by link:http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&search-type=ss&index=books&field-author=Gregor%20Hohpe[Gregor Hohpe] and link:http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&search-type=ss&index=books&field-author=Bobby%20Woolf[Bobby Woolf]. // eips: START -Number of EIPs: 62 (0 deprecated) -[width="100%",cols="4,6",options="header"] -|=== -| EIP | Description - -| link:src/main/docs/eips/aggregate-eip.adoc[Aggregate] + -`<aggregate>` | Aggregates many messages into a single message - -| link:src/main/docs/eips/batch-config-eip.adoc[Batch-config] + -`<batch-config>` | Configures batch-processing resequence eip. - -| link:src/main/docs/eips/bean-eip.adoc[Bean] + -`<bean>` | Calls a java bean - -| link:src/main/docs/eips/choice-eip.adoc[Choice] + -`<choice>` | Routes messages based on a series of predicates - -| link:src/main/docs/eips/claimCheck-eip.adoc[Claim Check] + -`<claimCheck>` | The Claim Check EIP allows you to replace message content with a claim check (a unique key), which can be used to retrieve the message content at a later time. - -| link:src/main/docs/eips/convertBodyTo-eip.adoc[Convert Body To] + -`<convertBodyTo>` | Converts the message body to another type - -| link:src/main/docs/eips/customLoadBalancer-eip.adoc[Custom Load Balancer] + -`<customLoadBalancer>` | Custom load balancer - -| link:src/main/docs/eips/delay-eip.adoc[Delay] + -`<delay>` | Delays processing for a specified length of time - -| link:src/main/docs/eips/dynamicRouter-eip.adoc[Dynamic Router] + -`<dynamicRouter>` | Routes messages based on dynamic rules - -| link:src/main/docs/eips/enrich-eip.adoc[Enrich] + -`<enrich>` | Enriches a message with data from a secondary resource - -| link:src/main/docs/eips/failover-eip.adoc[Failover] + -`<failover>` | Failover load balancer - -| link:src/main/docs/eips/filter-eip.adoc[Filter] + -`<filter>` | Filter out messages based using a predicate - -| link:src/main/docs/eips/from-eip.adoc[From] + -`<from>` | Act as a message source as input to a route - -| link:src/main/docs/eips/hystrix-eip.adoc[Hystrix] + -`<hystrix>` | Hystrix Circuit Breaker EIP - -| link:src/main/docs/eips/hystrixConfiguration-eip.adoc[Hystrix Configuration] + -`<hystrixConfiguration>` | Hystrix Circuit Breaker EIP configuration - -| link:src/main/docs/eips/idempotentConsumer-eip.adoc[Idempotent Consumer] + -`<idempotentConsumer>` | Filters out duplicate messages - -| link:src/main/docs/eips/inOnly-eip.adoc[In Only] + -`<inOnly>` | Marks the exchange pattern for the route to one way - -| link:src/main/docs/eips/inOut-eip.adoc[In Out] + -`<inOut>` | Marks the exchange pattern for the route to request/reply - -| link:src/main/docs/eips/loadBalance-eip.adoc[Load Balance] + -`<loadBalance>` | Balances message processing among a number of nodes - -| link:src/main/docs/eips/log-eip.adoc[Log] + -`<log>` | Logs the defined message to the logger - -| link:src/main/docs/eips/loop-eip.adoc[Loop] + -`<loop>` | Processes a message multiple times - -| link:src/main/docs/eips/marshal-eip.adoc[Marshal] + -`<marshal>` | Marshals data into a specified format for transmission over a transport or component - -| link:src/main/docs/eips/multicast-eip.adoc[Multicast] + -`<multicast>` | Routes the same message to multiple paths either sequentially or in parallel. - -| link:src/main/docs/eips/onFallback-eip.adoc[On Fallback] + -`<onFallback>` | Route to be executed when Hystrix EIP executes fallback - -| link:src/main/docs/eips/otherwise-eip.adoc[Otherwise] + -`<otherwise>` | Route to be executed when all other choices evaluate to false - -| link:src/main/docs/eips/pipeline-eip.adoc[Pipeline] + -`<pipeline>` | Routes the message to a sequence of processors. - -| link:src/main/docs/eips/pollEnrich-eip.adoc[Poll Enrich] + -`<pollEnrich>` | Enriches messages with data polled from a secondary resource - -| link:src/main/docs/eips/process-eip.adoc[Process] + -`<process>` | Calls a Camel processor - -| link:src/main/docs/eips/random-eip.adoc[Random] + -`<random>` | Random load balancer - -| link:src/main/docs/eips/recipientList-eip.adoc[Recipient List] + -`<recipientList>` | Routes messages to a number of dynamically specified recipients (dynamic to) - -| link:src/main/docs/eips/removeHeader-eip.adoc[Remove Header] + -`<removeHeader>` | Removes a named header from the message - -| link:src/main/docs/eips/removeHeaders-eip.adoc[Remove Headers] + -`<removeHeaders>` | Removes message headers whose name matches a specified pattern - -| link:src/main/docs/eips/removeProperties-eip.adoc[Remove Properties] + -`<removeProperties>` | Removes message exchange properties whose name matches a specified pattern - -| link:src/main/docs/eips/removeProperty-eip.adoc[Remove Property] + -`<removeProperty>` | Removes a named property from the message exchange - -| link:src/main/docs/eips/resequence-eip.adoc[Resequence] + -`<resequence>` | Resequences (re-order) messages based on an expression - -| link:src/main/docs/eips/rollback-eip.adoc[Rollback] + -`<rollback>` | Forces a rollback by stopping routing the message - -| link:src/main/docs/eips/roundRobin-eip.adoc[Round Robin] + -`<roundRobin>` | Round robin load balancer - -| link:src/main/docs/eips/routingSlip-eip.adoc[Routing Slip] + -`<routingSlip>` | Routes a message through a series of steps that are pre-determined (the slip) - -| link:src/main/docs/eips/saga-eip.adoc[Saga] + -`<saga>` | Enables sagas on the route - -| link:src/main/docs/eips/sample-eip.adoc[Sample] + -`<sample>` | Extract a sample of the messages passing through a route - -| link:src/main/docs/eips/script-eip.adoc[Script] + -`<script>` | Executes a script from a language which does not change the message body. - -| link:src/main/docs/eips/serviceCall-eip.adoc[Service Call] + -`<serviceCall>` | To call remote services - -| link:src/main/docs/eips/setBody-eip.adoc[Set Body] + -`<setBody>` | Sets the contents of the message body - -| link:src/main/docs/eips/setHeader-eip.adoc[Set Header] + -`<setHeader>` | Sets the value of a message header - -| link:src/main/docs/eips/setProperty-eip.adoc[Set Property] + -`<setProperty>` | Sets a named property on the message exchange - -| link:src/main/docs/eips/sort-eip.adoc[Sort] + -`<sort>` | Sorts the contents of the message - -| link:src/main/docs/eips/split-eip.adoc[Split] + -`<split>` | Splits a single message into many sub-messages. - -| link:src/main/docs/eips/step-eip.adoc[Step] + -`<step>` | Routes the message to a sequence of processors which is grouped together as one logical name - -| link:src/main/docs/eips/sticky-eip.adoc[Sticky] + -`<sticky>` | Sticky load balancer - -| link:src/main/docs/eips/stop-eip.adoc[Stop] + -`<stop>` | Stops the processing of the current message - -| link:src/main/docs/eips/stream-config-eip.adoc[Stream-config] + -`<stream-config>` | Configures stream-processing resequence eip. - -| link:src/main/docs/eips/threads-eip.adoc[Threads] + -`<threads>` | Specifies that all steps after this node are processed asynchronously - -| link:src/main/docs/eips/throttle-eip.adoc[Throttle] + -`<throttle>` | Controls the rate at which messages are passed to the next node in the route - -| link:src/main/docs/eips/to-eip.adoc[To] + -`<to>` | Sends the message to a static endpoint - -| link:src/main/docs/eips/toD-eip.adoc[To D] + -`<toD>` | Sends the message to a dynamic endpoint - -| link:src/main/docs/eips/topic-eip.adoc[Topic] + -`<topic>` | Topic load balancer - -| link:src/main/docs/eips/transform-eip.adoc[Transform] + -`<transform>` | Transforms the message body based on an expression - -| link:src/main/docs/eips/unmarshal-eip.adoc[Unmarshal] + -`<unmarshal>` | Converts the message data received from the wire into a format that Apache Camel processors can consume - -| link:src/main/docs/eips/validate-eip.adoc[Validate] + -`<validate>` | Validates a message based on an expression - -| link:src/main/docs/eips/weighted-eip.adoc[Weighted] + -`<weighted>` | Weighted load balancer - -| link:src/main/docs/eips/when-eip.adoc[When] + -`<when>` | Triggers a route when an expression evaluates to true - -| link:src/main/docs/eips/wireTap-eip.adoc[Wire Tap] + -`<wireTap>` | Routes a copy of a message (or creates a new message) to a secondary destination while continue routing the original message. - -|=== // eips: END diff --git a/examples/camel-example-artemis-amqp-blueprint/src/main/resources/features.xml b/examples/camel-example-artemis-amqp-blueprint/src/main/resources/features.xml index 61d64bf..973fdd6 100644 --- a/examples/camel-example-artemis-amqp-blueprint/src/main/resources/features.xml +++ b/examples/camel-example-artemis-amqp-blueprint/src/main/resources/features.xml @@ -24,7 +24,7 @@ <feature version="${project.version}">camel</feature> <feature version="${project.version}">camel-blueprint</feature> <feature version="${project.version}">camel-amqp</feature> - <feature version="${project.version}">camel-netty4-http</feature> + <feature version="${project.version}">camel-netty-http</feature> <bundle>mvn:org.apache.camel.example/${project.artifactId}/${project.version}</bundle> </feature> diff --git a/examples/camel-example-netty-http/README.md b/examples/camel-example-netty-http/README.md index aadcf56..bf9e41b 100644 --- a/examples/camel-example-netty-http/README.md +++ b/examples/camel-example-netty-http/README.md @@ -30,7 +30,7 @@ karaf@root()> feature:install camel Then you need to install the following features in Karaf/ServiceMix: ```sh -karaf@root()> feature:install camel-netty4-http +karaf@root()> feature:install camel-netty-http ``` Then you can install the shared Netty HTTP server which by default runs on port `8888`. diff --git a/examples/camel-example-rest-producer/readme.adoc b/examples/camel-example-rest-producer/readme.adoc index b5f3f15..a381635 100644 --- a/examples/camel-example-rest-producer/readme.adoc +++ b/examples/camel-example-rest-producer/readme.adoc @@ -18,7 +18,7 @@ The actual HTTP client that is used to call the REST service is `camel-http` whi in the `pom.xml` file. You can use other HTTP clients with the REST producer such as - camel-http -- camel-netty4-http +- camel-netty-http - camel-jetty - camel-restlet - camel-undertow
