Clone
 

freeman fang <freeman.fang@gmail.com> in camel-git

Merge branch 'master' of github.com:apache/camel

remove unnecessary comment code

(cherry picked from commit 33c143b257ae3da43f6a9f4177e8993772baaf37)

remove unnecessary comment code

remove unnecessary comment code

(cherry picked from commit 33c143b257ae3da43f6a9f4177e8993772baaf37)

(cherry picked from commit 81a7b9a467dcabbbb0c327fa2656b280b87b6541)

(cherry picked from commit 241ad96dd8083f740605eaa4857c4057bfe5469a)

remove unnecessary comment code

(cherry picked from commit 33c143b257ae3da43f6a9f4177e8993772baaf37)

(cherry picked from commit 81a7b9a467dcabbbb0c327fa2656b280b87b6541)

Merge branch 'master' of github.com:apache/camel

[CAMEL-13942]UnitOfWork should be done after send back response

(cherry picked from commit 101c4eb80b4d1aa6bd267a72d8fe315f74d917a9)

(cherry picked from commit 4b176b5a3b7cbff552312fb443d3b4d98eb7d43d)

Conflicts:

components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java

[CAMEL-13942]UnitOfWork should be done after send back response

(cherry picked from commit 101c4eb80b4d1aa6bd267a72d8fe315f74d917a9)

[CAMEL-13942]UnitOfWork should be done after send back response

(cherry picked from commit 101c4eb80b4d1aa6bd267a72d8fe315f74d917a9)

(cherry picked from commit 4b176b5a3b7cbff552312fb443d3b4d98eb7d43d)

Conflicts:

components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConsumer.java

(cherry picked from commit 5746bbfe720f6449a73f43bc108c499965fcc14c)

[CAMEL-13942]UnitOfWork should be done after send back response

[CAMEL-13891]camel-cxf - Add spring.schemas for -spring URL so it works for same online url

[CAMEL-13898]ensure camel-cxf consumer can propagate protocol headers from camel exchange headers when throwing a soap fault

(cherry picked from commit e5bb417c5b1d06c9cee18443f0b30fbc808eae02)

[CAMEL-13898]ensure camel-cxf consumer can propagate protocol headers from camel exchange headers when throwing a soap fault

[CAMEL-13898]ensure camel-cxf consumer can propagate protocol headers from camel exchange headers when throwing a soap fault

(cherry picked from commit e5bb417c5b1d06c9cee18443f0b30fbc808eae02)

(cherry picked from commit fdfa5b4c4c7ec301bf39dfc597bd6aaf6dcfeb21)

[CAMEL-13898]ensure camel-cxf consumer can propagate protocol headers from camel exchange headers when throwing a soap fault

(cherry picked from commit e5bb417c5b1d06c9cee18443f0b30fbc808eae02)

(cherry picked from commit fdfa5b4c4c7ec301bf39dfc597bd6aaf6dcfeb21)

(cherry picked from commit cb6135a7bc018035594a9853f65891038dc5e7bd)

[CAMEL-13876]enable camel-undertow component to set custom HttpHandler

upgrade to CXF 3.3.3, and this will fix CAMEL-12957

upgrade to CXF 3.3.3, and this will fix CAMEL-12957

Merge branch 'master' of github.com:apache/camel

[CAMEL-13424]avoid using hardcode port in test

[CAMEL-13424]avoid using hardcode port in test

(cherry picked from commit b13bbfd7c1dacaf126b72cbf5ba72a9c5b505c18)

Conflicts:

components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java

(cherry picked from commit 31af2fc0966ae92e4bd412699ec6424ec93e39ae)

(cherry picked from commit 86126c61ab118f86f3ed0740e7677d34e39f1b43)

[CAMEL-13424]avoid using hardcode port in test

(cherry picked from commit b13bbfd7c1dacaf126b72cbf5ba72a9c5b505c18)

Conflicts:

components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java

(cherry picked from commit 31af2fc0966ae92e4bd412699ec6424ec93e39ae)

[CAMEL-13424]avoid using hardcode port in test

(cherry picked from commit b13bbfd7c1dacaf126b72cbf5ba72a9c5b505c18)

Conflicts:

components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java

[CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)

[CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)

(cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d)

(cherry picked from commit 3616ab9ea34c6ca1532b657179ca7ada6132907c)

(cherry picked from commit 0f7408b8944e6481c21c2212536f6a9f4b7dea83)

[CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)

(cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d)

[CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)

(cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d)

(cherry picked from commit 3616ab9ea34c6ca1532b657179ca7ada6132907c)

[CAMEL-13724]camel route customized id isn't correct if there are more than one Rest DSL route availble

(cherry picked from commit 457479046dec039ffb1e23e69f15804df71d34b8)

(cherry picked from commit 39ad88e5e0e2fe05f59dd7ab94d9fefed97f6ec0)

[CAMEL-13724]camel route customized id isn't correct if there are more than one Rest DSL route availble

[CAMEL-13724]camel route customized id isn't correct if there are more than one Rest DSL route availble

(cherry picked from commit 457479046dec039ffb1e23e69f15804df71d34b8)