You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/27 08:08:40 UTC
[camel-karaf] branch master updated: Configuring some of the XML
DSL options should support placeholder.
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-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 26e6d45 Configuring some of the XML DSL options should support placeholder.
26e6d45 is described below
commit 26e6d45162af2b56ba40e06396456517e308bea2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 27 09:08:23 2020 +0100
Configuring some of the XML DSL options should support placeholder.
---
.../camel/blueprint/CamelContextFactoryBean.java | 20 +++++++++++---------
.../blueprint/converter/FooConverterRegression.java | 1 +
.../converter/CustomConverterRegressionTest.xml | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index d39a199..d75fadc 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -107,12 +107,14 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
@XmlAttribute
private String logExhaustedMessageBody;
@XmlAttribute
+ @Metadata(defaultValue = "false")
private String streamCache = "false";
@XmlAttribute
private String delayer;
@XmlAttribute
private String errorHandlerRef;
@XmlAttribute
+ @Metadata(defaultValue = "true")
private String autoStartup = "true";
@XmlAttribute
private String useMDCLogging;
@@ -140,11 +142,11 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
@XmlAttribute
private ShutdownRunningTask shutdownRunningTask;
@XmlAttribute
- private Boolean loadTypeConverters;
+ private String loadTypeConverters;
@XmlAttribute
- private Boolean typeConverterStatisticsEnabled;
+ private String typeConverterStatisticsEnabled;
@XmlAttribute
- private Boolean inflightRepositoryBrowseEnabled;
+ private String inflightRepositoryBrowseEnabled;
@XmlAttribute
private TypeConverterExists typeConverterExists;
@XmlAttribute
@@ -492,20 +494,20 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
}
@Override
- public Boolean getLoadTypeConverters() {
+ public String getLoadTypeConverters() {
return loadTypeConverters;
}
- public void setLoadTypeConverters(Boolean loadTypeConverters) {
+ public void setLoadTypeConverters(String loadTypeConverters) {
this.loadTypeConverters = loadTypeConverters;
}
@Override
- public Boolean getTypeConverterStatisticsEnabled() {
+ public String getTypeConverterStatisticsEnabled() {
return typeConverterStatisticsEnabled;
}
- public void setTypeConverterStatisticsEnabled(Boolean typeConverterStatisticsEnabled) {
+ public void setTypeConverterStatisticsEnabled(String typeConverterStatisticsEnabled) {
this.typeConverterStatisticsEnabled = typeConverterStatisticsEnabled;
}
@@ -969,11 +971,11 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
}
@Override
- public Boolean getInflightRepositoryBrowseEnabled() {
+ public String getInflightRepositoryBrowseEnabled() {
return inflightRepositoryBrowseEnabled;
}
- public void setInflightRepositoryBrowseEnabled(Boolean inflightRepositoryBrowseEnabled) {
+ public void setInflightRepositoryBrowseEnabled(String inflightRepositoryBrowseEnabled) {
this.inflightRepositoryBrowseEnabled = inflightRepositoryBrowseEnabled;
}
}
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
index 64dcc44..31cb9e8 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.blueprint.converter;
import org.apache.camel.Converter;
import org.apache.camel.test.blueprint.Foo;
+@Converter
public class FooConverterRegression {
public FooConverterRegression() {
diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/converter/CustomConverterRegressionTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/converter/CustomConverterRegressionTest.xml
index 8548e3e..4d52be5 100644
--- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/converter/CustomConverterRegressionTest.xml
+++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/converter/CustomConverterRegressionTest.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="
http://www.osgi.org/xmlns/blueprint/v1.0.0 https://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
- <camelContext xmlns="http://camel.apache.org/schema/blueprint">
+ <camelContext loadTypeConverters="true" xmlns="http://camel.apache.org/schema/blueprint">
<route>
<from uri="direct:start"/>