You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/11/20 07:40:19 UTC

[camel] branch master updated: Fix broken layout and links in camel-cxf docs

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


The following commit(s) were added to refs/heads/master by this push:
     new 8ae1db6  Fix broken layout and links in camel-cxf docs
8ae1db6 is described below

commit 8ae1db6229013894ad287efdfe09db49bf2654af
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Mon Nov 20 11:59:57 2017 +0900

    Fix broken layout and links in camel-cxf docs
---
 .../camel-cxf/src/main/docs/cxf-component.adoc     | 28 +++++++++-------------
 .../camel-cxf/src/main/docs/cxfrs-component.adoc   | 26 ++++++++++----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 68ee9b4..679b9a7 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -29,24 +29,19 @@ relayHeaders option]
 **** link:#CXF-ChangessinceRelease2.0[Changes since Release 2.0]
 ** link:#CXF-ConfiguretheCXFendpointswithSpring[Configure the CXF
 endpoints with Spring]
-**
-link:#CXF-ConfiguringtheCXFEndpointswithApacheAriesBlueprint.[Configuring
+** link:#CXF-ConfiguringtheCXFEndpointswithApacheAriesBlueprint.[Configuring
 the CXF Endpoints with Apache Aries Blueprint.]
-**
-link:#CXF-Howtomakethecamel-cxfcomponentuselog4jinsteadofjava.util.logging[How
+** link:#CXF-Howtomakethecamel-cxfcomponentuselog4jinsteadofjava.util.logging[How
 to make the camel-cxf component use log4j instead of java.util.logging]
 ** link:#CXF-Howtoletcamel-cxfresponsemessagewithxmlstartdocument[How to
 let camel-cxf response message with xml start document]
 ** link:#CXF-HowtooverridetheCXFproduceraddressfrommessageheader[How to
 override the CXF producer address from message header]
-**
-link:#CXF-Howtoconsumeamessagefromacamel-cxfendpointinPOJOdataformat[How
+** link:#CXF-Howtoconsumeamessagefromacamel-cxfendpointinPOJOdataformat[How
 to consume a message from a camel-cxf endpoint in POJO data format]
-**
-link:#CXF-Howtopreparethemessageforthecamel-cxfendpointinPOJOdataformat[How
+** link:#CXF-Howtopreparethemessageforthecamel-cxfendpointinPOJOdataformat[How
 to prepare the message for the camel-cxf endpoint in POJO data format]
-**
-link:#CXF-Howtodealwiththemessageforacamel-cxfendpointinPAYLOADdataformat[How
+** link:#CXF-Howtodealwiththemessageforacamel-cxfendpointinPAYLOADdataformat[How
 to deal with the message for a camel-cxf endpoint in PAYLOAD data
 format]
 ** link:#CXF-HowtogetandsetSOAPheadersinPOJOmode[How to get and set SOAP
@@ -57,8 +52,7 @@ SOAP headers in PAYLOAD mode]
 not available in MESSAGE mode]
 ** link:#CXF-HowtothrowaSOAPFaultfromCamel[How to throw a SOAP Fault
 from Camel]
-**
-link:#CXF-Howtopropagateacamel-cxfendpointrequestandresponsecontext[How
+** link:#CXF-Howtopropagateacamel-cxfendpointrequestandresponsecontext[How
 to propagate a camel-cxf endpoint's request and response context]
 ** link:#CXF-AttachmentSupport[Attachment Support]
 ** link:#CXF-StreamingSupportinPAYLOADmode[Streaming Support in PAYLOAD
@@ -316,7 +310,7 @@ ambiguity in name spaces to relay instance mappings.
 Take a look at the tests that show how you'd be able to relay/drop
 headers here:
 
-https://svn.apache.org/repos/asf/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java[https://svn.apache.org/repos/asf/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java]
+https://github.com/apache/camel/blob/master/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java[https://github.com/apache/camel/blob/master/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java]
 
 [[CXF-ChangessinceRelease2.0]]
 Changes since Release 2.0
@@ -507,7 +501,7 @@ the Spring `<bean class="MyServiceFactory"/>` syntax
 
 You can find more advanced examples that show how to provide
 interceptors, properties and handlers on the CXF
-https://cwiki.apache.org/CXF20DOC/JAX-WS+Configuration[JAX-WS
+http://cxf.apache.org/docs/jax-ws-configuration.html[JAX-WS
 Configuration page].
 
 *NOTE* 
@@ -655,7 +649,7 @@ setting the message with the key of "CamelDestinationOverrideUrl".
 ### How to consume a message from a camel-cxf endpoint in POJO data format
 
 The `camel-cxf` endpoint consumer POJO data format is based on the
-http://cwiki.apache.org/CXF20DOC/invokers.html[cxf invoker], so the
+http://cxf.apache.org/docs/invokers.html[CXF invoker], so the
 message header has a property with the name of
 `CxfConstants.OPERATION_NAME` and the message body is a list of the SEI
 method parameters.
@@ -663,7 +657,7 @@ method parameters.
 ### How to prepare the message for the camel-cxf endpoint in POJO data format
 
 The `camel-cxf` endpoint producer is based on the
-https://svn.apache.org/repos/asf/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java[cxf
+https://github.com/apache/cxf/blob/master/core/src/main/java/org/apache/cxf/endpoint/Client.java[CXF
 client API]. First you need to specify the operation name in the message
 header, then add the method parameters to a list, and initialize the
 message with this parameter list. The response message's body is a
@@ -763,7 +757,7 @@ body and also indicate it's a fault by calling Message.setFault(true):
 
 ### How to propagate a camel-cxf endpoint's request and response context
 
-https://svn.apache.org/repos/asf/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Client.java[cxf
+https://github.com/apache/cxf/blob/master/core/src/main/java/org/apache/cxf/endpoint/Client.java[CXF
 client API] provides a way to invoke the operation with request and
 response context. If you are using a `camel-cxf` endpoint producer to
 invoke the outside web service, you can set the request context and get
diff --git a/components/camel-cxf/src/main/docs/cxfrs-component.adoc b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
index 150aa1a..b33f1ba 100644
--- a/components/camel-cxf/src/main/docs/cxfrs-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
@@ -130,14 +130,14 @@ You can also configure the CXF REST endpoint through the spring
 configuration. Since there are lots of difference between the CXF REST
 client and CXF REST Server, we provide different configuration for
 them. Please check out the
-http://svn.apache.org/repos/asf/camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
-file] and https://cwiki.apache.org/CXF20DOC/JAX-RS[CXF JAX-RS
+https://github.com/apache/camel/blob/master/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
+file] and http://cxf.apache.org/docs/jax-rs.html[CXF JAX-RS
 documentation] for more information.
 
 ### How to configure the REST endpoint in Camel
 
 In
-http://svn.apache.org/repos/asf/camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
+https://github.com/apache/camel/blob/master/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
 schema file], there are two elements for the REST endpoint definition.
 *cxf:rsServer* for REST consumer, *cxf:rsClient* for REST producer. +
  You can find a Camel REST service route configuration example here.
@@ -285,10 +285,10 @@ https://svn.apache.org/repos/asf/camel/trunk/components/camel-cxf/src/test/java/
 
 ### Consuming a REST Request - Default Binding Style
 
-The https://cwiki.apache.org/CXF20DOC/JAX-RS[CXF JAXRS front end]
-implements the https://jsr311.java.net/[JAX-RS (JSR-311) API], so we can
+The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end]
+implements the https://javaee.github.io/jsr311/[JAX-RS (JSR-311) API], so we can
 export the resources classes as a REST service. And we leverage the
-http://cwiki.apache.org/confluence/display/CXF20DOC/Invokers[CXF Invoker
+http://cxf.apache.org/docs/invokers.html[CXF Invoker
 API] to turn a REST request into a normal Java object method
 invocation. +
  Unlike the link:restlet.html[Camel Restlet] component, you don't need
@@ -320,12 +320,12 @@ for post-processing JAX-RS Responses in custom processors.
 
 ### How to invoke the REST service through camel-cxfrs producer
 
-The https://cwiki.apache.org/CXF20DOC/JAX-RS[CXF JAXRS front end]
+The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end]
 implements
-https://cwiki.apache.org/CXF20DOC/JAX-RS+Client+API#JAX-RSClientAPI-Proxy-basedAPI[a
+http://cxf.apache.org/docs/jax-rs-client-api.html#JAX-RSClientAPI-Proxy-basedAPI[a
 proxy-based client API], with this API you can invoke the remote REST
 service through a proxy. The `camel-cxfrs` producer is based on this
-https://cwiki.apache.org/CXF20DOC/JAX-RS+Client+API#JAX-RSClientAPI-Proxy-basedAPI[proxy
+http://cxf.apache.org/docs/jax-rs-client-api.html#JAX-RSClientAPI-Proxy-basedAPI[proxy
 API]. +
  You just need to specify the operation name in the message header and
 prepare the parameter in the message body, the camel-cxfrs producer will
@@ -333,9 +333,9 @@ generate right REST request for you.
 
 Here is an example:
 
-The https://cwiki.apache.org/CXF20DOC/JAX-RS[CXF JAXRS front end] also
+The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end] also
 provides
-https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Client+API#JAX-RSClientAPI-CXFWebClientAPI[a
+http://cxf.apache.org/docs/jax-rs-client-api.html#JAX-RSClientAPI-CXFWebClientAPI[a
 http centric client API]. You can also invoke this API from
 `camel-cxfrs` producer. You need to specify the
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Exchange.html#HTTP_PATH[HTTP_PATH]
@@ -355,5 +355,5 @@ Error formatting macro: snippet: java.lang.IndexOutOfBoundsException:
 Index: 20, Size: 20
 
 To support the Dynamical routing, you can override the URI's query
-parameters by using the CxfConstants.CAMEL_CXF_RS_QUERY_MAP header to
-set the parameter map for it.
+parameters by using the http://camel.apache.org/maven/current/camel-cxf/apidocs/org/apache/camel/component/cxf/CxfConstants.html#CAMEL_CXF_RS_QUERY_MAP[CxfConstants.CAMEL_CXF_RS_QUERY_MAP]
+header to set the parameter map for it.

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].