This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new e227cf6 CAMEL-13589: escape http/ftp URLs e227cf6 is described below commit e227cf624b3a18ce1e5f44d5b163282bf6652007 Author: Zoran Regvart <zregv...@apache.org> AuthorDate: Wed Jul 3 10:26:22 2019 +0200 CAMEL-13589: escape http/ftp URLs We need to escape all http/ftp URLs in asciidoc files as they are auto-converted to links when processed by Asciidoctor. --- .../camel-cxf-transport/src/main/docs/cxf-transport.adoc | 8 ++++---- .../camel-freemarker/src/main/docs/freemarker-component.adoc | 2 +- components/camel-ftp/src/main/docs/ftp-component.adoc | 9 ++++++--- components/camel-jetty/src/main/docs/jetty-component.adoc | 8 ++++---- components/camel-jira/src/main/docs/jira-component.adoc | 8 ++++---- components/camel-milo/src/main/docs/milo-client-component.adoc | 2 +- .../camel-netty4-http/src/main/docs/netty4-http-component.adoc | 6 +++--- .../camel-properties/src/main/docs/properties-component.adoc | 2 +- .../src/main/docs/rest-swagger-component.adoc | 10 +++++----- .../camel/component/rest/swagger/RestSwaggerComponent.java | 2 +- .../camel/component/rest/swagger/RestSwaggerEndpoint.java | 2 +- components/camel-restlet/src/main/docs/restlet-component.adoc | 2 +- .../camel-spring-ws/src/main/docs/spring-ws-component.adoc | 8 ++++---- .../camel-undertow/src/main/docs/undertow-component.adoc | 6 +++--- .../camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc | 2 +- components/camel-xpath/src/main/docs/xpath-language.adoc | 2 +- core/camel-core/src/main/docs/eips/toD-eip.adoc | 2 +- docs/components/modules/ROOT/pages/cxf-transport.adoc | 8 ++++---- docs/components/modules/ROOT/pages/freemarker-component.adoc | 2 +- docs/components/modules/ROOT/pages/ftp-component.adoc | 9 ++++++--- docs/components/modules/ROOT/pages/jetty-component.adoc | 8 ++++---- docs/components/modules/ROOT/pages/jira-component.adoc | 8 ++++---- docs/components/modules/ROOT/pages/milo-client-component.adoc | 2 +- docs/components/modules/ROOT/pages/netty4-http-component.adoc | 6 +++--- docs/components/modules/ROOT/pages/properties-component.adoc | 2 +- docs/components/modules/ROOT/pages/rest-swagger-component.adoc | 10 +++++----- docs/components/modules/ROOT/pages/restlet-component.adoc | 2 +- docs/components/modules/ROOT/pages/spring-ws-component.adoc | 8 ++++---- docs/components/modules/ROOT/pages/undertow-component.adoc | 6 +++--- docs/components/modules/ROOT/pages/xmlsecurity-component.adoc | 2 +- docs/components/modules/ROOT/pages/xpath-language.adoc | 2 +- docs/user-manual/modules/ROOT/pages/book-getting-started.adoc | 2 +- docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc | 2 +- .../ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc | 4 ++-- ...tp-and-https-without-touching-the-spring-configuration.adoc | 4 ++-- docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 2 +- docs/user-manual/modules/ROOT/pages/toD-eip.adoc | 2 +- .../modules/ROOT/pages/using-propertyplaceholder.adoc | 2 +- examples/camel-example-fhir-auth-tx-spring-boot/readme.adoc | 2 +- examples/camel-example-fhir-spring-boot/readme.adoc | 2 +- examples/camel-example-spring-boot-rest-swagger/README.adoc | 2 +- .../swagger/springboot/RestSwaggerComponentConfiguration.java | 2 +- 42 files changed, 94 insertions(+), 88 deletions(-) diff --git a/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc b/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc index c070fbf..06d7484 100644 --- a/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc +++ b/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc @@ -94,7 +94,7 @@ BusFactory.setDefaultBus(bus); ==== Namespace The elements used to configure a Camel transport endpoint are defined -in the namespace `http://cxf.apache.org/transports/camel`. It is +in the namespace `\http://cxf.apache.org/transports/camel`. It is commonly referred to using the prefix `camel`. In order to use the Camel transport configuration elements, you will need to add the lines shown below to the beans element of your endpoint's configuration file. In @@ -125,7 +125,7 @@ attribute takes the form _portQName_`.camel-destination`. The example below shows the `camel:destination` element that would be used to add configuration for an endpoint that was specified by the WSDL fragment `<port binding="widgetSOAPBinding" name="widgetSOAPPort">` if the -endpoint's target namespace was `http://widgets.widgetvendor.net`. +endpoint's target namespace was `\http://widgets.widgetvendor.net`. *camel:destination Element* @@ -173,7 +173,7 @@ _portQName_`.camel-conduit`. For example, the code below shows the `camel:conduit` element that would be used to add configuration for an endpoint that was specified by the WSDL fragment `<port binding="widgetSOAPBinding" name="widgetSOAPPort">` if the -endpoint's target namespace was `http://widgets.widgetvendor.net`. +endpoint's target namespace was `\http://widgets.widgetvendor.net`. *http-conf:conduit Element* @@ -218,7 +218,7 @@ The camel context id which you want inject into the camel conduit Camel Transport for CXF supports configuration with Blueprint. If you are using blueprint, you should use the namespace -`http://cxf.apache.org/transports/camel/blueprint` and import the schema +`\http://cxf.apache.org/transports/camel/blueprint` and import the schema like the blow. *Adding the Configuration Namespace for blueprint* diff --git a/components/camel-freemarker/src/main/docs/freemarker-component.adoc b/components/camel-freemarker/src/main/docs/freemarker-component.adoc index 63437a5..4feea09 100644 --- a/components/camel-freemarker/src/main/docs/freemarker-component.adoc +++ b/components/camel-freemarker/src/main/docs/freemarker-component.adoc @@ -29,7 +29,7 @@ freemarker:templateName[?options] Where *templateName* is the classpath-local URI of the template to invoke; or the complete URL of the remote template (eg: -file://folder/myfile.ftl[file://folder/myfile.ftl]). +`\file://folder/myfile.ftl`). You can append query options to the URI in the following format, `?option=value&option=value&...` diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc index efb87c9..27a8d04 100644 --- a/components/camel-ftp/src/main/docs/ftp-component.adoc +++ b/components/camel-ftp/src/main/docs/ftp-component.adoc @@ -317,10 +317,13 @@ from("ftp://foo@myserver?password=secret&ftpClientConfig=#myConfig").to("bean:fo === Examples -`ftp://some...@someftpserver.com/public/upload/images/holiday2008?password=secret&binary=true` + +---- +ftp://some...@someftpserver.com/public/upload/images/holiday2008?password=secret&binary=true + +ftp://someonee...@someotherftpserver.co.uk:12049/reports/2008/password=secret&binary=false -`ftp://someonee...@someotherftpserver.co.uk:12049/reports/2008/password=secret&binary=false` + - `ftp://publicftpserver.com/download` +ftp://publicftpserver.com/download +---- === Concurrency diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc index 8c8d5b3..cdde045 100644 --- a/components/camel-jetty/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty/src/main/docs/jetty-component.adoc @@ -235,7 +235,7 @@ consumer. Camel also populates *all* request.parameter and request.headers. For example, given a client request with the URL, -`http://myserver/myserver?orderid=123`, the exchange will contain a +`\http://myserver/myserver?orderid=123`, the exchange will contain a header named `orderid` with the value 123. You can get the request.parameter from the @@ -248,7 +248,7 @@ The Jetty component supports consumer endpoints. === Consumer Example In this sample we define a route that exposes a HTTP service at -`http://localhost:8080/myapp/myservice`: +`\http://localhost:8080/myapp/myservice`: *Usage of localhost* @@ -278,7 +278,7 @@ The following sample shows a content-based route that routes all requests containing the URI parameter, `one`, to the endpoint, `mock:one`, and all others to `mock:other`. -So if a client sends the HTTP request, `http://serverUri?one=hello`, the +So if a client sends the HTTP request, `\http://serverUri?one=hello`, the Jetty component will copy the HTTP request parameter, `one` to the exchange's `in.header`. We can then use the `simple` language to route exchanges that contain this header to a specific endpoint and all others @@ -375,7 +375,7 @@ Spring DSL based configuration of endpoint Configuring Jetty Directly Jetty provides SSL support out of the box. To enable Jetty to run in SSL -mode, simply format the URI with the `https://` prefix---for example: +mode, simply format the URI with the `\https://` prefix---for example: [source,xml] ---- diff --git a/components/camel-jira/src/main/docs/jira-component.adoc b/components/camel-jira/src/main/docs/jira-component.adoc index 3f184ce..ae07f4e 100644 --- a/components/camel-jira/src/main/docs/jira-component.adoc +++ b/components/camel-jira/src/main/docs/jira-component.adoc @@ -229,13 +229,13 @@ There are operations that requires `id` for fields suchs as: issue type, priorit Required: * `ProjectKey`: The project key, example: CAMEL, HHH, MYP. -* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. +* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `\http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. * `IssueSummary`: The summary of the issue. Optional: * `IssueAssignee`: the assignee user -* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `http://jira_server/rest/api/2/priority`. +* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `\http://jira_server/rest/api/2/priority`. * `IssueComponents`: A list of string with the valid component names. * `IssueWatchersAdd`: A list of strings with the usernames to add to the watcher list. * `IssueDescription`: The description of the issue. @@ -273,10 +273,10 @@ Required: ### UpdateIssue * `IssueKey`: The issue key identifier. -* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. +* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `\http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. * `IssueSummary`: The summary of the issue. * `IssueAssignee`: the assignee user -* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `http://jira_server/rest/api/2/priority`. +* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `\http://jira_server/rest/api/2/priority`. * `IssueComponents`: A list of string with the valid component names. * `IssueDescription`: The description of the issue. diff --git a/components/camel-milo/src/main/docs/milo-client-component.adoc b/components/camel-milo/src/main/docs/milo-client-component.adoc index b32b6ce..b5c3b61 100644 --- a/components/camel-milo/src/main/docs/milo-client-component.adoc +++ b/components/camel-milo/src/main/docs/milo-client-component.adoc @@ -250,7 +250,7 @@ Input parameters are taken from the body: ==== Security policies -When setting the allowing security policies is it possible to use the well known OPC UA URIs (e.g. `http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15`) +When setting the allowing security policies is it possible to use the well known OPC UA URIs (e.g. `\http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15`) or to use the Milo enum literals (e.g. `None`). Specifying an unknown security policy URI or enum is an error. The known security policy URIs and enum literals are can be seen here: https://github.com/eclipse/milo/blob/master/opc-ua-stack/stack-core/src/main/java/org/eclipse/milo/opcua/stack/core/security/SecurityPolicy.java[SecurityPolicy.java] diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc index 1c33ec8..a6515e4 100644 --- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc +++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc @@ -335,7 +335,7 @@ The description in the table takes offset in a route having: |`CamelHttpMethod` |`String` |The HTTP method used, such as GET, POST, TRACE etc. |`CamelHttpUrl` |`String` |The URL including protocol, host and port, etc: -`http://0.0.0.0:8080/myapp` +`\http://0.0.0.0:8080/myapp` |`CamelHttpUri` |`String` |The URI without protocol, host and port, etc: `/myapp` @@ -407,8 +407,8 @@ from("netty4-http:http://0.0.0.0:8123/foo").to("mock:foo"); In the route above Netty4 HTTP will only match if the uri is an exact match, so it will match if you enter + - `http://0.0.0.0:8123/foo` but not match if you do -`http://0.0.0.0:8123/foo/bar`. + `\http://0.0.0.0:8123/foo` but not match if you do +`\http://0.0.0.0:8123/foo/bar`. So if you want to enable wildcard matching you do as follows: diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc index aa73ceb..5cbb151 100644 --- a/components/camel-properties/src/main/docs/properties-component.adoc +++ b/components/camel-properties/src/main/docs/properties-component.adoc @@ -559,7 +559,7 @@ assertMockEndpointsSatisfied(); *Available as of Camel 2.7* In the example below we use the `prop` prefix for the namespace -`http://camel.apache.org/schema/placeholder` by which we can use the +`\http://camel.apache.org/schema/placeholder` by which we can use the `prop` prefix in the attributes in the XML DSLs. Notice how we use that in the Multicast to indicate that the option `stopOnException` should be the value of the placeholder with the key diff --git a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc index 0e47121..df9af59 100644 --- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc +++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc @@ -43,7 +43,7 @@ If the `specificationPath` is not specified it defaults to load the resource, which means that you can use CLASSPATH resources (`classpath:my-specification.json`), files (`file:/some/path.json`), the web -(`http://api.example.com/swagger.json`) or reference a bean +(`\http://api.example.com/swagger.json`) or reference a bean (`ref:nameOfBean`) or use a method of a bean (`bean:nameOfBean.methodName`) to get the specification resource, failing that Swagger's own resource loading support. @@ -62,7 +62,7 @@ or on the endpoint. Typically you would just need to override the NOTE: The `host` parameter should contain the absolute URI containing scheme, hostname and port number, for instance: -`https://api.example.com` +`\https://api.example.com` With `componentName` you specify what component is used to perform the requests, this named component needs to be present in the Camel context @@ -96,7 +96,7 @@ The REST Swagger component supports 10 options, which are listed below. | *consumes* (producer) | What payload type this component capable of consuming. Could be one type, like application/json or multiple types as application/json, application/xml; q=0.5 according to the RFC7231. This equates to the value of Accept HTTP header. If set overrides any value found in the Swagger specification. Can be overridden in endpoint configuration | | String | *host* (producer) | Scheme hostname and port to direct the HTTP requests to in the form of https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in endpoint configurati [...] | *produces* (producer) | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String -| *specificationUri* (producer) | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can be overridden in en [...] +| *specificationUri* (producer) | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can be overridden in e [...] | *sslContextParameters* (security) | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context | | SSLContextParameters | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean @@ -119,7 +119,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *specificationUri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource from the classpath. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. http://api.example.com:8080). Overrides compo [...] +| *specificationUri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource from the classpath. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \http://api.example.com:8080). Overrides comp [...] | *operationId* | *Required* ID of the operation from the Swagger specification. | | String |=== @@ -171,7 +171,7 @@ The component supports 11 options, which are listed below. | *camel.component.rest-swagger.host* | Scheme hostname and port to direct the HTTP requests to in the form of https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in en [...] | *camel.component.rest-swagger.produces* | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String | *camel.component.rest-swagger.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean -| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can [...] +| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can [...] | *camel.component.rest-swagger.ssl-context-parameters* | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.rest-swagger.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean |=== diff --git a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerComponent.java b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerComponent.java index e9bc3e9..7652909 100644 --- a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerComponent.java +++ b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerComponent.java @@ -123,7 +123,7 @@ public final class RestSwaggerComponent extends DefaultComponent implements SSLC + " specification, but these can be overriden with properties on the component or endpoint level. If not" + " given the component tries to load `swagger.json` resource. Note that the `host` defined on the" + " component and endpoint of this Component should contain the scheme, hostname and optionally the" - + " port in the URI syntax (i.e. `https://api.example.com:8080`). Can be overridden in endpoint" + + " port in the URI syntax (i.e. `\\https://api.example.com:8080`). Can be overridden in endpoint" + " configuration.", defaultValue = DEFAULT_SPECIFICATION_URI_STR, label = "producer", required = false) private URI specificationUri; diff --git a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java index ddbf410..e88ca05 100644 --- a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java +++ b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java @@ -132,7 +132,7 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint { + " specification, but these can be overridden with properties on the component or endpoint level. If not" + " given the component tries to load `swagger.json` resource from the classpath. Note that the `host` defined on the" + " component and endpoint of this Component should contain the scheme, hostname and optionally the" - + " port in the URI syntax (i.e. `http://api.example.com:8080`). Overrides component configuration." + + " port in the URI syntax (i.e. `\\http://api.example.com:8080`). Overrides component configuration." + " The Swagger specification can be loaded from different sources by prefixing with file: classpath: http: https:." + " Support for https is limited to using the JDK installed UrlHandler, and as such it can be cumbersome to setup" + " TLS/SSL certificates for https (such as setting a number of javax.net.ssl JVM system properties)." diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc b/components/camel-restlet/src/main/docs/restlet-component.adoc index fe3c48a..e24cb61 100644 --- a/components/camel-restlet/src/main/docs/restlet-component.adoc +++ b/components/camel-restlet/src/main/docs/restlet-component.adoc @@ -399,7 +399,7 @@ And add this to your web.xml; ---- You will then be able to access the deployed route at -`http://localhost:8080/mywebapp/rs/demo/1234` where; +`\http://localhost:8080/mywebapp/rs/demo/1234` where; `localhost:8080` is the server and port of your servlet container + `mywebapp` is the name of your deployed webapp + diff --git a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc index 34ff452..42b464e 100644 --- a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc +++ b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc @@ -217,7 +217,7 @@ faultAction option if present ### Accessing web services -To call a web service at `http://foo.com/bar` simply define a route: +To call a web service at `\http://foo.com/bar` simply define a route: [source,java] --------------------------------------------------------- @@ -526,7 +526,7 @@ With the XML configuration in-place you can now use Camel's DSL to define what web service requests are handled by your endpoint: The following route will receive all web service requests that have a -root element named "GetFoo" within the `http://example.com/` namespace. +root element named "GetFoo" within the `\http://example.com/` namespace. [source,java] ---------------------------------------------------------------------------------------- @@ -535,7 +535,7 @@ from("spring-ws:rootqname:{http://example.com/}GetFoo?endpointMapping=#endpointM ---------------------------------------------------------------------------------------- The following route will receive web service requests containing the -`http://example.com/GetFoo` SOAP action. +`\http://example.com/GetFoo` SOAP action. [source,java] --------------------------------------------------------------------------------------- @@ -544,7 +544,7 @@ from("spring-ws:soapaction:http://example.com/GetFoo?endpointMapping=#endpointMa --------------------------------------------------------------------------------------- The following route will receive all requests sent to -`http://example.com/foobar`. +`\http://example.com/foobar`. [source,java] -------------------------------------------------------------------------------- diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc index 8ec4319..480d953 100644 --- a/components/camel-undertow/src/main/docs/undertow-component.adoc +++ b/components/camel-undertow/src/main/docs/undertow-component.adoc @@ -160,7 +160,7 @@ the chunked encoding on the camel-undertow consumer. Camel also populates *all* request.parameter and request.headers. For example, given a client request with the URL, -`http://myserver/myserver?orderid=123`, the exchange will contain a +`\http://myserver/myserver?orderid=123`, the exchange will contain a header named `orderid` with the value 123. === HTTP Producer Example @@ -189,7 +189,7 @@ or in XML === HTTP Consumer Example In this sample we define a route that exposes a HTTP service at -`http://localhost:8080/myapp/myservice`: +`\http://localhost:8080/myapp/myservice`: [source,xml] ---- @@ -202,7 +202,7 @@ In this sample we define a route that exposes a HTTP service at === WebSocket Example In this sample we define a route that exposes a WebSocket service at -`http://localhost:8080/myapp/mysocket` and returns back a response to the same channel: +`\http://localhost:8080/myapp/mysocket` and returns back a response to the same channel: [source,xml] ---- diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc index a934814..ba270cd 100644 --- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc +++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc @@ -208,7 +208,7 @@ https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/mai which reads the public key from a keystore. In the example, the default signature algorithm -`http://www.w3.org/2000/09/xmldsig#rsa-sha1` is used. You can set the +`\http://www.w3.org/2000/09/xmldsig#rsa-sha1` is used. You can set the signature algorithm of your choice by the option `signatureAlgorithm` (see below). The signer endpoint creates an _enveloping_ XML signature. If you want to create an _enveloped_ XML signature then you must specify diff --git a/components/camel-xpath/src/main/docs/xpath-language.adoc b/components/camel-xpath/src/main/docs/xpath-language.adoc index 31fe4c2..7fb324b 100644 --- a/components/camel-xpath/src/main/docs/xpath-language.adoc +++ b/components/camel-xpath/src/main/docs/xpath-language.adoc @@ -66,7 +66,7 @@ Namespaces helper class. === Variables Variables in XPath is defined in different namespaces. The default -namespace is `http://camel.apache.org/schema/spring`. +namespace is `\http://camel.apache.org/schema/spring`. [width="100%",cols="10%,10%,10%,70%",options="header",] |=== diff --git a/core/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core/src/main/docs/eips/toD-eip.adoc index 35d3c68..399db8a 100644 --- a/core/camel-core/src/main/docs/eips/toD-eip.adoc +++ b/core/camel-core/src/main/docs/eips/toD-eip.adoc @@ -199,7 +199,7 @@ from("direct:login") .removeHeader(Exchange.HTTP_QUERY); ---- -Where _expression_ will be evaluated dynamically. Notice how the uri in `toD` is now static (`http:myloginserver:8080`). +Where _expression_ will be evaluated dynamically. Notice how the uri in `toD` is now static (`\http:myloginserver:8080`). This optimisation allows Camel to reuse the same endpoint and its associated producer for all dynamic variations. This yields much lower resource overhead as the same http producer will be used for all the different variations of userid's. diff --git a/docs/components/modules/ROOT/pages/cxf-transport.adoc b/docs/components/modules/ROOT/pages/cxf-transport.adoc index c070fbf..06d7484 100644 --- a/docs/components/modules/ROOT/pages/cxf-transport.adoc +++ b/docs/components/modules/ROOT/pages/cxf-transport.adoc @@ -94,7 +94,7 @@ BusFactory.setDefaultBus(bus); ==== Namespace The elements used to configure a Camel transport endpoint are defined -in the namespace `http://cxf.apache.org/transports/camel`. It is +in the namespace `\http://cxf.apache.org/transports/camel`. It is commonly referred to using the prefix `camel`. In order to use the Camel transport configuration elements, you will need to add the lines shown below to the beans element of your endpoint's configuration file. In @@ -125,7 +125,7 @@ attribute takes the form _portQName_`.camel-destination`. The example below shows the `camel:destination` element that would be used to add configuration for an endpoint that was specified by the WSDL fragment `<port binding="widgetSOAPBinding" name="widgetSOAPPort">` if the -endpoint's target namespace was `http://widgets.widgetvendor.net`. +endpoint's target namespace was `\http://widgets.widgetvendor.net`. *camel:destination Element* @@ -173,7 +173,7 @@ _portQName_`.camel-conduit`. For example, the code below shows the `camel:conduit` element that would be used to add configuration for an endpoint that was specified by the WSDL fragment `<port binding="widgetSOAPBinding" name="widgetSOAPPort">` if the -endpoint's target namespace was `http://widgets.widgetvendor.net`. +endpoint's target namespace was `\http://widgets.widgetvendor.net`. *http-conf:conduit Element* @@ -218,7 +218,7 @@ The camel context id which you want inject into the camel conduit Camel Transport for CXF supports configuration with Blueprint. If you are using blueprint, you should use the namespace -`http://cxf.apache.org/transports/camel/blueprint` and import the schema +`\http://cxf.apache.org/transports/camel/blueprint` and import the schema like the blow. *Adding the Configuration Namespace for blueprint* diff --git a/docs/components/modules/ROOT/pages/freemarker-component.adoc b/docs/components/modules/ROOT/pages/freemarker-component.adoc index 63437a5..4feea09 100644 --- a/docs/components/modules/ROOT/pages/freemarker-component.adoc +++ b/docs/components/modules/ROOT/pages/freemarker-component.adoc @@ -29,7 +29,7 @@ freemarker:templateName[?options] Where *templateName* is the classpath-local URI of the template to invoke; or the complete URL of the remote template (eg: -file://folder/myfile.ftl[file://folder/myfile.ftl]). +`\file://folder/myfile.ftl`). You can append query options to the URI in the following format, `?option=value&option=value&...` diff --git a/docs/components/modules/ROOT/pages/ftp-component.adoc b/docs/components/modules/ROOT/pages/ftp-component.adoc index efb87c9..27a8d04 100644 --- a/docs/components/modules/ROOT/pages/ftp-component.adoc +++ b/docs/components/modules/ROOT/pages/ftp-component.adoc @@ -317,10 +317,13 @@ from("ftp://foo@myserver?password=secret&ftpClientConfig=#myConfig").to("bean:fo === Examples -`ftp://some...@someftpserver.com/public/upload/images/holiday2008?password=secret&binary=true` + +---- +ftp://some...@someftpserver.com/public/upload/images/holiday2008?password=secret&binary=true + +ftp://someonee...@someotherftpserver.co.uk:12049/reports/2008/password=secret&binary=false -`ftp://someonee...@someotherftpserver.co.uk:12049/reports/2008/password=secret&binary=false` + - `ftp://publicftpserver.com/download` +ftp://publicftpserver.com/download +---- === Concurrency diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc index 8c8d5b3..cdde045 100644 --- a/docs/components/modules/ROOT/pages/jetty-component.adoc +++ b/docs/components/modules/ROOT/pages/jetty-component.adoc @@ -235,7 +235,7 @@ consumer. Camel also populates *all* request.parameter and request.headers. For example, given a client request with the URL, -`http://myserver/myserver?orderid=123`, the exchange will contain a +`\http://myserver/myserver?orderid=123`, the exchange will contain a header named `orderid` with the value 123. You can get the request.parameter from the @@ -248,7 +248,7 @@ The Jetty component supports consumer endpoints. === Consumer Example In this sample we define a route that exposes a HTTP service at -`http://localhost:8080/myapp/myservice`: +`\http://localhost:8080/myapp/myservice`: *Usage of localhost* @@ -278,7 +278,7 @@ The following sample shows a content-based route that routes all requests containing the URI parameter, `one`, to the endpoint, `mock:one`, and all others to `mock:other`. -So if a client sends the HTTP request, `http://serverUri?one=hello`, the +So if a client sends the HTTP request, `\http://serverUri?one=hello`, the Jetty component will copy the HTTP request parameter, `one` to the exchange's `in.header`. We can then use the `simple` language to route exchanges that contain this header to a specific endpoint and all others @@ -375,7 +375,7 @@ Spring DSL based configuration of endpoint Configuring Jetty Directly Jetty provides SSL support out of the box. To enable Jetty to run in SSL -mode, simply format the URI with the `https://` prefix---for example: +mode, simply format the URI with the `\https://` prefix---for example: [source,xml] ---- diff --git a/docs/components/modules/ROOT/pages/jira-component.adoc b/docs/components/modules/ROOT/pages/jira-component.adoc index 3f184ce..ae07f4e 100644 --- a/docs/components/modules/ROOT/pages/jira-component.adoc +++ b/docs/components/modules/ROOT/pages/jira-component.adoc @@ -229,13 +229,13 @@ There are operations that requires `id` for fields suchs as: issue type, priorit Required: * `ProjectKey`: The project key, example: CAMEL, HHH, MYP. -* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. +* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `\http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. * `IssueSummary`: The summary of the issue. Optional: * `IssueAssignee`: the assignee user -* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `http://jira_server/rest/api/2/priority`. +* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `\http://jira_server/rest/api/2/priority`. * `IssueComponents`: A list of string with the valid component names. * `IssueWatchersAdd`: A list of strings with the usernames to add to the watcher list. * `IssueDescription`: The description of the issue. @@ -273,10 +273,10 @@ Required: ### UpdateIssue * `IssueKey`: The issue key identifier. -* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. +* `IssueTypeId` or `IssueTypeName`: The `id` of the issue type or the name of the issue type, you can see the valid list in `\http://jira_server/rest/api/2/issue/createmeta?projectKeys=SAMPLE_KEY`. * `IssueSummary`: The summary of the issue. * `IssueAssignee`: the assignee user -* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `http://jira_server/rest/api/2/priority`. +* `IssuePriorityId` or `IssuePriorityName`: The priority of the issue, you can see the valid list in `\http://jira_server/rest/api/2/priority`. * `IssueComponents`: A list of string with the valid component names. * `IssueDescription`: The description of the issue. diff --git a/docs/components/modules/ROOT/pages/milo-client-component.adoc b/docs/components/modules/ROOT/pages/milo-client-component.adoc index b32b6ce..b5c3b61 100644 --- a/docs/components/modules/ROOT/pages/milo-client-component.adoc +++ b/docs/components/modules/ROOT/pages/milo-client-component.adoc @@ -250,7 +250,7 @@ Input parameters are taken from the body: ==== Security policies -When setting the allowing security policies is it possible to use the well known OPC UA URIs (e.g. `http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15`) +When setting the allowing security policies is it possible to use the well known OPC UA URIs (e.g. `\http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15`) or to use the Milo enum literals (e.g. `None`). Specifying an unknown security policy URI or enum is an error. The known security policy URIs and enum literals are can be seen here: https://github.com/eclipse/milo/blob/master/opc-ua-stack/stack-core/src/main/java/org/eclipse/milo/opcua/stack/core/security/SecurityPolicy.java[SecurityPolicy.java] diff --git a/docs/components/modules/ROOT/pages/netty4-http-component.adoc b/docs/components/modules/ROOT/pages/netty4-http-component.adoc index 1c33ec8..a6515e4 100644 --- a/docs/components/modules/ROOT/pages/netty4-http-component.adoc +++ b/docs/components/modules/ROOT/pages/netty4-http-component.adoc @@ -335,7 +335,7 @@ The description in the table takes offset in a route having: |`CamelHttpMethod` |`String` |The HTTP method used, such as GET, POST, TRACE etc. |`CamelHttpUrl` |`String` |The URL including protocol, host and port, etc: -`http://0.0.0.0:8080/myapp` +`\http://0.0.0.0:8080/myapp` |`CamelHttpUri` |`String` |The URI without protocol, host and port, etc: `/myapp` @@ -407,8 +407,8 @@ from("netty4-http:http://0.0.0.0:8123/foo").to("mock:foo"); In the route above Netty4 HTTP will only match if the uri is an exact match, so it will match if you enter + - `http://0.0.0.0:8123/foo` but not match if you do -`http://0.0.0.0:8123/foo/bar`. + `\http://0.0.0.0:8123/foo` but not match if you do +`\http://0.0.0.0:8123/foo/bar`. So if you want to enable wildcard matching you do as follows: diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc index aa73ceb..5cbb151 100644 --- a/docs/components/modules/ROOT/pages/properties-component.adoc +++ b/docs/components/modules/ROOT/pages/properties-component.adoc @@ -559,7 +559,7 @@ assertMockEndpointsSatisfied(); *Available as of Camel 2.7* In the example below we use the `prop` prefix for the namespace -`http://camel.apache.org/schema/placeholder` by which we can use the +`\http://camel.apache.org/schema/placeholder` by which we can use the `prop` prefix in the attributes in the XML DSLs. Notice how we use that in the Multicast to indicate that the option `stopOnException` should be the value of the placeholder with the key diff --git a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc index 0e47121..df9af59 100644 --- a/docs/components/modules/ROOT/pages/rest-swagger-component.adoc +++ b/docs/components/modules/ROOT/pages/rest-swagger-component.adoc @@ -43,7 +43,7 @@ If the `specificationPath` is not specified it defaults to load the resource, which means that you can use CLASSPATH resources (`classpath:my-specification.json`), files (`file:/some/path.json`), the web -(`http://api.example.com/swagger.json`) or reference a bean +(`\http://api.example.com/swagger.json`) or reference a bean (`ref:nameOfBean`) or use a method of a bean (`bean:nameOfBean.methodName`) to get the specification resource, failing that Swagger's own resource loading support. @@ -62,7 +62,7 @@ or on the endpoint. Typically you would just need to override the NOTE: The `host` parameter should contain the absolute URI containing scheme, hostname and port number, for instance: -`https://api.example.com` +`\https://api.example.com` With `componentName` you specify what component is used to perform the requests, this named component needs to be present in the Camel context @@ -96,7 +96,7 @@ The REST Swagger component supports 10 options, which are listed below. | *consumes* (producer) | What payload type this component capable of consuming. Could be one type, like application/json or multiple types as application/json, application/xml; q=0.5 according to the RFC7231. This equates to the value of Accept HTTP header. If set overrides any value found in the Swagger specification. Can be overridden in endpoint configuration | | String | *host* (producer) | Scheme hostname and port to direct the HTTP requests to in the form of https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in endpoint configurati [...] | *produces* (producer) | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String -| *specificationUri* (producer) | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can be overridden in en [...] +| *specificationUri* (producer) | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can be overridden in e [...] | *sslContextParameters* (security) | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context | | SSLContextParameters | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean @@ -119,7 +119,7 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *specificationUri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource from the classpath. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. http://api.example.com:8080). Overrides compo [...] +| *specificationUri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource from the classpath. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \http://api.example.com:8080). Overrides comp [...] | *operationId* | *Required* ID of the operation from the Swagger specification. | | String |=== @@ -171,7 +171,7 @@ The component supports 11 options, which are listed below. | *camel.component.rest-swagger.host* | Scheme hostname and port to direct the HTTP requests to in the form of https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in en [...] | *camel.component.rest-swagger.produces* | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String | *camel.component.rest-swagger.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean -| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can [...] +| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can [...] | *camel.component.rest-swagger.ssl-context-parameters* | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.rest-swagger.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean |=== diff --git a/docs/components/modules/ROOT/pages/restlet-component.adoc b/docs/components/modules/ROOT/pages/restlet-component.adoc index fe3c48a..e24cb61 100644 --- a/docs/components/modules/ROOT/pages/restlet-component.adoc +++ b/docs/components/modules/ROOT/pages/restlet-component.adoc @@ -399,7 +399,7 @@ And add this to your web.xml; ---- You will then be able to access the deployed route at -`http://localhost:8080/mywebapp/rs/demo/1234` where; +`\http://localhost:8080/mywebapp/rs/demo/1234` where; `localhost:8080` is the server and port of your servlet container + `mywebapp` is the name of your deployed webapp + diff --git a/docs/components/modules/ROOT/pages/spring-ws-component.adoc b/docs/components/modules/ROOT/pages/spring-ws-component.adoc index 34ff452..42b464e 100644 --- a/docs/components/modules/ROOT/pages/spring-ws-component.adoc +++ b/docs/components/modules/ROOT/pages/spring-ws-component.adoc @@ -217,7 +217,7 @@ faultAction option if present ### Accessing web services -To call a web service at `http://foo.com/bar` simply define a route: +To call a web service at `\http://foo.com/bar` simply define a route: [source,java] --------------------------------------------------------- @@ -526,7 +526,7 @@ With the XML configuration in-place you can now use Camel's DSL to define what web service requests are handled by your endpoint: The following route will receive all web service requests that have a -root element named "GetFoo" within the `http://example.com/` namespace. +root element named "GetFoo" within the `\http://example.com/` namespace. [source,java] ---------------------------------------------------------------------------------------- @@ -535,7 +535,7 @@ from("spring-ws:rootqname:{http://example.com/}GetFoo?endpointMapping=#endpointM ---------------------------------------------------------------------------------------- The following route will receive web service requests containing the -`http://example.com/GetFoo` SOAP action. +`\http://example.com/GetFoo` SOAP action. [source,java] --------------------------------------------------------------------------------------- @@ -544,7 +544,7 @@ from("spring-ws:soapaction:http://example.com/GetFoo?endpointMapping=#endpointMa --------------------------------------------------------------------------------------- The following route will receive all requests sent to -`http://example.com/foobar`. +`\http://example.com/foobar`. [source,java] -------------------------------------------------------------------------------- diff --git a/docs/components/modules/ROOT/pages/undertow-component.adoc b/docs/components/modules/ROOT/pages/undertow-component.adoc index 8ec4319..480d953 100644 --- a/docs/components/modules/ROOT/pages/undertow-component.adoc +++ b/docs/components/modules/ROOT/pages/undertow-component.adoc @@ -160,7 +160,7 @@ the chunked encoding on the camel-undertow consumer. Camel also populates *all* request.parameter and request.headers. For example, given a client request with the URL, -`http://myserver/myserver?orderid=123`, the exchange will contain a +`\http://myserver/myserver?orderid=123`, the exchange will contain a header named `orderid` with the value 123. === HTTP Producer Example @@ -189,7 +189,7 @@ or in XML === HTTP Consumer Example In this sample we define a route that exposes a HTTP service at -`http://localhost:8080/myapp/myservice`: +`\http://localhost:8080/myapp/myservice`: [source,xml] ---- @@ -202,7 +202,7 @@ In this sample we define a route that exposes a HTTP service at === WebSocket Example In this sample we define a route that exposes a WebSocket service at -`http://localhost:8080/myapp/mysocket` and returns back a response to the same channel: +`\http://localhost:8080/myapp/mysocket` and returns back a response to the same channel: [source,xml] ---- diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc index a934814..ba270cd 100644 --- a/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc +++ b/docs/components/modules/ROOT/pages/xmlsecurity-component.adoc @@ -208,7 +208,7 @@ https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/mai which reads the public key from a keystore. In the example, the default signature algorithm -`http://www.w3.org/2000/09/xmldsig#rsa-sha1` is used. You can set the +`\http://www.w3.org/2000/09/xmldsig#rsa-sha1` is used. You can set the signature algorithm of your choice by the option `signatureAlgorithm` (see below). The signer endpoint creates an _enveloping_ XML signature. If you want to create an _enveloped_ XML signature then you must specify diff --git a/docs/components/modules/ROOT/pages/xpath-language.adoc b/docs/components/modules/ROOT/pages/xpath-language.adoc index 31fe4c2..7fb324b 100644 --- a/docs/components/modules/ROOT/pages/xpath-language.adoc +++ b/docs/components/modules/ROOT/pages/xpath-language.adoc @@ -66,7 +66,7 @@ Namespaces helper class. === Variables Variables in XPath is defined in different namespaces. The default -namespace is `http://camel.apache.org/schema/spring`. +namespace is `\http://camel.apache.org/schema/spring`. [width="100%",cols="10%,10%,10%,70%",options="header",] |=== diff --git a/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc b/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc index 7037c97..7163e69 100644 --- a/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc +++ b/docs/user-manual/modules/ROOT/pages/book-getting-started.adoc @@ -236,7 +236,7 @@ the relationship between URI and URL, or indeed its relationship with other acronyms such as IRI and URN. Most people are familiar with _URLs_ (uniform resource locators), such -as `http://...`, `ftp://...`, `mailto:...`. Put simply, a URL specifies +as `\http://...`, `\ftp://...`, `\mailto:...:`. Put simply, a URL specifies the _location_ of a resource. A _URI_ (uniform resource identifier) is a URL _or_ a URN. So, to fully diff --git a/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc b/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc index 6ca8f56..ed42735 100644 --- a/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc +++ b/docs/user-manual/modules/ROOT/pages/dead-letter-channel.adoc @@ -335,7 +335,7 @@ from("activemq:queue:foo") Now suppose the route above and a failure happens in the `foo` bean. Then the `Exchange.TO_ENDPOINT` and `Exchange.FAILURE_ENDPOINT` will -still contain the value of `http://someserver/somepath`. +still contain the value of `\http://someserver/somepath`. [[deadLetterChannel-OnPrepareFailure]] === OnPrepareFailure diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc index 92490c1..d65f2bf 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-let-jetty-match-wildcards.adoc @@ -11,8 +11,8 @@ from("jetty://0.0.0.0:8123/foo").to("mock:foo"); In the route above xref:jetty-component.adoc[Jetty] will only match if the uri is an exact match, so it will match if you enter -`http://0.0.0.0:8123/foo` but not match if you do -`http://0.0.0.0:8123/foo/bar`. +`\http://0.0.0.0:8123/foo` but not match if you do +`\http://0.0.0.0:8123/foo/bar`. So if you want to enable wildcard matching you do as follows: diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-to-switch-the-cxf-consumer-between-http-and-https-without-touching-the-spring-configuration.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-to-switch-the-cxf-consumer-between-http-and-https-without-touching-the-spring-configuration.adoc index 2e3d885..fc396c7 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/how-to-switch-the-cxf-consumer-between-http-and-https-without-touching-the-spring-configuration.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/how-to-switch-the-cxf-consumer-between-http-and-https-without-touching-the-spring-configuration.adoc @@ -5,7 +5,7 @@ You can find general information how to secure your Camel CXF Consumer with HTTPS http://cxf.apache.org/docs/client-http-transport-including-ssl-support.html[here]. -A simple Camel CXF Consumer configuration which use the `http:conduit` +A simple Camel CXF Consumer configuration which use the `\http:conduit` configuration to enable SSL and an external properties file for all environment specific configurations could looks like: @@ -83,6 +83,6 @@ With this configuration, you Camel CXF consumer connects with HTTPS to the web service provider. If you need to change the protocol to HTTP, maybe for tracing/debugging reasons, change the `endpointUri` property in your properties file to -e.g. `http://localhost:8080/OrderEntry`. That's all! Isn't it easy? +e.g. `\http://localhost:8080/OrderEntry`. That's all! Isn't it easy? Apache CXF detects that you "only" use HTTP and instantiates a `HttpURLConnectionFactoryImpl` instead of a `HttpsURLConnectionFactory`. diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc index 5933d11..43be56d 100644 --- a/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc +++ b/docs/user-manual/modules/ROOT/pages/rest-dsl.adoc @@ -488,7 +488,7 @@ bindings. will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use - `file:` or `http:` to refer to resources to load from file or http url. + `file:` or `\http:` to refer to resources to load from file or http url. |scheme | http|The scheme to use for exposing the REST service. Usually http or https is supported |host |- |The hostname to use for exposing the REST service. |useXForwardHeaders |true |Whether to use X-Forwarded-Host (or Host) from incoming HTTP Header to set the hostname diff --git a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc index 35d3c68..399db8a 100644 --- a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc +++ b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc @@ -199,7 +199,7 @@ from("direct:login") .removeHeader(Exchange.HTTP_QUERY); ---- -Where _expression_ will be evaluated dynamically. Notice how the uri in `toD` is now static (`http:myloginserver:8080`). +Where _expression_ will be evaluated dynamically. Notice how the uri in `toD` is now static (`\http:myloginserver:8080`). This optimisation allows Camel to reuse the same endpoint and its associated producer for all dynamic variations. This yields much lower resource overhead as the same http producer will be used for all the different variations of userid's. diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc index e103f6c..9bbf752 100644 --- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc +++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc @@ -489,7 +489,7 @@ placeholder key. This is now possible from Camel 2.7 on using a special placeholder namespace. In the example below we use the `prop` prefix for the namespace -`http://camel.apache.org/schema/placeholder` by which we can use the +`\http://camel.apache.org/schema/placeholder` by which we can use the `prop` prefix in the attributes in the XML DSLs. Notice how we use that in the xref:multicast.adoc[Multicast] to indicate that the option `stopOnException` should be the value of the placeholder with the key diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/readme.adoc b/examples/camel-example-fhir-auth-tx-spring-boot/readme.adoc index ae76f90..a51ad74 100644 --- a/examples/camel-example-fhir-auth-tx-spring-boot/readme.adoc +++ b/examples/camel-example-fhir-auth-tx-spring-boot/readme.adoc @@ -13,7 +13,7 @@ This example will read patients stored in csv files from a directory and convert The example assumes you have a running FHIR server at your disposal, which is configured for basic authentication. You may use [hapi-fhir-jpa-server-example](https://github.com/rkorytkowski/hapi-fhir/tree/basic-auth/hapi-fhir-jpaserver-example). You can start it up by running `mvn jetty:run`. -By default, the example uses `http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3` as the FHIR server URL, DSTU3 as the FHIR version, BASIC authentication (`admin` as username and `Admin123` as password) and `target/work/fhir/input` +By default, the example uses `\http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3` as the FHIR server URL, DSTU3 as the FHIR version, BASIC authentication (`admin` as username and `Admin123` as password) and `target/work/fhir/input` as the directory to look for csv patients. However, you can edit the `application.properties` file to change the defaults and provide your own configuration. diff --git a/examples/camel-example-fhir-spring-boot/readme.adoc b/examples/camel-example-fhir-spring-boot/readme.adoc index 5a1cb7f..e487dc0 100644 --- a/examples/camel-example-fhir-spring-boot/readme.adoc +++ b/examples/camel-example-fhir-spring-boot/readme.adoc @@ -13,7 +13,7 @@ This example will read HL7V2 patients from a directory and convert them to FHIR The example assumes you have a running FHIR server at your disposal. You may use [hapi-fhir-jpa-server-example](https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example) -By default, the example uses `http://localhost:8080/baseDstu3` as the FHIR server URL, DSTU3 as the FHIR version and `target/work/fhir/input` +By default, the example uses `\http://localhost:8080/baseDstu3` as the FHIR server URL, DSTU3 as the FHIR version and `target/work/fhir/input` as the directory to look for HL7V2 patients. However, you can edit the `application.properties` file to override the defaults and provide your own configuration. diff --git a/examples/camel-example-spring-boot-rest-swagger/README.adoc b/examples/camel-example-spring-boot-rest-swagger/README.adoc index 0ff8521..35a52bc 100644 --- a/examples/camel-example-spring-boot-rest-swagger/README.adoc +++ b/examples/camel-example-spring-boot-rest-swagger/README.adoc @@ -66,7 +66,7 @@ The command will produce the following output: } ] ---- -The Swagger documentation is located at: `http://localhost:8080/api/api-doc` and can be retrieved with the following command: +The Swagger documentation is located at: `\http://localhost:8080/api/api-doc` and can be retrieved with the following command: [source,text] ---- diff --git a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java index abc6889..36cda8c 100644 --- a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java @@ -82,7 +82,7 @@ public class RestSwaggerComponentConfiguration * load swagger.json resource. Note that the host defined on the component * and endpoint of this Component should contain the scheme, hostname and * optionally the port in the URI syntax (i.e. - * https://api.example.com:8080). Can be overridden in endpoint + * \https://api.example.com:8080). Can be overridden in endpoint * configuration. */ private URI specificationUri;