[camel] branch master updated: adding an example about using camel headers
This is an automated email from the ASF dual-hosted git repository.
valdar 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 1e81303 adding an example about using camel headers
new 166e33e Merge pull request #2979 from Bican007/patch-1
1e81303 is described below
commit 1e81303bb19b8d6d4de537a200c25136e76f8392
Author: Bican007
AuthorDate: Mon Jun 17 07:52:02 2019 +0200
adding an example about using camel headers
---
components/camel-saxon/src/main/docs/xquery-component.adoc | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc
b/components/camel-saxon/src/main/docs/xquery-component.adoc
index fb4e5d7..fc267f0 100644
--- a/components/camel-saxon/src/main/docs/xquery-component.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-component.adoc
@@ -235,7 +235,17 @@ from("direct:start").
transform().xquery("/people/person/text()", String.class);
-
-
+If you want to use camel variables like headers, you have to explicitly
declare them in the xquery expression.
+[source,xml]
+-
+
+
+declare variable $in.headers.foo external;
+element item {$in.headers.foo}
+
+
+-
+
### Using XQuery as an endpoint
[camel] 01/02: Add release notes for release 2.23.3
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 587efa61d5536fddc066231dfaabb213019739b7 Author: Gregor Zurowski AuthorDate: Mon Jun 17 07:29:16 2019 +0200 Add release notes for release 2.23.3 --- .../en/release-notes/camel-2233-release.adoc | 40 ++ 1 file changed, 40 insertions(+) diff --git a/docs/user-manual/en/release-notes/camel-2233-release.adoc b/docs/user-manual/en/release-notes/camel-2233-release.adoc new file mode 100644 index 000..c5d9b81 --- /dev/null +++ b/docs/user-manual/en/release-notes/camel-2233-release.adoc @@ -0,0 +1,40 @@ +[[Camel2.23.3Release-Camel2.23.3Release]] +== Camel 2.23.3 Release + +### New and Noteworthy + +Welcome to the Apache Camel 2.23.3 release which is a maintenance patch release and resolved +32 issues. + + +### Known Issues + +* See <> + +### Important changes to consider when upgrading + +* See <> + +### Getting the Binaries using Maven + +To use this release in your maven project, the proper dependency +configuration that you should use in your +http://maven.apache.org/guides/introduction/introduction-to-the-pom.html[Maven +POM] is: + +[source,java] +- + + org.apache.camel + camel-core + 2.23.3 + +- + +### Changelog + +For a more detailed view of new features and bug fixes, see the: + +https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12345358=12311211[Release +notes for 2.23.3] +
[camel] branch master updated (1e2a4bc -> 65c9e1f)
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1e2a4bc Add XML schema references for release 2.23.3
new 587efa6 Add release notes for release 2.23.3
new 65c9e1f Add release notes for release 2.22.5
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{camel-2224-release.adoc => camel-2225-release.adoc} | 14 +++---
.../{camel-2231-release.adoc => camel-2233-release.adoc} | 14 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
copy docs/user-manual/en/release-notes/{camel-2224-release.adoc =>
camel-2225-release.adoc} (78%)
copy docs/user-manual/en/release-notes/{camel-2231-release.adoc =>
camel-2233-release.adoc} (78%)
[camel] 02/02: Add release notes for release 2.22.5
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 65c9e1fb56f994a43d6dd4a4249f229c32d63282 Author: Gregor Zurowski AuthorDate: Mon Jun 17 07:30:33 2019 +0200 Add release notes for release 2.22.5 --- .../en/release-notes/camel-2225-release.adoc | 40 ++ 1 file changed, 40 insertions(+) diff --git a/docs/user-manual/en/release-notes/camel-2225-release.adoc b/docs/user-manual/en/release-notes/camel-2225-release.adoc new file mode 100644 index 000..cf1e464 --- /dev/null +++ b/docs/user-manual/en/release-notes/camel-2225-release.adoc @@ -0,0 +1,40 @@ +[[Camel2.22.5Release-Camel2.22.5Release]] +== Camel 2.22.5 Release + +### New and Noteworthy + +Welcome to the Apache Camel 2.22.5 release which is a maintenance patch release and resolved +13 issues. + + +### Known Issues + +* See <> + +### Important changes to consider when upgrading + +* See <> + +### Getting the Binaries using Maven + +To use this release in your maven project, the proper dependency +configuration that you should use in your +http://maven.apache.org/guides/introduction/introduction-to-the-pom.html[Maven +POM] is: + +[source,java] +- + + org.apache.camel + camel-core + 2.22.5 + +- + +### Changelog + +For a more detailed view of new features and bug fixes, see the: + +https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12345404=12311211[Release +notes for 2.22.5] +
[camel] branch master updated: Add XML schema references for release 2.23.3
This is an automated email from the ASF dual-hosted git repository. gzurowski 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 1e2a4bc Add XML schema references for release 2.23.3 1e2a4bc is described below commit 1e2a4bcb7f2b5fb2b80b6d469b26af2389a281ed Author: Gregor Zurowski AuthorDate: Mon Jun 17 07:26:11 2019 +0200 Add XML schema references for release 2.23.3 Signed-off-by: Gregor Zurowski --- components/camel-cxf/src/main/resources/META-INF/spring.schemas | 1 + .../camel-spring-integration/src/main/resources/META-INF/spring.schemas | 1 + .../camel-spring-security/src/main/resources/META-INF/spring.schemas | 1 + components/camel-spring/src/main/resources/META-INF/spring.schemas | 1 + 4 files changed, 4 insertions(+) diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas b/components/camel-cxf/src/main/resources/META-INF/spring.schemas index c66a10a..cc25b21 100644 --- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas +++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas @@ -134,6 +134,7 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.22.5.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.23.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.23.1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.23.2.xsd=schema/cxfEndpoint.xsd +http\://camel.apache.org/schema/cxf/camel-cxf-2.23.3.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-2.24.0.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-3.0.0-M1.xsd=schema/cxfEndpoint.xsd http\://camel.apache.org/schema/cxf/camel-cxf-3.0.0-M2.xsd=schema/cxfEndpoint.xsd diff --git a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas index 5d544fa..9bb6347 100644 --- a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas +++ b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas @@ -131,6 +131,7 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.22 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.23.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.23.1.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.23.2.xsd=schema/camel-spring-integration.xsd +http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.23.3.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.24.0.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.0.0-M1.xsd=schema/camel-spring-integration.xsd http\://camel.apache.org/schema/spring/integration/camel-spring-integration-3.0.0-M2.xsd=schema/camel-spring-integration.xsd diff --git a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas index b5e1b45..2113a95 100644 --- a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas +++ b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas @@ -125,6 +125,7 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.22.5.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.23.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.23.1.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.23.2.xsd=schema/camel-spring-security.xsd +http\://camel.apache.org/schema/spring-security/camel-spring-security-2.23.3.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-2.24.0.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-3.0.0-M1.xsd=schema/camel-spring-security.xsd http\://camel.apache.org/schema/spring-security/camel-spring-security-3.0.0-M2.xsd=schema/camel-spring-security.xsd diff --git a/components/camel-spring/src/main/resources/META-INF/spring.schemas b/components/camel-spring/src/main/resources/META-INF/spring.schemas index 20866f8..8ef5fcd 100644 --- a/components/camel-spring/src/main/resources/META-INF/spring.schemas +++ b/components/camel-spring/src/main/resources/META-INF/spring.schemas @@ -133,6 +133,7 @@ http\://camel.apache.org/schema/spring/camel-spring-2.22.5.xsd=camel-spring.xsd
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/34662 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed shell Sincerely, -The Buildbot
svn commit: r1046403 [5/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.23.3.xsd == --- websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.23.3.xsd (added) +++ websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.23.3.xsd Mon Jun 17 05:17:46 2019 @@ -0,0 +1,65 @@ + + +http://camel.apache.org/schema/spring/integration; + xmlns:xsd="http://www.w3.org/2001/XMLSchema; + xmlns:beans="http://www.springframework.org/schema/beans; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xmlns:camel-spring="http://camel.apache.org/schema/spring; + targetNamespace="http://camel.apache.org/schema/spring/integration; + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + http://www.springframework.org/schema/beans; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + http://camel.apache.org/schema/spring; schemaLocation="http://camel.apache.org/schema/spring/camel-spring.xsd"/> + + + + + + + + + + + + + + + + + Defines a camel-source for handling the Camel context message in Spring Integration message bus. + + + + + + + + + + + + + + Defines a camel-target to feed Spring Integration message to the Camel context. + + + +
svn commit: r1046403 [3/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-blueprint.xsd == --- websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-blueprint.xsd (added) +++ websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-blueprint.xsd Mon Jun 17 05:17:46 2019 @@ -0,0 +1,179 @@ + + +http://camel.apache.org/schema/blueprint/cxf; +xmlns:xsd="http://www.w3.org/2001/XMLSchema; +xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0; +xmlns:cxf-beans="http://cxf.apache.org/configuration/beans; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +targetNamespace="http://camel.apache.org/schema/blueprint/cxf; +elementFormDefault="qualified" +attributeFormDefault="unqualified" +xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;> + + http://www.osgi.org/xmlns/blueprint/v1.0.0; schemaLocation="https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/> + http://cxf.apache.org/configuration/beans; schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-spring.xsd == --- websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-spring.xsd (added) +++ websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-spring.xsd Mon Jun 17 05:17:46 2019 @@ -0,0 +1,180 @@ + + +http://camel.apache.org/schema/cxf; + xmlns:xsd="http://www.w3.org/2001/XMLSchema; + xmlns:beans="http://www.springframework.org/schema/beans; + xmlns:cxf-beans="http://cxf.apache.org/configuration/beans; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + targetNamespace="http://camel.apache.org/schema/cxf; + elementFormDefault="qualified" + attributeFormDefault="unqualified"> + + http://www.springframework.org/schema/beans; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + http://cxf.apache.org/configuration/beans; schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r1046405 - /websites/production/camel/content/cache/main.pageCache
Author: gzurowski Date: Mon Jun 17 05:18:06 2019 New Revision: 1046405 Log: (empty) Removed: websites/production/camel/content/cache/main.pageCache
svn commit: r1046403 [4/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/spring/camel-spring-2.23.3.xsd == --- websites/production/camel/content/schema/spring/camel-spring-2.23.3.xsd (added) +++ websites/production/camel/content/schema/spring/camel-spring-2.23.3.xsd Mon Jun 17 05:17:46 2019 @@ -0,0 +1,13661 @@ +http://www.w3.org/2001/XMLSchema; xmlns:tns="http://camel.apache.org/schema/spring; elementFormDefault="qualified" targetNamespace="http://camel.apache.org/schema/spring; version="1.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r1046403 [1/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Author: gzurowski Date: Mon Jun 17 05:17:46 2019 New Revision: 1046403 Log: Uploading released schemas for camel-2.23.3 Added: websites/production/camel/content/schema/blueprint/camel-blueprint-2.23.3.xsd websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-blueprint.xsd websites/production/camel/content/schema/cxf/camel-cxf-2.23.3-spring.xsd websites/production/camel/content/schema/spring-security/camel-spring-security-2.23.3.xsd websites/production/camel/content/schema/spring/camel-spring-2.23.3.xsd websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.23.3.xsd
svn commit: r1046404 - /websites/production/camel/content/manual/camel-manual-2.23.3.html
Author: gzurowski
Date: Mon Jun 17 05:17:58 2019
New Revision: 1046404
Log:
Uploading released manuals for camel-2.23.3
Added:
websites/production/camel/content/manual/camel-manual-2.23.3.html
Added: websites/production/camel/content/manual/camel-manual-2.23.3.html
==
--- websites/production/camel/content/manual/camel-manual-2.23.3.html (added)
+++ websites/production/camel/content/manual/camel-manual-2.23.3.html Mon Jun
17 05:17:58 2019
@@ -0,0 +1,18008 @@
+
+
+http://camel.apache.org/styles/camel-manual.css; rel="stylesheet"
type="text/css" />
+
+@page :left {
+@top-left {
+content: "Apache Camel 2.23.3 Developer's
Manual";
+}
+}
+
+
+
+
+
+
+
+
+
+
+
+SyntaxHighlighter.defaults['toolbar'] = false;
+SyntaxHighlighter.all();
+
+
+Apache
CamelUser GuideVersion
2.23.3
+ Copyright 2007-2016, Apache Software Foundation
+
+
+
+Table of Contents
+
+
+Table
of ContentsIntroductionQuickstartGetting
StartedArchitectureEnterprise
Integration PatternsCook BookTutorialsLanguage AppendixDataFormat
AppendixPattern AppendixComponent AppendixIndex
+
+
+
+
+Introduction
+
+Apache Camel is a versatile open-source
integration framework based on known Enterprise Integration
Patterns.Camel empowers you to define routing and mediation rules in a
variety of domain-specific languages, including a Java-based Fluent API, Spring
or Blueprint XML Configuration files, and a
Scala DSL. This means you get smart
completion of routing rules in your IDE, whether in a Java, Scala or XML
editor.Apache Camel uses URIs to
work directly with any kind of Transport or messaging model such as HTTP, ActiveMQ,
JMS, JBI, SCA, MINA or CXF, as well as pluggable Components and Data Format options. Apache Camel is a small
library with minimal dependencies for easy embedding in
any Java application. Apache Camel lets you work with the same API regardless which kind of Transport is used - so learn the API once and you can
interact with all the Components
provided out-of-box.Apache Camel provides support for Bean Binding and seamless integration with popular
fr
ameworks such as CDI,Spring, Blueprint and Guice. Camel also has extensive support for unit testing your routes.The
following projects can leverage Apache Camel as a routing and mediation
engine:http://servicemix.apache.org/;>Apache ServiceMix - a popular
distributed open source ESB and JBI containerhttp://activemq.apache.org/;>Apache ActiveMQ -
a mature, widely used open source message brokerhttp://cxf.apache.org/;>Apache CXF - a smart web services suite
(JAX-WS and JAX-RS)http://karaf.apache.org/;>Apache Karaf - a small OSGi based runtime
in which ap
plications can be deployedhttp://mina.apache.org/;>Apache MINA - a high-performance http://en.wikipedia.org/wiki/New_I/O;
rel="nofollow">NIO-driven networking frameworkSo don't get the
hump - try Camel today! https://cwiki.apache.org/confluence/s/en_GB/8100/4410012ac87e845516b70bc69b6f7a893eabaa5a/_/images/icons/emoticons/smile.svg;
data-emoticon-name="smile" alt="(smile)">Too
many buzzwords - what exactly is Camel? Okay, so the description above is
technology focused. There's a great discussion ab
out Camel at http://stackoverflow.com/questions/8845186/what-exactly-is-apache-camel;
rel="nofollow">Stack Overflow. We suggest you view the post, read the
comments, and browse the suggested links for more
details.
+
+
+
+Quickstart
+
+To start using Apache Camel quickly, you can read through some simple
examples in this chapter. For readers who would like a more thorough
introduction, please skip ahead to Chapter 3.
+
+Walk
through an Example CodeThis mini-guide takes you through the source
code of a https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java;>simple
example.Camel can be configured either by using Spring or directly in Java - which https://svn.apache.org/repos/asf/camel/trunk/examples/camel-example-jms-file/src/main/java/org/apache/camel/example/jmstofile/CamelJmsToFileExample.java;>this
example does.This example is available in the
examples\camel-example-jms-file directory of the Camel distribution.We start with creating a CamelContext - which is a container for Components, Routes
svn commit: r1046403 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/
Added: websites/production/camel/content/schema/blueprint/camel-blueprint-2.23.3.xsd == --- websites/production/camel/content/schema/blueprint/camel-blueprint-2.23.3.xsd (added) +++ websites/production/camel/content/schema/blueprint/camel-blueprint-2.23.3.xsd Mon Jun 17 05:17:46 2019 @@ -0,0 +1,13588 @@ +http://www.w3.org/2001/XMLSchema; xmlns:xs="http://www.w3.org/2001/XMLSchema; xmlns:tns="http://camel.apache.org/schema/blueprint; elementFormDefault="qualified" targetNamespace="http://camel.apache.org/schema/blueprint; version="1.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
svn commit: r34551 - /release/camel/apache-camel/2.23.2/
Author: gzurowski Date: Mon Jun 17 05:13:51 2019 New Revision: 34551 Log: Removed the old release Removed: release/camel/apache-camel/2.23.2/
svn commit: r34550 [2/3] - /release/camel/apache-camel/2.23.3/
Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom Mon Jun 17 05:11:20 2019 @@ -0,0 +1,2717 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + + 4.0.0 + + +org.apache.camel +camel-parent +2.23.3 +../parent + + + apache-camel + Camel :: Assembly + Apache Camel Assembly + pom + + +true +false + +true + + + + + + org.apache.camel + camel-core + + + org.apache.camel + camel-core-osgi + + + org.apache.camel + camel-core-xml + + + org.apache.camel + camel-ahc + + + org.apache.camel + camel-ahc-ws + + + org.apache.camel + camel-amqp + + + org.apache.camel + camel-apns + + + org.apache.camel + camel-asn1 + + + org.apache.camel + camel-asterisk + + + org.apache.camel + camel-atmos + + + org.apache.camel + camel-atmosphere-websocket + + + org.apache.camel + camel-atom + + + org.apache.camel + camel-atomix + + + org.apache.camel + camel-aws + + + org.apache.camel + camel-aws-xray + + + org.apache.camel + camel-azure + + + org.apache.camel + camel-avro + + + org.apache.camel + camel-bam + + + org.apache.camel + camel-base64 + + + org.apache.camel + camel-beanio + + + org.apache.camel + camel-beanstalk + + + org.apache.camel + camel-bean-validator + + + org.apache.camel + camel-barcode + + + org.apache.camel + camel-bindy + + + org.apache.camel + camel-bonita + + + org.apache.camel + camel-box + + + org.apache.camel + camel-box-api + + + org.apache.camel + camel-braintree + + + org.apache.camel + camel-blueprint + + + org.apache.camel + camel-boon + + + org.apache.camel + camel-cache + + + org.apache.camel + camel-caffeine + + + org.apache.camel + camel-cassandraql + + + org.apache.camel + camel-castor + + + org.apache.camel + camel-cdi + + + org.apache.camel + camel-chronicle + + + org.apache.camel + camel-chunk + + + org.apache.camel + camel-cm-sms + + + org.apache.camel + camel-cmis + + + org.apache.camel + camel-coap + + + org.apache.camel + camel-cometd + + + org.apache.camel + camel-connector + + + org.apache.camel + camel-consul + + + org.apache.camel + camel-context + + + org.apache.camel + camel-couchbase + + + org.apache.camel + camel-couchdb + + + org.apache.camel + camel-crypto + + + org.apache.camel + camel-crypto-cms + + + org.apache.camel + camel-csv + + + org.apache.camel + camel-cxf + + + org.apache.camel + camel-cxf-transport + + + org.apache.camel + camel-digitalocean + + + org.apache.camel + camel-disruptor + + + org.apache.camel + camel-dns + + + org.apache.camel + camel-docker + + + org.apache.camel + camel-dozer + + + org.apache.camel + camel-drill + + + org.apache.camel + camel-dropbox + + + org.apache.camel + camel-eclipse + + + org.apache.camel + camel-ehcache + + + org.apache.camel + camel-ejb + + + org.apache.camel + camel-elasticsearch + + + org.apache.camel + camel-elasticsearch-rest + + + org.apache.camel + camel-elasticsearch5 + + + org.apache.camel + camel-elsql + + + org.apache.camel + camel-etcd + + + org.apache.camel + camel-eventadmin + + + org.apache.camel + camel-exec + + + org.apache.camel + camel-facebook + + + org.apache.camel + camel-fastjson + + + org.apache.camel + camel-fhir + + + org.apache.camel + camel-flatpack + + + org.apache.camel + camel-flink + + + org.apache.camel + camel-fop + + + org.apache.camel + camel-ftp + +
svn commit: r34550 [1/3] - /release/camel/apache-camel/2.23.3/
Author: gzurowski Date: Mon Jun 17 05:11:20 2019 New Revision: 34550 Log: Apache Camel 2.23.3 released artifacts. Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip (with props) release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.asc release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.sha512 release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.asc release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.sha512 release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz (with props) release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.sha512 release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip (with props) release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.sha512 Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.asc == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.asc (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.asc Mon Jun 17 05:11:20 2019 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJc/QQBAAoJEJ1b7/pZQsBJwTcQAKFoUFUzsqA1BbVwMOmGweGb +d3aeYtcOGAUT9vvdp7ZUk0tTkMS9FG9Qat1ur9A45Qa0JLh0yAI77B9Md506y2WE ++EBJJ8+FO/iagCcK55G3xx2OfQMmU0SdMeS/qGZuze0D2ePSKZ0eYGp8MiOEFpXb +DYxGbEXNmONQpKyB9t8AbJWwb1vm/RyCSlP2s1X0EjnR+cEazE7n4BWcFfk9qUSC +nAKF9QRz9BQUR+utF6UmHTvm35N7VZucsJoKzigOLgZuACRCC1dXXrEeV0lFMC4/ +jTbbUCa1IexTDsZsSLC2XG9jC1pez4UtqxRl2JDY0GJQ/mPHFtq9LTVVn9pd6DPG ++aR6C4wqqmNLcwS9trc3gCb+v9sl6M4V8liKSvaueffwUQAbHCM6RPnxCzta9lSV +le8HUHRmkVw7wTCR79FG1/d8qHEfq/hvjto5eLww8QuEvI3Ht+x1EDXICeMNrfF5 +XJsMguIkXZtmcwcWf7Xlrzel4ZxFaTfYEOFlsQY2TsasbI1BXA9hQzZso8QdgHHH +UBFB8QQMlUbvZsi/rWZMlaK4OH30I/DuvriLhA6nX+7UlKAb3boJycFZO8i9kW3J +ZwCtwPFilO+moWo1N5MFUFjw/lSYvrvCWAdkhFBBjcAm66vqq+/lA3AToSoeHlQd +5B9hFApL32CkxoGlxA1y +=2/iy +-END PGP SIGNATURE- Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.sha512 == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.sha512 (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.sha512 Mon Jun 17 05:11:20 2019 @@ -0,0 +1 @@ +49ecca7395783ec6aa329145566151d78ee8ff9bd83c38aaa47a491aa15b422927c3b491567c1fbcdd108120b86ab72c7049278135fc9b76e50fef5a4e28c362 apache-camel-2.23.3-src.zip
svn commit: r34550 [3/3] - /release/camel/apache-camel/2.23.3/
Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.asc == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.asc (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.asc Mon Jun 17 05:11:20 2019 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJc/QQAAAoJEJ1b7/pZQsBJqXUQALEVSByOzSMxzrG3bk3pDTn7 +bg50TVDfdaaNSeZ7+iAZIpAvXugccotUlrYSUDavY1diaqI10bkEJbm94pJ+mJPs +jTcKlf1nehn22VqaLeUIhOHeGXC93MpZozJ+UWr3tYeV6oHuwI161H9F1Ok523ky +ILpS/EXIhdXWoRa0XQ1RBGw9dSo7lPsPYI05lXDA6Yaj5zTinz+PvNsHhZBHHs5N +wFtZybsAmSTZu5/vEl7048fR9K1wf0sWueZ76GOurmRJ4zA6muMvlxPTRPKOGBth +qklXw50Ya9RSd4tWuKHzwhMSQFM/oCWWLlxeJtqgehyIlAy/rLe2uIfAi9INvRBj +JtNPs7FGaAlbEW3sLpc3iNh7cdHQN+h2i6+kO/ZWKHxaYoheX1xTLbozMx5tFPI8 +HA3wM1j067W/nhAQPg2o0BF/mbC05YcM5zXSim2rN5x/Nv2aRcl5VlpfHX2Goa4p +G5dD/CE939GOLAVHwHW41Xtmfiomr2UKnskMnfPqrYJVNOEh+hro6PIR0qG71I8G +ezpzKZvnyorXaysSsK5lqG/qWSV1mcDuYrDwR1mkAW8fnid8aObaIdjZYwUs7YPN +hPOnVY4Aq0a4TFwTvBQVfBx6uh0F/yv86nTQD3T2hkPc5nMmBzmZgC+cQCr9LKDU +cVlSvhBl25xpYI0zPcs1 +=n2mq +-END PGP SIGNATURE- Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.sha512 == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.sha512 (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3.pom.sha512 Mon Jun 17 05:11:20 2019 @@ -0,0 +1 @@ +4ec7a528a925b1027adeac0f38171216ee2bcb53d77ef6f4187f0ca6ed85c557fa6d38b18114edf9c85ee90d0473fe3fec8da4a48b809d6cb84c1be49425452c apache-camel-2.23.3.pom Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz == Binary file - no diff available. Propchange: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc Mon Jun 17 05:11:20 2019 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJc/QQAAAoJEJ1b7/pZQsBJ2+oQAIJ5xBZMeaeuOzSFwgkgZptv +/pRgD7bjfgh8nzhSLgtPIy92J1t5AYGC/fwONoakH1/JOqyp7X7htuYyPF1gEx2t +mRsygI6YRPt1dgHmsxrzlAoEwSL8lyyhy0UB65/0YbSwxvZSXkh/YAr9w17h5ETN +suOiFxuNegrJwVJjZjQ0UyEsUkc1hw4ZjTET0Kn+rfIIm672+PCCgqEFLmXumcq5 +dWVlPM2aHdni7TIYi5mqaS29rz4kMnY1VrJ8G2kyQ1a/OmG6xZQ5mqp2WRaRdlRB +Aej+fErU344CWqPN/O3hL+9Q51NOe23DvQ/B4CFZlJnyUsFSJEf0FYoIlq3v5Gvx +WOoPquyRIP/M+IAtulF4A9GLc+wfVwVUeLNz1IWyFcxz48UIgSLbbOb5k2ssrJzy +S0kctJ9i7MaT1/LBM9jWH9o+Wls/32o7kKqhKNkb3f9SfzVls/1AGE/t0VL1oJKT +Ha73e5bRPKtF3ZE5WDAz0PWK1cbTwW9oa+ZLj2hRs8pSXpDjbsFMrzJBQ+nYGkc5 +kjhu6Rvm/C0FEdjN5JOz3irj+hjWveHQg/9IIRTLEufB2FArkaRwnfbwPrNFmfpR +CL8KPDRhBhs5Wp3ymPI47eBFyL1A9V700v5g58sA5TeyE65+WE2YcfLgVPwqlQXp +FPGvvjt2im23atumJE9S +=/fLZ +-END PGP SIGNATURE- Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.sha512 == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.sha512 (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.sha512 Mon Jun 17 05:11:20 2019 @@ -0,0 +1 @@ +3eb66be0387d66af03b744f15cda4d9fc292985eb9cf1240f8cdca58ff205ee82cbf075abe07a7d12ba9137bed199caf870b855a45e27e340dab253666e73a05 apache-camel-2.23.3.tar.gz Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc == --- release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc (added) +++ release/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc Mon Jun 17 05:11:20 2019 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJc/QQAAAoJEJ1b7/pZQsBJ214P/jRcYFtYSsz3Z3XojZNSV6Jb +aT+ebzOAxwpKFobFwHy/Ik1gJ56TLLksoDd1ToRYIlTDR436v9dVG0It6/IrrWoG +fklGU2rzUXacd0jRRWIcc5SYEbVKgghB/7CpySTWJSTDtKHaSi9eHGzUeYHfQS7J +9/IPH0HvAMBP0p8kkLduyaLxpaCmMpVGeN1l2mbAPTywk17MgqY9P/asCu+ZItBB +uS4ZiI4IS/q1/msofYidjFkZRoNGb9btqk2Ukq5Tq9Yw+Nu9bwttPqIiQ+KeM4LQ +Le3J48C7yoIEpcr6b/wEnJXp0jwSTnW3b0jazfWD448H7RCloLHX0nnr4oTukMqv +bB2D1iV1rqbMDMoPWcOJfG4CjiJ9L2mw0vz3T59CvYVPMl8UkZ0nkI1pm9VH4niS
svn commit: r34549 - /release/camel/apache-camel/2.23.3/
Author: gzurowski Date: Mon Jun 17 05:04:57 2019 New Revision: 34549 Log: Apache Camel 2.23.3 release distro placeholder. Added: release/camel/apache-camel/2.23.3/
[camel] branch master updated (cf11bea -> cdb4438)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from cf11bea Merge pull request #2978 from claudio4j/twitter_search_fix
new 071fdb3 CAMEL-13650: Properties component - loadProperties to return
properties in order
new f480c67 CAMEL-13650: Properties component - loadProperties to return
properties in order
new cdb4438 CAMEL-13650: Properties component - loadProperties to return
properties in order
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../properties/DefaultPropertiesResolver.java | 13 +--
.../component/properties/PropertiesComponent.java | 7 +-
.../spi/BridgePropertyPlaceholderConfigurer.java | 2 +-
.../PropertiesComponentLoadPropertiesTest.java | 18
.../org/apache/camel/util/OrderedProperties.java | 114 +
.../apache/camel/util/OrderedPropertiesTest.java | 74 +
.../src/test/resources/application.properties | 0
7 files changed, 218 insertions(+), 10 deletions(-)
create mode 100644
core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
create mode 100644
core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
copy core/{camel-main => camel-util}/src/test/resources/application.properties
(100%)
[camel] 03/03: CAMEL-13650: Properties component - loadProperties to return properties in order
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cdb443824ac81d392b17ee6225bb8ab39f6a80db
Author: Claus Ibsen
AuthorDate: Sun Jun 16 17:26:54 2019 +0200
CAMEL-13650: Properties component - loadProperties to return properties in
order
---
.../spi/BridgePropertyPlaceholderConfigurer.java| 2 +-
.../org/apache/camel/util/OrderedProperties.java| 21 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
index 0a9d357..84fbedb 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java
@@ -236,7 +236,7 @@ public class BridgePropertyPlaceholderConfigurer extends
PropertyPlaceholderConf
propVal = resolveSystemProperty(placeholderName);
}
if (propVal == null) {
-propVal = (String) properties.get(placeholderName);
+propVal = properties.getProperty(placeholderName);
}
if (propVal == null && systemPropertiesMode ==
SYSTEM_PROPERTIES_MODE_FALLBACK) {
propVal = resolveSystemProperty(placeholderName);
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
index a793ec4..861e147 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
@@ -31,6 +31,7 @@ import java.util.Vector;
*
* Note: This implementation is only intended as implementation detail for the
Camel properties component, and has only
* been designed to provide the needed functionality.
+ * The complex logic for loading properties has been kept from the JDK {@link
Properties} class.
*/
public final class OrderedProperties extends Properties {
@@ -45,6 +46,26 @@ public final class OrderedProperties extends Properties {
}
@Override
+public synchronized Object get(Object key) {
+return map.get(key);
+}
+
+@Override
+public synchronized boolean isEmpty() {
+return map.isEmpty();
+}
+
+@Override
+public synchronized Object remove(Object key) {
+return map.remove(key);
+}
+
+@Override
+public synchronized void clear() {
+map.clear();
+}
+
+@Override
public String getProperty(String key) {
return map.get(key);
}
[camel] 01/03: CAMEL-13650: Properties component - loadProperties to return properties in order
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 071fdb31c0de3674f7b17bf9e6737429ae75a41d
Author: Claus Ibsen
AuthorDate: Sun Jun 16 09:27:11 2019 +0200
CAMEL-13650: Properties component - loadProperties to return properties in
order
---
.../properties/DefaultPropertiesResolver.java | 12 +--
.../component/properties/OrderedProperties.java| 95 ++
.../component/properties/PropertiesComponent.java | 6 +-
.../PropertiesComponentLoadPropertiesTest.java | 18
4 files changed, 122 insertions(+), 9 deletions(-)
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
index 7ac047f..f110cab 100644
---
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
+++
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
@@ -47,7 +47,7 @@ public class DefaultPropertiesResolver implements
PropertiesResolver {
}
public Properties resolveProperties(CamelContext context, boolean
ignoreMissingLocation, List locations) {
-Properties answer = new Properties();
+Properties answer = new OrderedProperties();
Properties prop;
for (PropertiesLocation location : locations) {
@@ -76,7 +76,7 @@ public class DefaultPropertiesResolver implements
PropertiesResolver {
}
protected Properties loadPropertiesFromFilePath(CamelContext context,
boolean ignoreMissingLocation, PropertiesLocation location) {
-Properties answer = new Properties();
+Properties answer = new OrderedProperties();
String path = location.getPath();
InputStream is = null;
@@ -103,7 +103,7 @@ public class DefaultPropertiesResolver implements
PropertiesResolver {
}
protected Properties loadPropertiesFromClasspath(CamelContext context,
boolean ignoreMissingLocation, PropertiesLocation location) {
-Properties answer = new Properties();
+Properties answer = new OrderedProperties();
String path = location.getPath();
InputStream is = context.getClassResolver().loadResourceAsStream(path);
@@ -138,13 +138,13 @@ public class DefaultPropertiesResolver implements
PropertiesResolver {
} catch (Exception ex) {
// just look up the Map as a fault back
Map map = context.getRegistry().lookupByNameAndType(path,
Map.class);
-answer = new Properties();
+answer = new OrderedProperties();
answer.putAll(map);
}
if (answer == null && (!ignoreMissingLocation &&
!location.isOptional())) {
throw RuntimeCamelException.wrapRuntimeCamelException(new
FileNotFoundException("Properties " + path + " not found in registry"));
}
-return answer != null ? answer : new Properties();
+return answer != null ? answer : new OrderedProperties();
}
/**
@@ -158,7 +158,7 @@ public class DefaultPropertiesResolver implements
PropertiesResolver {
* @return the prepared properties
*/
protected Properties prepareLoadedProperties(Properties properties) {
-Properties answer = new Properties();
+Properties answer = new OrderedProperties();
for (Map.Entry entry : properties.entrySet()) {
Object key = entry.getKey();
Object value = entry.getValue();
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/OrderedProperties.java
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/OrderedProperties.java
new file mode 100644
index 000..5356084
--- /dev/null
+++
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/OrderedProperties.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.properties;
[camel] 02/03: CAMEL-13650: Properties component - loadProperties to return properties in order
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f480c674a8adf58ebb04c9cef4354ac74da6252e
Author: Claus Ibsen
AuthorDate: Sun Jun 16 09:55:27 2019 +0200
CAMEL-13650: Properties component - loadProperties to return properties in
order
---
.../properties/DefaultPropertiesResolver.java | 1 +
.../component/properties/PropertiesComponent.java | 1 +
.../org/apache/camel/util}/OrderedProperties.java | 4 +-
.../apache/camel/util/OrderedPropertiesTest.java | 74 ++
.../src/test/resources/application.properties | 21 ++
5 files changed, 98 insertions(+), 3 deletions(-)
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
index f110cab..1e164ff 100644
---
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
+++
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
@@ -30,6 +30,7 @@ import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.OrderedProperties;
/**
* Default {@link org.apache.camel.component.properties.PropertiesResolver}
which can resolve properties
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index 61a7716..4ddea23 100644
---
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -37,6 +37,7 @@ import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.LRUCacheFactory;
import org.apache.camel.util.FilePathResolver;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.OrderedProperties;
/**
* The http://camel.apache.org/properties;>Properties Component
allows you to use property placeholders when defining Endpoint URIs
diff --git
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/OrderedProperties.java
b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
similarity index 97%
rename from
components/camel-properties/src/main/java/org/apache/camel/component/properties/OrderedProperties.java
rename to
core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
index 5356084..a793ec4 100644
---
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/OrderedProperties.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.properties;
+package org.apache.camel.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,8 +34,6 @@ import java.util.Vector;
*/
public final class OrderedProperties extends Properties {
-// TODO: Move to camel-util
-
private final Map map = new LinkedHashMap<>();
public OrderedProperties() {
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
new file mode 100644
index 000..8d80ffa
--- /dev/null
+++
b/core/camel-util/src/test/java/org/apache/camel/util/OrderedPropertiesTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.util;
+
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class OrderedPropertiesTest extends Assert {
+
+@Test
+public
